diff options
Diffstat (limited to 'branches/sca-java-1.x/modules/domain-manager/src/main/resources')
7 files changed, 141 insertions, 70 deletions
diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/DomainManager.composite b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/DomainManager.composite index 3336d1eec6..8dc5d023dd 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/DomainManager.composite +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/DomainManager.composite @@ -34,6 +34,11 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/search"/> </service> + + <reference name="searcher" target="SearcherCollectionComponent/ItemCollection"> + <t:binding.atom/> + </reference> + </component> <component name="HomeGadget"> @@ -216,6 +221,8 @@ <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/> <reference name="processCollection" target="NodeProcessCollectionFacadeComponent/LocalItemCollection"/> <reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/> + <reference name="domainSearch" target="DomainSearchComponent"/> + <reference name="contributionReader" target="DeployableCompositeCollectionComponent/ContributionsReader"/> </component> <component name="CloudCompositeServiceComponent"> @@ -257,17 +264,6 @@ <reference name="processCollection" target="NodeProcessCollectionComponent/LocalItemCollection"/> </component> - <component name="SearchGadget"> - <t:implementation.widget location="search-gadget.html"/> - <service name="Widget"> - <t:binding.http uri="http://localhost:9990/ui/search-gadget"/> - </service> - <reference name="searcher" target="SearcherCollectionComponent/ItemCollection"> - <t:binding.atom/> - </reference> - - </component> - <component name="SearcherCollectionComponent"> <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.Searcher"/> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home-gadget.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home-gadget.html index 05e262e4df..e54626af0e 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home-gadget.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home-gadget.html @@ -29,17 +29,8 @@ <body> <div id="home"> - <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> - <tr><td></td><td align="center"><input type="button" name="search" value="Search" /></td></tr> - </table> - </form> </div> </body> -<script type="text/javascript"> - var gadget = gadget(window, document); -</script> </html> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home.html index aad1856621..141a48a690 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/home.html @@ -36,9 +36,6 @@ <div id="homeGadgetDiv"></div> - <br><br><br><br><br><br><br> - <center>This page is under construction, searching the domain is not implemented yet.</center> - <iframe id="toolbarGadget" src="toolbar-gadget.html" style="visibility: hidden;"></iframe> <iframe id="homeGadget" src="home-gadget.html" style="visibility: hidden;"></iframe> </body> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html index 49737a0ae5..24a7013cf7 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html @@ -27,41 +27,13 @@ <link rel="stylesheet" type="text/css" href="manager.css"> -</head> - -<body> - <div id="domainSearch"> - - <form id="domainSearchForm"> - - <p style="margin-top:1em;margin-bottom:1em;margin-left:1em;margin-right:1em"> - <input id="searchField" type="text" value="" /> <input id="searchButton" type="button" value="Search" onclick="search()" /> - </p> - - <br> - <br> - <div id="results"></div> - </form> - - </div> -</body> - <script type="text/javascript"> - //@Reference - var searcher = new tuscany.sca.Reference("searcher"); - - var gadget = gadget(window, document); - - var lastQuery = ""; - - elementByID(gadget, 'searchButton').onclick = search; - - function search() { - lastQuery = elementByID(gadget, 'searchField').value; - searcher.get("query" + lastQuery, searchResponse); + function search(query) { + searcher.get("query" + query, searchResponse); + } - + function getHighlighted(artifact) { searcher.get("highlight" + lastQuery + ";" + artifact, searchResponse); } @@ -72,17 +44,57 @@ var results = elementByID(gadget, "results"); results.innerHTML = content[0].firstChild.data; + } function searchResponse(feed) { - alert("processing results"); var entries = feed.getElementsByTagName("entry"); var content = entries[0].getElementsByTagName("content"); var results = elementByID(gadget, "results"); results.innerHTML = content[0].firstChild.data; + + } + + function getParameter( name ) + { + name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); + var regexS = "[\\?&]"+name+"=([^&#]*)"; + var regex = new RegExp( regexS ); + var results = regex.exec( window.top.location.href ); + if( results == null ) + return "" + else + return results[1]; } + function checkQuery() { + var query = getParameter("query"); + + if (query.length > 0) { + search(query); + + } else { + search("*:*"); + } + + } + +</script> + +</head> + +<body onload="checkQuery()"> + <div id="results"></div> + </body> + +<script type="text/javascript"> + + //@Reference + var searcher = new tuscany.sca.Reference("searcher"); + + var gadget = gadget(window, document); + </script> </html> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html index 9bd80a6349..376e44726f 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html @@ -21,46 +21,107 @@ <title>SCA Domain - Search</title> <script type="text/javascript" src="utils.js"></script> +<script type="text/javascript" src="../search/search.js"></script> <link rel="stylesheet" type="text/css" href="manager.css"> + +<script type="text/javascript"> + + function search(query) { + searcher.get("query" + query, searchResponse); + } + + function getHighlighted(artifact) { + + var query = getParameter("query"); + + if (query.length == 0) { + query = "*:*"; + } + + searcher.get("highlight" + query + ";" + artifact, highlightResponse); + } + + function highlightResponse(feed) { + var entries = feed.getElementsByTagName("entry"); + var content = entries[0].getElementsByTagName("content"); + var title = entries[0].getElementsByTagName("title")[0].firstChild.data; + + var fileContent = document.getElementById(title); + fileContent.innerHTML = content[0].firstChild.data; + + } + + function searchResponse(feed) { + var entries = feed.getElementsByTagName("entry"); + var content = entries[0].getElementsByTagName("content"); + + var results = document.getElementById("results"); + results.innerHTML = content[0].firstChild.data; + + } + + function getParameter( name ) + { + name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); + var regexS = "[\\?&]"+name+"=([^&#]*)"; + var regex = new RegExp( regexS ); + var results = regex.exec( window.top.location.href ); + if( results == null ) + return "" + else + return results[1]; + } + + function checkQuery() { + var query = getParameter("query"); + + if (query.length > 0) { + search(query); + + } else { + search("*:*"); + } + + } + +</script> + </head> -<body> +<body onload="checkQuery()"> <div id="toolbarGadgetDiv"></div> <br> <span class=hd1> - SCA Domain<br><br> - Domain Search <a href="/search/"><img src="icons/feed-icon.png" border="0"></a> + Results<br> </span> - <br> <p> <div id="searchGadgetDiv"></div> </p> + <div id="results"></div> + <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe> - <iframe id="searchGadget" src="search-gadget.html" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> </body> <script type="text/javascript"> var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv'); - var searchGadgetDiv = elementByID(document, 'searchGadgetDiv'); - var toolbarGadget = elementByID(document, 'toolbarGadget'); - var searchGadget = elementByID(document, 'searchGadget'); function ongadget(win, doc) { if (doc == content(toolbarGadget)) { toolbarGadgetDiv.innerHTML = doc.body.innerHTML; return toolbarGadgetDiv; - } else if (doc == content(searchGadget)) { - searchGadgetDiv.innerHTML = doc.body.innerHTML; - searchGadgetDiv.showContributions = true; - searchGadgetDiv.showComponents = true; - return searchGadgetDiv; } return document; } + + //@Reference + var searcher = new tuscany.sca.Reference("searcher"); + + var gadget1 = gadget(window, document); + </script> </html> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/toolbar-gadget.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/toolbar-gadget.html index c9389affc3..d145fde1c4 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/toolbar-gadget.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/toolbar-gadget.html @@ -42,6 +42,18 @@ var toolbarDiv = elementByID(gadget, 'toolbar'); toolbarDiv.innerHTML = toolbar(home, tools); + + + function gup( name ) { + name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); + var regexS = "[\\?&]"+name+"=([^&#]*)"; + var regex = new RegExp( regexS ); + var results = regex.exec( window.location.href ); + if( results == null ) + return ""; + else + return results[1]; + } </script> </html> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/utils.js b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/utils.js index 77ed807e85..d41435b084 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/utils.js +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/utils.js @@ -157,7 +157,9 @@ function toolbar(home, tools) { for (var i = 0; i < tools.length; i++) { toolbar = toolbar + '<td class=ltbar>' +tools[i].print() + '</td>' } - + + toolbar = toolbar + '<td class=ltbar><input id="searchField" type="text" value="" /> <input id="searchButton" type="submit" value="Search" onclick="window.location=\'/ui/search/?query=\' + elementByID(gadget(window, document), \'searchField\').value" /></td>' + toolbar = toolbar + '</tr></table></td>' + '<td class=rtbar><table border="0" cellpadding="0" cellspacing="0" align="right"><tr>' + '<td class=rtbar>' + home.print() + '</td></tr></table></td>' + |