You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/09/08 21:03:47 UTC
svn commit: r573892 - in
/incubator/tuscany/java/sca/distribution/webapp/src/main: resources/_node/
resources/_node/META-INF/ resources/_node/webroot/ webapp/WEB-INF/
webapp/sca-contributions/
Author: antelder
Date: Sat Sep 8 12:03:47 2007
New Revision: 573892
URL: http://svn.apache.org/viewvc?rev=573892&view=rev
Log:
Make webapp distro by default be nodeB for the distributed calculator sample
Added:
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml (with props)
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html (with props)
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/node.png (with props)
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css (with props)
incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar (with props)
Modified:
incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml?rev=573892&view=auto
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml Sat Sep 8 12:03:47 2007
@@ -0,0 +1,24 @@
+<?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"
+ targetNamespace="http://management"
+ xmlns:management="http://management">
+ <deployable composite="management:Management"/>
+</contribution>
\ No newline at end of file
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite?rev=573892&view=auto
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite (added)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite Sat Sep 8 12:03:47 2007
@@ -0,0 +1,65 @@
+<?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://management"
+ xmlns:sample="http://management"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ name="Management">
+
+ <component name="NodeManagerComponent">
+ <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.NodeManagerServiceImpl"/>
+ <service name="NodeManagerInitService">
+ <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerInitService"/>
+ <binding.sca/>
+ </service>
+ <service name="NodeManagerService">
+ <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerService"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8081/NodeManagerComponent/NodeManagerJson"/>
+ </service>
+ <service name="ComponentManagerService">
+ <interface.java interface="org.apache.tuscany.sca.distributed.node.ComponentManagerService"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8081/NodeManagerComponent/ComponentManagerJson"/>
+ </service>
+ </component>
+
+ <component name="DomainManagerComponent">
+ <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.DomainManagerProxyImpl"/>
+ <reference name="domainManager">
+ <interface.java interface="org.apache.tuscany.sca.distributed.domain.DomainManagerService"/>
+ <binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
+ </reference>
+ </component>
+
+ <component name="ServiceDiscoveryComponent">
+ <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.ServiceDiscoveryProxyImpl" />
+ <reference name="serviceDiscovery">
+ <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
+ </reference>
+ </component>
+
+ <component name="node">
+ <service name="Resource">
+ <tuscany:binding.http uri="http://localhost:8081/node"/>
+ </service>
+ <tuscany:implementation.resource location="webroot"/>
+ </component>
+
+
+</composite>
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html?rev=573892&view=auto
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html (added)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html Sat Sep 8 12:03:47 2007
@@ -0,0 +1,69 @@
+<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 Node</TITLE>
+
+ <script type="text/javascript" src="../SCADomain/scaDomain.js"></script>
+
+ <script language="JavaScript">
+
+ componentManager = new JSONRpcClient("../NodeManagerComponent/ComponentManagerJson");
+
+ function getComponentInfos() {
+ componentManager.ComponentManagerService.getComponentInfos(handleGetComponentInfos);
+ }
+
+ function handleGetComponentInfos(result) {
+
+ var text = ""
+
+ for (var i in result.list){
+ var component = result.list[i];
+
+ text = text + "<table>";
+ text = text + "<TR CLASS='source_2' >";
+ text = text + " <TD>" + component.name+ "</TD>";
+ text = text + " <TD>" + component.started+ "</TD>";
+ text = text + "</TR>";
+ }
+
+ document.getElementById('nodeInfo').innerHTML=text;
+ }
+
+
+ </script>
+
+ <link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+
+<body onload="getComponentInfos()">
+
+
+<h1 id="top">Apache Tuscany Node</h1>
+<div id="errors"></div>
+
+<p>Node Name<span id="nodeName"></span>:</p>
+
+<div id="nodeInfo"></div>
+
+<p /><input type="button" value="Refresh" onclick="getComponentInfos()" />
+
+</body>
+</html>
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/index.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/node.png
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/node.png?rev=573892&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/node.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css?rev=573892&view=auto
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css (added)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css Sat Sep 8 12:03:47 2007
@@ -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;
+}
+
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/webroot/style.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml?rev=573892&r1=573891&r2=573892&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml Sat Sep 8 12:03:47 2007
@@ -30,11 +30,11 @@
<context-param>
<param-name>domainName</param-name>
- <param-value>localdomain</param-value>
+ <param-value>mydomain</param-value>
</context-param>
<context-param>
<param-name>nodeName</param-name>
- <param-value>localnode</param-value>
+ <param-value>nodeB</param-value>
</context-param>
<context-param>
<param-name>hotDeployInterval</param-name>
Added: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar?rev=573892&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org