You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/07/30 20:58:28 UTC
svn commit: r681176 -
/tuscany/java/sca/modules/domain-manager/src/main/resources/
Author: jsdelfino
Date: Wed Jul 30 11:58:26 2008
New Revision: 681176
URL: http://svn.apache.org/viewvc?rev=681176&view=rev
Log:
Simplified how widgets get loaded in the domain manager UI iframes. Moved some of the header text from the widgets to the main pages, as in a mashup you don't need these headers in each widget.
Modified:
tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite
tuscany/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html
tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html
tuscany/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html
tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
tuscany/java/sca/modules/domain-manager/src/main/resources/files-gadget.html
tuscany/java/sca/modules/domain-manager/src/main/resources/files.html
tuscany/java/sca/modules/domain-manager/src/main/resources/home-gadget.html
tuscany/java/sca/modules/domain-manager/src/main/resources/home.html
tuscany/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html
tuscany/java/sca/modules/domain-manager/src/main/resources/workspace.html
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite Wed Jul 30 11:58:26 2008
@@ -27,19 +27,6 @@
<service name="Widget">
<t:binding.http uri="http://localhost:9990/ui/home"/>
</service>
- <reference name="toolbarGadget" target="ToolbarGadget">
- <t:binding.http/>
- </reference>
- <reference name="homeGadget" target="HomeGadget">
- <t:binding.http/>
- </reference>
- </component>
-
- <component name="ToolbarGadget">
- <t:implementation.widget location="toolbar-gadget.html"/>
- <service name="Widget">
- <t:binding.http uri="http://localhost:9990/ui/toolbar-gadget"/>
- </service>
</component>
<component name="HomeGadget">
@@ -54,12 +41,6 @@
<service name="Widget">
<t:binding.http uri="http://localhost:9990/ui/workspace"/>
</service>
- <reference name="toolbarGadget" target="ToolbarGadget">
- <t:binding.http/>
- </reference>
- <reference name="workspaceGadget" target="WorkspaceGadget">
- <t:binding.http/>
- </reference>
</component>
<component name="WorkspaceGadget">
@@ -77,12 +58,6 @@
<service name="Widget">
<t:binding.http uri="http://localhost:9990/ui/files"/>
</service>
- <reference name="toolbarGadget" target="ToolbarGadget">
- <t:binding.http/>
- </reference>
- <reference name="filesGadget" target="FilesGadget">
- <t:binding.http/>
- </reference>
</component>
<component name="FilesGadget">
@@ -100,12 +75,6 @@
<service name="Widget">
<t:binding.http uri="http://localhost:9990/ui/composite"/>
</service>
- <reference name="toolbarGadget" target="ToolbarGadget">
- <t:binding.http/>
- </reference>
- <reference name="compositeGadget" target="DomainCompositeGadget">
- <t:binding.http/>
- </reference>
</component>
<component name="DomainCompositeGadget">
@@ -126,12 +95,6 @@
<service name="Widget">
<t:binding.http uri="http://localhost:9990/ui/cloud"/>
</service>
- <reference name="toolbarGadget" target="ToolbarGadget">
- <t:binding.http/>
- </reference>
- <reference name="cloudGadget" target="CloudGadget">
- <t:binding.http/>
- </reference>
</component>
<component name="CloudGadget">
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html Wed Jul 30 11:58:26 2008
@@ -318,11 +318,6 @@
<body onload="init()">
<div id="cloudComposite">
- <span class=hd1>
- SCA Domain<br><br>
- Cloud</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a>
- </span>
- <br><br>
Here is the list of SCA nodes configured in your SCA domain cloud.
<br><br>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/cloud.html Wed Jul 30 11:58:26 2008
@@ -20,45 +20,19 @@
<head>
<title>SCA Domain - Cloud</title>
-<script type="text/javascript" src="../cloud/cloud.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var toolbarGadget = new Reference("toolbarGadget");
-
- //@Reference
- var cloudGadget = new Reference("cloudGadget");
-
- function toolbarGadget_getResponse(html) {
- var gadget = document.getElementById('toolbarGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function cloudGadget_getResponse(html) {
- var gadget = document.getElementById('cloudGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function init() {
- toolbarGadget.get('', toolbarGadget_getResponse);
- cloudGadget.get('', cloudGadget_getResponse);
- }
-
-</script>
-
<link rel="stylesheet" type="text/css" href="manager.css">
</head>
-<body onload="init()">
- <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe>
+<body>
+ <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe>
+ <br><br>
+
+ <span class=hd1>
+ SCA Domain<br><br>
+ Cloud</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a>
+ </span>
<br>
- <iframe id="cloudGadget" style="left: 0px; width: 100%; height: 100%;"></iframe>
+
+ <iframe id="cloudGadget" src="cloud-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe>
</body>
</html>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html Wed Jul 30 11:58:26 2008
@@ -219,11 +219,6 @@
<body onload="init()">
<div id="domainComposite">
- <span class=hd1>
- SCA Domain<br><br>
- Domain Composite <a href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
- </span>
- <br><br>
Here is the list of SCA composites currently included as top-level composites in your SCA domain.
<br><br>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/composite.html Wed Jul 30 11:58:26 2008
@@ -20,45 +20,19 @@
<head>
<title>SCA Domain - Domain Composite</title>
-<script type="text/javascript" src="../composite/composite.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var toolbarGadget = new Reference("toolbarGadget");
-
- //@Reference
- var compositeGadget = new Reference("compositeGadget");
-
- function toolbarGadget_getResponse(html) {
- var gadget = document.getElementById('toolbarGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function compositeGadget_getResponse(html) {
- var gadget = document.getElementById('compositeGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function init() {
- toolbarGadget.get('', toolbarGadget_getResponse);
- compositeGadget.get('', compositeGadget_getResponse);
- }
-
-</script>
-
<link rel="stylesheet" type="text/css" href="manager.css">
</head>
-<body onload="init()">
- <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe>
+<body>
+ <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe>
+ <br><br>
+
+ <span class=hd1>
+ SCA Domain<br><br>
+ Domain Composite <a href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
+ </span>
<br>
- <iframe id="compositeGadget" style="left: 0px; width: 100%; height: 100%;"></iframe>
+
+ <iframe id="compositeGadget" src="composite-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe>
</body>
</html>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/files-gadget.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/files-gadget.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/files-gadget.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/files-gadget.html Wed Jul 30 11:58:26 2008
@@ -77,11 +77,6 @@
<body onload="init()">
<div id="fileServer">
- <span class=hd1>
- SCA Domain<br><br>
- File Server <a href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a>
- </span>
- <br><br>
This is a simple ATOM-based file server useful to share files if you don't have an FTP, SVN or Maven repository.
<br><br>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/files.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/files.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/files.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/files.html Wed Jul 30 11:58:26 2008
@@ -20,45 +20,19 @@
<head>
<title>SCA Domain - Contribution File Server</title>
-<script type="text/javascript" src="../files/files.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var toolbarGadget = new Reference("toolbarGadget");
-
- //@Reference
- var filesGadget = new Reference("filesGadget");
-
- function toolbarGadget_getResponse(html) {
- var gadget = document.getElementById('toolbarGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function filesGadget_getResponse(html) {
- var gadget = document.getElementById('filesGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function init() {
- toolbarGadget.get('', toolbarGadget_getResponse);
- filesGadget.get('', filesGadget_getResponse);
- }
-
-</script>
-
<link rel="stylesheet" type="text/css" href="manager.css">
</head>
-<body onload="init()">
- <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe>
+<body>
+ <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe>
+ <br><br>
+
+ <span class=hd1>
+ SCA Domain<br><br>
+ File Server <a href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a>
+ </span>
<br>
- <iframe id="filesGadget" style="left: 0px; width: 100%; height: 100%;"></iframe>
+
+ <iframe id="filesGadget" src="files-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe>
</body>
</html>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/home-gadget.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/home-gadget.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/home-gadget.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/home-gadget.html Wed Jul 30 11:58:26 2008
@@ -36,12 +36,6 @@
<body onload="init()">
<div id="home">
- <span class=hd1>
- SCA Domain
- </span>
-
- <br><br><br><br><br>
-
<form>
<table border="0" align="center">
<tr><td valign="top"><span style="font-size:150%; color: blue">Search:</span></td><td><input type="text" name="search" size="50"/></td></tr>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/home.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/home.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/home.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/home.html Wed Jul 30 11:58:26 2008
@@ -22,43 +22,18 @@
<script type="text/javascript" src="../home/home.js"></script>
-<script language="JavaScript">
-
- //@Reference
- var toolbarGadget = new Reference("toolbarGadget");
-
- //@Reference
- var homeGadget = new Reference("homeGadget");
-
- function toolbarGadget_getResponse(html) {
- var gadget = document.getElementById('toolbarGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function homeGadget_getResponse(html) {
- var gadget = document.getElementById('homeGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function init() {
- toolbarGadget.get('', toolbarGadget_getResponse);
- homeGadget.get('', homeGadget_getResponse);
- }
-
-</script>
-
<link rel="stylesheet" type="text/css" href="manager.css">
</head>
-<body onload="init()">
- <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe>
- <br>
- <iframe id="homeGadget" style="left: 0px; width: 100%; height: 100%;"></iframe>
+<body>
+ <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe>
+ <br><br>
+
+ <span class=hd1>
+ SCA Domain
+ </span>
+ <br><br><br><br><br><br>
+
+ <iframe id="homeGadget" src="home-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe>
</body>
</html>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html Wed Jul 30 11:58:26 2008
@@ -169,14 +169,10 @@
<body onload="init()">
<div id="workspace">
-
- <span class=hd1>
- SCA Domain<br><br>
- Contributions</b> <a href="/workspace/"><img src="icons/feed-icon.png" border="0"></a> </span>
- <br><br>
+
Here is the list of SCA contributions currently available in your SCA domain.
<br><br>
-
+
<form name="workspaceForm">
<div id="contributions" ></div>
<br>
Modified: tuscany/java/sca/modules/domain-manager/src/main/resources/workspace.html
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/resources/workspace.html?rev=681176&r1=681175&r2=681176&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/resources/workspace.html (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/resources/workspace.html Wed Jul 30 11:58:26 2008
@@ -20,45 +20,18 @@
<head>
<title>SCA Domain - Contributions</title>
-<script type="text/javascript" src="../workspace/workspace.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var toolbarGadget = new Reference("toolbarGadget");
-
- //@Reference
- var workspaceGadget = new Reference("workspaceGadget");
-
- function toolbarGadget_getResponse(html) {
- var gadget = document.getElementById('toolbarGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function workspaceGadget_getResponse(html) {
- var gadget = document.getElementById('workspaceGadget');
- var content = gadget.contentWindow.document;
- content.open();
- content.write(html);
- content.close();
- }
-
- function init() {
- toolbarGadget.get('', toolbarGadget_getResponse);
- workspaceGadget.get('', workspaceGadget_getResponse);
- }
-
-</script>
-
<link rel="stylesheet" type="text/css" href="manager.css">
</head>
-<body onload="init()">
- <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe>
+<body>
+ <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe>
+ <br><br>
+
+ <span class=hd1>
+ SCA Domain<br><br>
+ Contributions</b> <a href="/workspace/"><img src="icons/feed-icon.png" border="0"></a> </span>
<br>
- <iframe id="workspaceGadget" style="left: 0px; width: 100%; height: 100%;"></iframe>
+
+ <iframe id="workspaceGadget" src="workspace-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe>
</body>
</html>