Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 607 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
new file mode 100755
index 0000000000..95e10e43cd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Domain"/>
+</contribution>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/domain.composite
new file mode 100644
index 0000000000..dbaaebd3c7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/domain.composite
@@ -0,0 +1,54 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           name="Domain">
+           
+    <component name="domain">
+        <service name="Resource">
+            <tuscany:binding.http/>
+        </service>
+       <tuscany:implementation.resource location="webroot"/>
+    </component>            
+           
+    <component name="DomainManagerComponent">
+        <implementation.java class="org.apache.tuscany.sca.domain.impl.DomainManagerServiceImpl"/>
+        <service name="DomainManagerService">
+            <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
+            <binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8080/DomainManagerComponent/DomainManagerJson"/>
+        </service>
+        <reference name="serviceDiscovery" target="ServiceDiscoveryComponent"/>
+
+    </component>
+    
+    <component name="ServiceDiscoveryComponent">
+        <implementation.java class="org.apache.tuscany.sca.domain.impl.ServiceDiscoveryServiceImpl" />
+        <service name="ServiceDiscoveryService">
+            <interface.java interface="org.apache.tuscany.sca.domain.ServiceDiscoveryService"/>
+            <binding.sca uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoverySCA"/>
+            <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoveryJson"/>            
+        </service>
+    </component>
+    
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/index.html
new file mode 100644
index 0000000000..425bd73734
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/index.html
@@ -0,0 +1,354 @@
+<html>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ -->
+<head>
+<title>Apache Tuscany Domain</TITLE>
+
+    <script type="text/javascript" src="../SCADomain/scaDomain.js"></script>
+
+    <script language="JavaScript">
+    
+       domainManager = new JSONRpcClient("../DomainManagerComponent/DomainManagerJson");
+
+       function getNodeInfo() {
+          domainManager.DomainManagerService.getNodeInfo(handleGetNodeInfo);
+       }
+       
+       function handleGetNodeInfo(result) {
+       
+          var text = ""
+          
+          for (var i in result.list){
+              var node = result.list[i];
+              
+              text = text + "<table>";
+              text = text + "<TR CLASS='source_1' >";
+              text = text + "  <TD>";
+              text = text + "    <IMG SRC='node.png'/>&nbsp;&nbsp;" + node.domainUri;
+              text = text + "  </TD>";
+              
+              var noProtocol = node.nodeManagerUrl.substring(7);
+              var colonPos = noProtocol.indexOf(':')
+              var nodeManagerWebUrl = noProtocol.substring(0, colonPos + 6);
+              nodeManagerWebUrl = "http://" + nodeManagerWebUrl + "node/index.html";
+              
+              text = text + "  <TD CLASS='clickable link' ONCLICK=\"showNode('" + nodeManagerWebUrl + "')\">" + node.nodeUri + "</TD>";
+              text = text + "</TR>";               
+          }
+
+          document.getElementById('domainInfo').innerHTML=text;
+       }
+       
+        function showNode(url)
+        {
+            document.getElementById("nodePage").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
+            window.location="#data";
+            return;    
+        }       
+
+    </script>
+
+    <link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+
+<body onload="getNodeInfo()">
+
+<!--script type="text/javascript">
+    
+        // The proxy for the alert and alertsources services running in Tuscany
+        var alertsService       = new dojo.rpc.JsonService("AlertsServiceJSONRPC?smd");
+        var alertSourcesService = new dojo.rpc.JsonService("AlertsSourcesServiceJSONRPC?smd");
+
+        // If you want to put an HTTP sniffer in the way to look at the JSONROPC packets you'll
+        // need to edit the target address of the service in the smd. The only way to do this easily
+        // is to read an smd from disc rather than generate one. There are two smds provided for this
+	    //var alertsService       = new dojo.rpc.JsonService("service.smd");
+        //var alertSourcesService = new dojo.rpc.JsonService("sources.smd");
+
+        // The global list of alerts sources
+        var alertSourceList = null;
+
+        // The global list of alerts 
+        var alertList       = null;
+
+        // the constructor for entries on the alert source list
+        function alertSourceType(name,id,address,feedAddress,feedType,popUsername,popPassword,popServer,lastChecked,javaClass) {
+          this.name        = name;
+          this.id          = id;
+          this.address     = address;
+          this.feedAddress = feedAddress;
+          this.feedType    = feedType;
+          this.lastChecked = lastChecked;
+          this.javaClass   = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
+
+        }
+
+        function errorCallback(result, error, id) {
+            var resultsNode = document.getElementById("errors");
+            // There seems to be a problem somewhere as I should be able to get the error
+            // details but all I can actually get is the Id from the error message
+            // resultsNode.innerHTML = "there was an error! message id = "  + " error code = " + result.error.code + " error message = " + result.error.msg ;
+           resultsNode.innerHTML = "An error was returned by the server. Message id = " +  result.id;
+        }
+
+        // Generate the alert sources table
+        function getAlertSources()
+        { 
+            response = alertSourcesService.getAlertSources("Dojo");
+            response.addCallbacks(getAlertSourcesCallback, errorCallback);
+
+            getAlerts();
+        }
+
+        function getAlertSourcesCallback(result) {
+            var resultsNode = document.getElementById("alertSourcesTable");
+            if ( result.error != null ) {
+                resultsNode.innerHTML = result.error;
+            } else {
+                // stash away the source list for when we come to edit it
+                alertSourceList = result.source.list;
+
+                // put out the html
+                var text = ""
+                var nextSourceId = 0
+                for (var i in result.source.list){
+                    var source = result.source.list[i];
+
+                    text = text + "<table>";
+                    text = text + "<TR CLASS='source_" + source.id + "' >";
+                    text = text + "  <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
+                    text = text + "    <IMG SRC='rss.png'/>&nbsp;&nbsp;" + source.name;
+                    text = text + "  </TD>";
+                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
+                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"deleteSource('" + source.id + "')\">Delete</TD>";
+                    text = text + "</TR>";
+                    text = text + "<TR ID='edit_source_" + source.id + "' CLASS='hidden source_" + source.id + "'>";
+                    text = text + "  <TD COLSPAN='3'>";
+                    text = text + "    <TABLE CLASS='sourceDetailsTable'>";
+                    text = text + "      <TR>";
+                    text = text + "        <TD>Source name:</TD>";
+                    text = text + "        <TD>";
+                    text = text + "          <INPUT ID='source_" + source.id + "_name' TYPE='TEXT' SIZE='50' VALUE='" + source.name + "'/>";
+                    text = text + "        </TD>";
+                    text = text + "      </TR>";
+                    text = text + "      <TR>";
+                    text = text + "       <TD>Source address:</TD>"
+                    text = text + "        <TD>";
+                    text = text + "          <INPUT ID='source_" + source.id + "_address' TYPE='TEXT' SIZE='50' VALUE='" + source.address + "'/>";
+                    text = text + "        </TD>";
+                    text = text + "      </TR>";
+                    text = text + "      <TR>";
+                    text = text + "        <TD>";
+                    text = text + "          <INPUT ID='source_" + source.id + "_type' TYPE='HIDDEN' VALUE='" + source.id + "'/>";
+                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Update' ONCLICK=\"updateSource('" + source.id + "')\"/>";
+                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideEditSource('" + source.id + "')\"/>";
+                    text = text + "        </TD>";
+                    text = text + "      </TR>";
+                    text = text + "    </TABLE>";
+                    text = text + "  </TD>";
+                    text = text + "</TR>";
+               
+                    nextSourceId = eval(source.id);
+                }
+
+                nextSourceId = nextSourceId + 1;
+
+                text = text + "<TR CLASS='source_" + nextSourceId + "'>";
+                text = text + "  <TD COLSPAN='4' CLASS='clickable link' ONCLICK=\"showAddNewSource('" + nextSourceId + "')\">Add new Alert Source</TD>";
+                text = text + "</TR>";
+                text = text + "<TR ID='add_source_" + nextSourceId + "' CLASS='hidden source_" + nextSourceId + "'>";
+                text = text + "  <TD COLSPAN='4'>";
+                text = text + "    <TABLE CLASS='sourceDetailsTable'>";
+                text = text + "      <TR>";
+                text = text + "        <TD>Source name:</TD>";
+                text = text + "        <TD>";
+                text = text + "          <INPUT ID='source_" + nextSourceId + "_name' TYPE='TEXT' SIZE='50'>";
+                text = text + "        </TD>";
+                text = text + "      </TR>";
+                text = text + "      <TR>";
+                text = text + "        <TD>Source address:</TD>";
+                text = text + "        <TD>";
+                text = text + "          <INPUT ID='source_" + nextSourceId + "_address' TYPE='TEXT' SIZE='50'>";
+                text = text + "        </TD>";
+                text = text + "      </TR>";
+                text = text + "      <TR>";
+                text = text + "        <TD>Source type:</TD>";
+                text = text + "        <TD>";
+                text = text + "          <SELECT ID='source_" + nextSourceId + "_type' ONCHANGE=\"showSourceType('" + nextSourceId + "')\">";
+                text = text + "            <OPTION value='rss' selected='selected'>RSS/Atom feed</OPTION>";
+                text = text + "          </SELECT>";
+                text = text + "        </TD>";
+                text = text + "      </TR>";
+                text = text + "      <TR ID='add_rss_source'>";
+                text = text + "        <TD COLSPAN='2'>";
+                text = text + "          <TABLE CLASS='sourceDetailsTable'>";
+                text = text + "            <TR>";
+                text = text + "              <TD>Feed address:</TD>";
+                text = text + "              <TD>";
+                text = text + "                 <INPUT ID='source_" + nextSourceId + "_feedAddress' TYPE='TEXT' SIZE='50'/>";
+                text = text + "              </TD>";
+                text = text + "            </TR>";
+                text = text + "          </TABLE>";
+                text = text + "        </TD>";
+                text = text + "      </TR>";
+                text = text + "      <TR>";
+                text = text + "        <TD>";
+                text = text + "          <INPUT TYPE='BUTTON' VALUE='Add' ONCLICK=\"addSource('" + nextSourceId + "')\">";
+                text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideAddNewSource('" + nextSourceId + "')\">";
+                text = text + "        </TD>";
+                text = text + "      </TR>";
+                text = text + "    </TABLE>";
+                text = text + "  </TD>";
+                text = text + "</TR>";
+                text = text + "</table>";
+
+                resultsNode.innerHTML = text;  
+            }
+        }
+
+        function showEditSource(sourceid)
+        {
+            document.getElementById("edit_source_"+sourceid).className = "source_"+sourceid;
+        }
+
+        function hideEditSource(sourceid)
+        {
+             document.getElementById("edit_source_"+sourceid).className = "hidden source_"+sourceid;
+        }
+ 
+        function updateSource(sourceid)
+        {
+            hideEditSource(sourceid);
+            var source = getSource(sourceId);
+            alertSourcesService.updateAlertSource(source);
+            getAlertSources();
+        }
+ 
+        function deleteSource(sourceid)
+        {
+            alertSourcesService.removeAlertSource(sourceid);
+            getAlertSources();
+        }
+
+        function showAddNewSource(sourceid)
+        {
+            document.getElementById("add_source_"+sourceid).className = "source_"+sourceid;
+        }
+
+        function hideAddNewSource(sourceid)
+        {
+            document.getElementById("add_source_"+sourceid).className = "hidden source_"+sourceid;
+        }
+
+        function addSource(sourceid)
+        {
+            hideAddNewSource(sourceid);
+            var source = getSource(sourceid);
+            alertSourcesService.addAlertSource(source); 
+
+            // wait a little before getting the list back from the server
+            setTimeout("getAlertSources()",1250);       
+        }
+
+        function getSource(sourceid)
+        {
+            var source = alertSourceList[sourceid];
+
+            if ( source == null ){
+                source = new alertSourceType("name","id","address","feedAddress","feedType","popUsername","popPassword","popServer","lastChecked","javaClass");
+                alertSourceList[sourceid] = source;
+            }
+            
+            source.name     = document.getElementById("source_"+sourceid+"_name").value;
+            source.id       = sourceid;
+            source.address  = document.getElementById("source_"+sourceid+"_address").value;
+            var typeElem    = document.getElementById("source_"+sourceid+"_type");
+            source.feedType = typeElem.options[typeElem.selectedIndex].value; 
+
+            if(source.feedType=="rss")
+            {
+                source.feedAddress = document.getElementById("source_"+sourceid+"_feedAddress").value;
+                
+            }
+            else if(source.feedType=="pop")
+            {
+                source.popServer   = document.getElementById("source_"+sourceid+"_popServer").value;
+                source.popUsername = document.getElementById("source_"+sourceid+"_popUsername").value;
+                source.popPassword = document.getElementById("source_"+sourceid+"_popPassword").value;
+            } 
+            return source;     
+        }
+
+        // Generate the alerts table
+        function getAlerts()
+        { 
+            response = alertsService.getAllNewAlerts("Dojo");
+            response.addCallbacks(getAlertsCallback, errorCallback);
+        }
+
+        function getAlertsCallback(result) {
+            var resultsNode = document.getElementById("alertsTable");
+            if ( result.error != null ) {
+                resultsNode.innerHTML = result.error;
+            } else {
+                alertList = result.alert.list;
+                var text = ""
+                for (var i in result.alert.list){
+                    var alert = result.alert.list[i];
+
+                    text = text + "<table>";
+                    text = text + "<TR class='source_" + alert.sourceId + " clickable' onclick=\"displayAlert('" + alert.address + "')\">";
+                    text = text + " <TD class='alert_text'>";
+                    text = text + "   <SPAN id='" + alert.id + "' class='unread_title'>" + alert.title + "</SPAN>";
+                    text = text + "   <SPAN class='summary'> - " + alert.summary.substring(0, 80)  + "...</SPAN>";
+                    text = text + " </TD>";
+                    text = text + " <TD>";
+                    text = text +     alert.date;
+                    text = text + "  </TD>"
+                    text = text + "</TR>"
+                    text = text + "</table>";
+                }
+
+                resultsNode.innerHTML = text;  
+            }
+        }
+
+
+
+        function displayAlert(url)
+        {
+            document.getElementById("alertData").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
+            window.location="#data";
+            return;    
+        }
+</script-->
+
+<h1 id="top">Apache Tuscany Domain</h1>
+<div id="errors"></div>
+
+<p>Domain Name<span id="domainName"></span>:</p>
+
+<div id="domainInfo"></div>
+
+<p /><input type="button" value="Refresh" onclick="getNodeInfo()" />
+
+<div id="nodePage"></div>
+
+</body>
+</html>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/node.png
new file mode 100644
index 0000000000..b3c949d224
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/node.png
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/style.css
new file mode 100644
index 0000000000..f5bbf23379
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/domain-webapp/src/main/resources/webroot/style.css
@@ -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.
+ */
+
+p,table,li,h1,h2,h3
+{
+font-family: verdana, arial, 'sans serif'; 
+}
+
+p, h1, h2, h3, table, li, hr
+{
+margin-left: 10pt;
+}
+
+table
+{
+border-color: black;
+border-collapse: separate;
+border-spacing: 0px 1px;
+
+margin-right: 10pt;
+margin-left: 10pt;
+width: 800px;
+}
+
+.sourceDetailsTable
+{
+width: 600px;
+}
+
+tr, td
+{
+margin-left: 0pt;
+margin-right: 0pt;
+padding-left: 10pt;
+font-size: 90%;
+}
+
+p,li,th
+{
+font-size: 90%;
+margin-left: 10pt;
+}
+
+pre
+{
+margin-left: 10pt;
+}
+
+body
+{
+#ffffff;
+}
+
+h1,h2,h3,hr
+{
+color: firebrick;
+}
+
+a:link {COLOR: firebrick;}
+a:visited {COLOR: firebrick;}
+a:active {COLOR: navy;}
+
+.link
+{
+COLOR: firebrick;
+text-decoration: underline;
+}
+
+.clickable
+{
+cursor: pointer
+}
+
+.unread_title
+{
+font-weight: bold;
+}
+
+.read_title
+{
+font-weight: normal;
+}
+
+.summary
+{
+color: DimGrey;
+}
+
+.hidden
+{
+display: none;
+}
+
+.source_name
+{
+width: 600px;
+}
+
+.alert_text
+{
+width: 600px;
+}
+
+.alert_data
+{
+margin-left: 10px;
+width: 800px;
+height: 800px;
+}
+
+.source_0
+{
+background-color: LightGreen;
+}    
+
+.source_1
+{
+background-color: LightSkyBlue;
+}
+
+.source_2
+{
+background-color: Khaki;
+}
+
+.source_3
+{
+background-color: LightPink;
+}
+
+.source_4
+{
+background-color: Orange;
+}
+
+.source_5
+{
+background-color: LightCoral;
+}
+
+.source_6
+{
+background-color: Orchid;
+}
+
+.source_7
+{
+background-color: Peru;
+}
+
+.source_8
+{
+background-color: SpringGreen;
+}
+
+.source_9
+{
+background-color: LightGrey;
+}
+