geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r499270 [2/2] - in /geronimo/server/trunk: applications/console/geronimo-console-framework/src/main/webapp/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ applications/console/geron...
Date Wed, 24 Jan 2007 06:03:05 GMT
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java Tue Jan 23 22:03:04 2007
@@ -1,132 +1,111 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class StringTree {
-    public String name = null;
-    public ArrayList childs = new ArrayList();    
-    public StringTree(String nm, ArrayList elements){
-        name = nm;
-        childs = elements;
-    }
-    public StringTree(String nm){
-        name = nm;        
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String nm){
-        name = nm;;
-    }
-    public ArrayList getChilds(){
-        return childs;
-    }
-    public void setChilds(ArrayList elements){
-        childs = elements;
-    }
-    public void addChild(Object obj){
-        childs.add(obj);
-    }
-    public StringTree findNode(String id){
-        if(id == null)return null;
-        if(name != null && name.equals(id))
-            return this;
-        Iterator iter = childs.iterator();
-        while(iter.hasNext()){
-            Object obj = iter.next();
-            if(obj instanceof StringTree){
-                StringTree tree = ((StringTree)obj).findNode(id);
-                if(tree != null)return tree;
-            }                
-        }
-        return null;
-    }
-           
-    public String toJSONObject(String prependId){
-        StringBuffer stb = new StringBuffer();
-        stb.append("{title:'");
-        if(name != null)
-            stb.append(name);
-        stb.append("',widgetId:'");
-        stb.append(prependId);
-        if(childs == null || childs.size() == 0){
-            stb.append("',children:[]}");
-        }
-        else
-        {
-            stb.append("',children:[");
-            for(int i=0;i<childs.size();i++){
-                Object obj = childs.get(i);
-                if(i !=0 )stb.append(",");
-                if(obj instanceof StringTree)
-                    stb.append(((StringTree)obj).toJSONObject(prependId+"."+i)); 
-                else
-                {
-                    stb.append("{title:'");
-                    stb.append((String)obj);
-                    stb.append("',widgetId:'");
-                    stb.append(prependId+"."+i);
-                    stb.append("'}");
-                }
-            }
-            stb.append("]}");
-        }
-        return stb.toString();
-    }
-    public static String classIcon = "../images/ico_C.gif";
-    public static String interfaceIcon = "../images/ico_I.gif";
-    public static String folderIcon = "../images/ico_folder_16x16.gif";
-    public static String clIcon = "../images/ico_filetree_16x16.gif";
-    public String toHTMLNode(int depth)
-    {
-        //if(depth > 2)return "";
-        StringBuffer stb = new StringBuffer();
-        
-        if(childs == null || childs.size() == 0){
-            stb.append("<div dojoType='TreeNode' title='"+name+"'></div>");
-        }
-        else
-        {
-            if(name.equals("Classes") || name.equals("Interfaces"))
-                stb.append("<div dojoType='TreeNode' title='"+name+"' childIconSrc='"+folderIcon+"'>");
-            else
-                stb.append("<div dojoType='TreeNode' title='"+name+"' childIconSrc='"+clIcon+"'>");
-            Iterator iter = childs.iterator();
-            while(iter.hasNext()){
-                Object obj = iter.next();
-                if(obj instanceof StringTree)
-                    stb.append(((StringTree)obj).toHTMLNode(depth+1));
-                else
-                {/*
-                    String curr = (String)obj;
-                    if(curr.startsWith("class"))
-                        stb.append("<div dojoType='TreeNode' title='"+curr.substring(6)+"' childIconSrc='"+classIcon+"'></div>");
-                    else if(curr.startsWith("interface"))
-                        stb.append("<div dojoType='TreeNode' title='"+curr.substring(10)+"' childIconSrc='"+interfaceIcon+"'></div>");
-                    else
-                        stb.append("<div dojoType='TreeNode' title='"+curr+"'></div>");
-                        */
-                }                
-            }
-            stb.append("</div>");            
-        }
-        return stb.toString();
-    }
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Hashtable;
+
+public class StringTree {
+    public String name = null;
+    public ArrayList childs = new ArrayList();    
+    public StringTree(String nm, ArrayList elements){
+        name = nm;
+        childs = elements;
+    }
+    public StringTree(String nm){
+        name = nm;        
+    }
+    public String getName(){
+        return name;
+    }
+    public void setName(String nm){
+        name = nm;;
+    }
+    public ArrayList getChilds(){
+        return childs;
+    }
+    public void setChilds(ArrayList elements){
+        childs = elements;
+    }
+    public void addChild(Object obj){
+        childs.add(obj);
+    }
+    public StringTree findNode(String id){
+        if(id == null)return null;
+        if(name != null && name.equals(id))
+            return this;
+        Iterator iter = childs.iterator();
+        while(iter.hasNext()){
+            Object obj = iter.next();
+            if(obj instanceof StringTree){
+                StringTree tree = ((StringTree)obj).findNode(id);
+                if(tree != null)return tree;
+            }                
+        }
+        return null;
+    }
+           
+    public String toJSONObject(String prependId){
+        return toJSONObject(prependId, null);
+    }
+           
+    public String toJSONObject(String prependId, Hashtable htLinks){
+        StringBuffer stb = new StringBuffer();
+        if(htLinks != null){
+            if(!name.startsWith("class ") && !name.startsWith("interface ") && !name.equals("Classes") && !name.equals("Interfaces") && htLinks.containsKey(name)){
+                stb.append("{title:'link::");
+                stb.append(htLinks.get(name));
+                stb.append("',widgetId:'");
+                stb.append(prependId);
+                stb.append("'}");
+                return stb.toString();
+            }
+            else {
+                htLinks.put(name, prependId);
+            }       
+        }        
+        stb.append("{title:'");
+        if(name != null)
+            stb.append(name);
+        stb.append("',widgetId:'");
+        stb.append(prependId);
+        if(childs == null || childs.size() == 0){
+            stb.append("',children:[]}");
+        }
+        else
+        {
+            stb.append("',children:[");
+            for(int i=0;i<childs.size();i++){
+                Object obj = childs.get(i);
+                if(i !=0 )stb.append(",");
+                if(obj instanceof StringTree)
+                    stb.append(((StringTree)obj).toJSONObject(prependId+"."+i, htLinks)); 
+                else
+                {
+                    stb.append("{title:'");
+                    stb.append((String)obj);
+                    stb.append("',widgetId:'");
+                    stb.append(prependId+"."+i);
+                    stb.append("'}");
+                }
+            }
+            stb.append("]}");
+        }
+        return stb.toString();
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp Tue Jan 23 22:03:04 2007
@@ -1,20 +1,20 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration Classloader VIEW page.</b></center></font></p>
-
-<P>This view can be used to all the classloader involved in server and the classes it loads.</P>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration Classloader VIEW page.</b></center></font></p>
+
+<P>This view can be used to all the classloader involved in server and the classes it loads.</P>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp Tue Jan 23 22:03:04 2007
@@ -1,192 +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.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest, org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
-<portlet:defineObjects/>
-
-<%
-	
-
-	ClassLoaderViewPortlet cp = (ClassLoaderViewPortlet)renderRequest.getPortletSession().getAttribute("classloaderTree");	
-	renderRequest.getPortletSession().removeAttribute("classloaderTree");
-	String childs = cp.getJSONTrees();
-%>
-
-<script>
-	dojo.require("dojo.widget.*");
-	dojo.require("dojo.widget.TreeV3");
-	dojo.require("dojo.widget.TreeNodeV3");
-	dojo.require("dojo.widget.TreeBasicControllerV3");
-	dojo.require("dojo.widget.TreeSelectorV3");
-	dojo.require("dojo.widget.TreeEmphasizeOnSelect");
-	dojo.require("dojo.widget.TreeToggleOnSelect");
-	
-	dojo.hostenv.writeIncludes();
-
-    dojo.addOnLoad(function(){
-
-		var tree = dojo.widget.manager.getWidgetById('tree');
-
-		var treeNodes = <%= childs %>;		
-
-		tree.setChildren(treeNodes);
-
-	});
-
-
-
-var lastFound = '';
-var doCheck = false;;
-function check(curr,last)
-{
-	var cr=curr.split(".");
-	var ls=last.split(".");
-	for(var i =0;i<cr.length;i++)
-		if(parseInt(cr[i]) < parseInt(ls[i]))
-			return false;
-	return true;
-}
-function findNext(children, str)
-{
-	for(var child = 0;child < children.length;child++)
-	{
-		if(doCheck)
-		{
-			if(!check(children[child].widgetId,lastFound))
-				continue;
-			else
-				if(children[child].widgetId == lastFound)doCheck = false;
-		}
-		if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck)
-			return children[child].widgetId;
-		if(children[child].children){
-			var ret=findNext(children[child].children,str);
-			if(ret)
-				return ret;
-		}
-	}	
-	return ;
-}
-
-function select(node)
-{
-	var nodes = node.split(".");
-	var curr ="";
-	for(nod in nodes)
-	{
-		if(curr == "")curr=curr+nodes[nod];
-		else curr=curr+"."+nodes[nod];
-		if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
-			dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
-		dojo.widget.byId('controller').expandToLevel(dojo.widget.byId(curr),1);
-	}
-	dojo.widget.byId('selector').select(dojo.widget.byId(node));
-}
-
-function findInSelected(selectedNodes)
-{
-	var search = document.getElementById("searchText").value;
-	if(search == "")
-	{
-		debug.innerHTML = "<br/>Failure in search: No text to search";
-		alert('Failure in search: No text to search');
-		return;
-	}
-	var v= findNext(selectedNodes,search);
-	if(v)
-	{
-		dojo.widget.byId('selector').deselectAll();
-		select(v);
-		document.getElementById("findNext").disabled=false;
-		lastFound =  v;
-		doCheck = true;
-	}
-	else{
-		debug.innerHTML = "<br/>Failure in search: No more matching result found";
-		alert('Failure in search: No more matching result found');
-		lastFound =  '';
-		doCheck = false;
-	}
-}
-function textChange(){
-	document.getElementById("findNext").disabled=true;
-	lastFound = '';
-	doCheck = false;
-}
-
-var lastSearchOn = '';
-function search(){
-	debug.innerHTML = "";
-	document.body.style.cursor = "wait";
-	lastFound = '';
-	doCheck = false;
-	lastSearchOn = [];
-	var nodes;
-	if(document.getElementById("inSelected").checked){
-		nodes = dojo.widget.byId('selector').selectedNodes;
-		if(nodes == '')
-		{
-			debug.innerHTML = "<br/>Failure in search: No node selected to search.";
-			alert('Failure in search: No node selected to search');
-		}
-		else{
-			for(obj in nodes)
-				lastSearchOn.push(nodes[obj]);	
-			findInSelected(nodes);
-		}
-	}
-	else{ 
-		nodes = dojo.widget.byId('tree').children;
-		lastSearchOn = dojo.widget.byId('tree').children;
-		findInSelected(nodes);
-	}
-	document.body.style.cursor = '';
-}
-function searchContinue(){
-	debug.innerHTML = "";
-	document.body.style.cursor = "wait";
-	findInSelected(lastSearchOn);
-	document.body.style.cursor = '';
-}
-
-</script>
-
-	<% 
-		String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-	    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-	%>
-
-<TABLE cellpadding="1" cellspacing="1" border="1">
-<tr><td>
-<b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
-<input type="button" value="Find" onClick="javascript:search()"/>
-<input type="button" id="findNext" value="Find Next" onClick="javascript:searchContinue()" disabled=true />
-Search only selected:<input type="checkbox" id="inSelected" onChange="javascript:textChange()"/>
-</td></tr>
-</table>
-<br/>
-
-<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>	
-<div dojoType="TreeSelectorV3" widgetId="selector"></div>	
-<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
-<div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
-<div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
-
-<div id="debug"></div>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ page import="org.apache.geronimo.console.util.PortletManager,
+                 javax.portlet.RenderRequest,org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
+<portlet:defineObjects />
+
+<%
+
+
+    ClassLoaderViewPortlet cp = (ClassLoaderViewPortlet) renderRequest.getPortletSession().getAttribute("classloaderTree");
+    renderRequest.getPortletSession().removeAttribute("classloaderTree");
+    String childs = cp.getJSONTrees();
+%>
+
+<script>
+        dojo.require("dojo.widget.*");
+        dojo.require("dojo.widget.TreeV3");
+        dojo.require("dojo.widget.TreeNodeV3");
+        dojo.require("dojo.widget.TreeBasicControllerV3");
+        dojo.require("dojo.widget.TreeSelectorV3");
+        dojo.require("dojo.widget.TreeEmphasizeOnSelect");
+        dojo.require("dojo.widget.TreeToggleOnSelect");
+        
+        dojo.hostenv.writeIncludes();
+
+    dojo.addOnLoad(function(){
+
+        var tree = dojo.widget.manager.getWidgetById('tree');
+
+        var treeNodes = <%= childs %>;          
+
+        tree.setChildren(treeNodes);
+
+        dojo.event.topic.subscribe('tree/afterExpand',
+            function(source) { 
+            for(i in source['source'].children)
+                if(source['source'].children[i].title.indexOf('link::') == 0){
+                    var node = source['source'].children[i].title.substring(6);
+                    load(node);
+                    var curr = dojo.widget.byId(node);
+                    var chil =  replace(curr.children, curr.widgetId, source['source'].children[i].widgetId); 
+                    source['source'].children[i].setTitle(curr.title);
+                    source['source'].children[i].setChildren(chil);  
+                }
+            }
+        );
+
+        });
+
+
+
+var lastFound = '';
+var doCheck = false;
+
+function replace(children, from, to)
+{
+    var child =[];
+    for(name in children)
+    { 
+        var chds = [];
+        var newname = '';
+        var currTitle = children[name].title;
+        if(children[name].widgetId.indexOf(from) == 0)
+        newname = to+children[name].widgetId.substring(from.length);
+        if(children[name].children)
+            chds = replace(children[name].children, from , to);
+        child.push({title:currTitle,widgetId:newname,children:chds});
+    }
+    return child;
+}
+
+function check(curr,last)
+{
+        var cr=curr.split(".");
+        var ls=last.split(".");
+        for(var i =0;i<cr.length;i++)
+                if(parseInt(cr[i]) < parseInt(ls[i]))
+                        return false;
+        return true;
+}
+
+function findNext(children, str)
+{
+        for(var child = 0;child < children.length;child++) {
+                if(doCheck) {
+                        if(!check(children[child].widgetId,lastFound))
+                                continue;
+                        else {
+                                if(children[child].widgetId == lastFound)doCheck = false;
+            }
+                }
+        if(children[child].title.indexOf("link::") == 0) {
+            var node = children[child].title.substring(6);
+            load(node);
+            var curr = dojo.widget.byId(node);
+            var ret = findNext([curr],str)
+            if(ret) {
+                var chil =  replace(curr.children, curr.widgetId, children[child].widgetId); 
+                children[child].setTitle(curr.title);
+                children[child].setChildren(chil);
+                ret=findNext([children[child]],str);
+                if(ret)
+                    return ret;
+            }
+        }
+        else {
+            if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck) {
+                return children[child].widgetId;
+            }
+            if(children[child].children) {
+                var ret=findNext(children[child].children,str);
+                if(ret) {
+                    return ret;
+                }
+            }
+        }
+        }       
+        return ;
+}
+
+function load(node)
+{
+        var nodes = node.split(".");
+        var curr ="";
+        for(nod in nodes)
+        {
+                if(curr == "")curr=curr+nodes[nod];
+                else curr=curr+"."+nodes[nod];
+                if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
+                        dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
+        }
+        dojo.widget.byId('selector').select(dojo.widget.byId(node));
+}
+
+function select(node)
+{
+    load(node);
+    dojo.widget.byId('selector').select(dojo.widget.byId(node));
+}
+
+function findInSelected(selectedNodes)
+{
+        var search = document.getElementById("searchText").value;
+        if(search == "")
+        {
+                debug.innerHTML = "<br/>Failure in search: No text to search";
+                alert('Failure in search: No text to search');
+                return;
+        }
+        var v= findNext(selectedNodes,search);
+        if(v)
+        {
+                dojo.widget.byId('selector').deselectAll();
+                select(v);
+                document.getElementById("findNext").disabled=false;
+                lastFound =  v;
+                doCheck = true;
+        }
+        else{
+                debug.innerHTML = "<br/>Failure in search: No more matching result found";
+                alert('Failure in search: No more matching result found');
+                lastFound =  '';
+                doCheck = false;
+        }
+}
+function textChange(){
+        document.getElementById("findNext").disabled=true;
+        lastFound = '';
+        doCheck = false;
+}
+
+var lastSearchOn = '';
+function search() {
+        debug.innerHTML = "";
+        document.body.style.cursor = "wait";
+        lastFound = '';
+        doCheck = false;
+        lastSearchOn = [];
+        var nodes;
+        if(document.getElementById("inSelected").checked) {
+                nodes = dojo.widget.byId('selector').selectedNodes;
+                if(nodes == '')
+                {
+                        debug.innerHTML = "<br/>Failure in search: No node selected to search.";
+                        alert('Failure in search: No node selected to search');
+                }
+                else {
+                        for(obj in nodes)
+                                lastSearchOn.push(nodes[obj]);  
+                        findInSelected(nodes);
+                }
+        }
+        else { 
+                nodes = dojo.widget.byId('tree').children;
+                lastSearchOn = dojo.widget.byId('tree').children;
+                findInSelected(nodes);
+        }
+        document.body.style.cursor = '';
+}
+
+function searchContinue() {
+        debug.innerHTML = "";
+        document.body.style.cursor = "wait";
+        findInSelected(lastSearchOn);
+        document.body.style.cursor = '';
+}
+
+</script>
+
+<%
+                    String consoleFrameworkContext = PortletManager
+                    .getConsoleFrameworkServletPath(request);
+            String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
+%>
+
+<TABLE cellpadding="1" cellspacing="1" border="1">
+ <tr>
+  <td><b>Search Text:</b> <input type="text" id="searchText"
+   onChange="javascript:textChange()" /> <input type="button"
+   value="Find" onClick="javascript:search()" /> <input type="button"
+   id="findNext" value="Find Next" onClick="javascript:searchContinue()"
+   disabled=true /> Search only selected:<input type="checkbox"
+   id="inSelected" onChange="javascript:textChange()" /></td>
+ </tr>
+</table>
+<br />
+
+<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>
+<div dojoType="TreeSelectorV3" widgetId="selector"></div>
+<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
+<div dojoType="TreeToggleOnSelect" selector="selector"
+ controller="controller"></div>
+<div dojoType="TreeDocIconExtension" widgetId="iconcontroller"
+ templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeV3" listeners="controller;selector;iconcontroller"
+ widgetId='tree' allowedMulti='false'></div>
+
+<div id="debug"></div>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp Tue Jan 23 22:03:04 2007
@@ -1,20 +1,20 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration Dependency VIEW page.</b></center></font></p>
-
-<P>This view can be used to all the modules and its dependencies.</P>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration Dependency VIEW page.</b></center></font></p>
+
+<P>This view can be used to all the modules and its dependencies.</P>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp Tue Jan 23 22:03:04 2007
@@ -1,209 +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.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest"%>
-<portlet:defineObjects/>
-
-<%
-	String childs = (String)renderRequest.getPortletSession().getAttribute("dependencyTree");	
-	renderRequest.getPortletSession().removeAttribute("dependencyTree");
-%>
-
-<script>
-	dojo.require("dojo.widget.*");
-	dojo.require("dojo.widget.TreeV3");
-	dojo.require("dojo.widget.TreeNodeV3");
-	dojo.require("dojo.widget.TreeBasicControllerV3");
-	dojo.require("dojo.widget.TreeSelectorV3");
-	dojo.require("dojo.widget.TreeEmphasizeOnSelect");
-	dojo.require("dojo.widget.TreeToggleOnSelect");
-	
-	dojo.hostenv.writeIncludes();
-
-    dojo.addOnLoad(function(){
-
-		var tree = dojo.widget.manager.getWidgetById('tree');
-
-		dojo.event.topic.subscribe("nodeSelected",
-			 function(message) { 
-				if(message.node.parent.title == "dependencies"){
-					for(var i=0;i<tree.children.length;i++){
-						var node = findOnlyInSelected(tree.children[i],message.node.title);
-						if(node)
-						{
-							select(node);
-							break;
-						}
-					}
-				}
-			 }
-		);
-		
-		
-
-		var treeNodes = <%= childs %>;		
-
-		tree.setChildren(treeNodes);
-
-	});
-function findOnlyInSelected(selectedNodes, search)
-{
-	var children = selectedNodes.children;
-	for(var child = 0;child < children.length;child++)
-	{
-		if(children[child].title == search)
-			return children[child].widgetId;
-	}	
-	return ;
-}
-
-
-var lastFound = '';
-var doCheck = false;;
-function check(curr,last)
-{
-	var cr=curr.split(".");
-	var ls=last.split(".");
-	for(var i =0;i<cr.length;i++)
-		if(parseInt(cr[i]) < parseInt(ls[i]))
-			return false;
-	return true;
-}
-function findNext(children, str)
-{
-	for(var child = 0;child < children.length;child++)
-	{
-		if(doCheck)
-		{
-			if(!check(children[child].widgetId,lastFound))
-				continue;
-			else
-				if(children[child].widgetId == lastFound)doCheck = false;
-		}
-		if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck)
-			return children[child].widgetId;
-		if(children[child].children){
-			var ret=findNext(children[child].children,str);
-			if(ret)
-				return ret;
-		}
-	}	
-	return ;
-}
-
-function select(node)
-{
-	var nodes = node.split(".");
-	var curr ="";
-	for(nod in nodes)
-	{
-		if(curr == "")curr=curr+nodes[nod];
-		else curr=curr+"."+nodes[nod];
-		if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
-			dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
-		dojo.widget.byId('controller').expandToLevel(dojo.widget.byId(curr),1);			
-	}
-	dojo.widget.byId('selector').select(dojo.widget.byId(node));
-}
-
-
-function findInSelected(selectedNodes)
-{
-	var search = document.getElementById("searchText").value;
-	if(search == "")
-	{
-		alert('No Text to search');
-		return;
-	}
-	var v= findNext(selectedNodes,search);
-	if(v)
-	{
-		dojo.widget.byId('selector').deselectAll();
-		select(v);
-		document.getElementById("findNext").disabled=false;
-		lastFound =  v;
-		doCheck = true;
-	}
-	else{
-		alert('Nothing found');
-		lastFound =  '';
-		doCheck = false;
-	}
-}
-function textChange(){
-	document.getElementById("findNext").disabled=true;
-	lastFound = '';
-	doCheck = false;
-}
-
-var lastSearchOn = '';
-function search(){
-	document.body.style.cursor = "wait";
-	lastFound = '';
-	doCheck = false;
-	lastSearchOn = [];
-	var nodes;
-	if(document.getElementById("inSelected").checked){
-		nodes = dojo.widget.byId('selector').selectedNodes;
-		if(nodes == '')
-		{
-			alert('No Node selected to search');
-		}
-		else{
-			for(obj in nodes)
-				lastSearchOn.push(nodes[obj]);	
-			findInSelected(nodes);
-		}
-	}
-	else{ 
-		nodes = dojo.widget.byId('tree').children;
-		lastSearchOn = dojo.widget.byId('tree').children;
-		findInSelected(nodes);
-	}
-	document.body.style.cursor = '';
-}
-function searchContinue(){
-	document.body.style.cursor = "wait";
-	findInSelected(lastSearchOn);
-	document.body.style.cursor = '';
-}
-
-</script>
-
-	<% 
-		String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-	    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-	%>
-<TABLE cellpadding="1" cellspacing="1" border="1">
-<tr><td>
-<b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
-<input type="button" value="Find" onClick="javascript:search()"/>
-<input type="button" id="findNext" value="Find Next" onClick="javascript:searchContinue()" disabled=true />
-Search only selected:<input type="checkbox" id="inSelected" onChange="javascript:textChange()"/>
-</td></tr>
-</table>
-<br/>
-
-<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>	
-<div dojoType="TreeSelectorV3" widgetId="selector" eventNames="select:nodeSelected"></div>	
-<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
-<div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
-<div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
-
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.	See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.	 You may obtain a copy of the License at
+
+	  http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ page import="org.apache.geronimo.console.util.PortletManager,
+				 javax.portlet.RenderRequest"%>
+<portlet:defineObjects/>
+
+<%
+	String childs = (String)renderRequest.getPortletSession().getAttribute("dependencyTree");	
+	renderRequest.getPortletSession().removeAttribute("dependencyTree");
+%>
+
+<script>
+	dojo.require("dojo.widget.*");
+	dojo.require("dojo.widget.TreeV3");
+	dojo.require("dojo.widget.TreeNodeV3");
+	dojo.require("dojo.widget.TreeBasicControllerV3");
+	dojo.require("dojo.widget.TreeSelectorV3");
+	dojo.require("dojo.widget.TreeEmphasizeOnSelect");
+	dojo.require("dojo.widget.TreeToggleOnSelect");
+	
+	dojo.hostenv.writeIncludes();
+
+	dojo.addOnLoad(function(){
+
+		var tree = dojo.widget.manager.getWidgetById('tree');
+
+		dojo.event.topic.subscribe("nodeSelected",
+			 function(message) { 
+				if(message.node.parent.title == "dependencies"){
+					for(var i=0;i<tree.children.length;i++){
+						var node = findOnlyInSelected(tree.children[i],message.node.title);
+						if(node)
+						{
+							select(node);
+							break;
+						}
+					}
+				}
+			 }
+		);
+		
+		
+
+		var treeNodes = <%= childs %>;		
+
+		tree.setChildren(treeNodes);
+
+	});
+function findOnlyInSelected(selectedNodes, search)
+{
+	var children = selectedNodes.children;
+	for(var child = 0;child < children.length;child++)
+	{
+		if(children[child].title == search)
+			return children[child].widgetId;
+	}	
+	return ;
+}
+
+
+var lastFound = '';
+var doCheck = false;;
+function check(curr,last)
+{
+	var cr=curr.split(".");
+	var ls=last.split(".");
+	for(var i =0;i<cr.length;i++)
+		if(parseInt(cr[i]) < parseInt(ls[i]))
+			return false;
+	return true;
+}
+function findNext(children, str)
+{
+	for(var child = 0;child < children.length;child++)
+	{
+		if(doCheck)
+		{
+			if(!check(children[child].widgetId,lastFound))
+				continue;
+			else
+				if(children[child].widgetId == lastFound)doCheck = false;
+		}
+		if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck)
+			return children[child].widgetId;
+		if(children[child].children){
+			var ret=findNext(children[child].children,str);
+			if(ret)
+				return ret;
+		}
+	}	
+	return ;
+}
+
+function select(node)
+{
+	var nodes = node.split(".");
+	var curr ="";
+	for(nod in nodes)
+	{
+		if(curr == "")curr=curr+nodes[nod];
+		else curr=curr+"."+nodes[nod];
+		if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
+			dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
+		dojo.widget.byId('controller').expandToLevel(dojo.widget.byId(curr),1);			
+	}
+	dojo.widget.byId('selector').select(dojo.widget.byId(node));
+}
+
+
+function findInSelected(selectedNodes)
+{
+	var search = document.getElementById("searchText").value;
+	if(search == "")
+	{
+		alert('No Text to search');
+		return;
+	}
+	var v= findNext(selectedNodes,search);
+	if(v)
+	{
+		dojo.widget.byId('selector').deselectAll();
+		select(v);
+		document.getElementById("findNext").disabled=false;
+		lastFound =	 v;
+		doCheck = true;
+	}
+	else{
+		alert('Nothing found');
+		lastFound =	 '';
+		doCheck = false;
+	}
+}
+function textChange(){
+	document.getElementById("findNext").disabled=true;
+	lastFound = '';
+	doCheck = false;
+}
+
+var lastSearchOn = '';
+function search(){
+	document.body.style.cursor = "wait";
+	lastFound = '';
+	doCheck = false;
+	lastSearchOn = [];
+	var nodes;
+	if(document.getElementById("inSelected").checked){
+		nodes = dojo.widget.byId('selector').selectedNodes;
+		if(nodes == '')
+		{
+			alert('No Node selected to search');
+		}
+		else{
+			for(obj in nodes)
+				lastSearchOn.push(nodes[obj]);	
+			findInSelected(nodes);
+		}
+	}
+	else{ 
+		nodes = dojo.widget.byId('tree').children;
+		lastSearchOn = dojo.widget.byId('tree').children;
+		findInSelected(nodes);
+	}
+	document.body.style.cursor = '';
+}
+function searchContinue(){
+	document.body.style.cursor = "wait";
+	findInSelected(lastSearchOn);
+	document.body.style.cursor = '';
+}
+
+</script>
+
+	<% 
+		String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
+		String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
+	%>
+<TABLE cellpadding="1" cellspacing="1" border="1">
+<tr><td>
+<b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
+<input type="button" value="Find" onClick="javascript:search()"/>
+<input type="button" id="findNext" value="Find Next" onClick="javascript:searchContinue()" disabled=true />
+Search only selected:<input type="checkbox" id="inSelected" onChange="javascript:textChange()"/>
+</td></tr>
+</table>
+<br/>
+
+<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>	
+<div dojoType="TreeSelectorV3" widgetId="selector" eventNames="select:nodeSelected"></div>	
+<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
+<div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
+

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp Tue Jan 23 22:03:04 2007
@@ -1,20 +1,20 @@
-<%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration JNDI VIEW page.</b></center></font></p>
-
-<P>This view can be used to view JNDI context for various modules.</P>
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT 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><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration JNDI VIEW page.</b></center></font></p>
+
+<P>This view can be used to view JNDI context for various modules.</P>

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp Tue Jan 23 22:03:04 2007
@@ -1,183 +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.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest"%>
-<portlet:defineObjects/>
-
-<%
-	String childs = (String)renderRequest.getPortletSession().getAttribute("jndiTree");	
-	renderRequest.getPortletSession().removeAttribute("jndiTree");
-%>
-
-<script>
-	dojo.require("dojo.widget.*");
-	dojo.require("dojo.widget.TreeV3");
-	dojo.require("dojo.widget.TreeNodeV3");
-	dojo.require("dojo.widget.TreeBasicControllerV3");
-	dojo.require("dojo.widget.TreeSelectorV3");
-	dojo.require("dojo.widget.TreeEmphasizeOnSelect");
-	dojo.require("dojo.widget.TreeToggleOnSelect");
-	
-	dojo.hostenv.writeIncludes();
-
-    dojo.addOnLoad(function(){
-
-		var tree = dojo.widget.manager.getWidgetById('tree');
-
-		var treeNodes = <%= childs %>;		
-
-		tree.setChildren(treeNodes);
-
-	});
-
-
-
-var lastFound = '';
-var doCheck = false;;
-function check(curr,last)
-{
-	var cr=curr.split(".");
-	var ls=last.split(".");
-	for(var i =0;i<cr.length;i++)
-		if(parseInt(cr[i]) < parseInt(ls[i]))
-			return false;
-	return true;
-}
-function findNext(children, str)
-{
-	for(var child = 0;child < children.length;child++)
-	{
-		if(doCheck)
-		{
-			if(!check(children[child].widgetId,lastFound))
-				continue;
-			else
-				if(children[child].widgetId == lastFound)doCheck = false;
-		}
-		if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck)
-			return children[child].widgetId;
-		if(children[child].children){
-			var ret=findNext(children[child].children,str);
-			if(ret)
-				return ret;
-		}
-	}	
-	return ;
-}
-
-function select(node)
-{
-	var nodes = node.split(".");
-	var curr ="";
-	for(nod in nodes)
-	{
-		if(curr == "")curr=curr+nodes[nod];
-		else curr=curr+"."+nodes[nod];
-		if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
-			dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
-		dojo.widget.byId('controller').expandToLevel(dojo.widget.byId(curr),1);
-	}
-	dojo.widget.byId('selector').select(dojo.widget.byId(node));
-}
-
-function findInSelected(selectedNodes)
-{
-	var search = document.getElementById("searchText").value;
-	if(search == "")
-	{
-		alert('No Text to search');
-		return;
-	}
-	var v= findNext(selectedNodes,search);
-	if(v)
-	{
-		dojo.widget.byId('selector').deselectAll();
-		select(v);
-		document.getElementById("findNext").disabled=false;
-		lastFound =  v;
-		doCheck = true;
-	}
-	else{
-		alert('Nothing found');
-		lastFound =  '';
-		doCheck = false;
-	}
-}
-function textChange(){
-	document.getElementById("findNext").disabled=true;
-	lastFound = '';
-	doCheck = false;
-}
-
-var lastSearchOn = '';
-function search(){
-	document.body.style.cursor = "wait";
-	lastFound = '';
-	doCheck = false;
-	lastSearchOn = [];
-	var nodes;
-	if(document.getElementById("inSelected").checked){
-		nodes = dojo.widget.byId('selector').selectedNodes;
-		if(nodes == '')
-		{
-			alert('No Node selected to search');
-		}
-		else{
-			for(obj in nodes)
-				lastSearchOn.push(nodes[obj]);	
-			findInSelected(nodes);
-		}
-	}
-	else{ 
-		nodes = dojo.widget.byId('tree').children;
-		lastSearchOn = dojo.widget.byId('tree').children;
-		findInSelected(nodes);
-	}
-	document.body.style.cursor = '';
-}
-function searchContinue(){
-	document.body.style.cursor = "wait";
-	findInSelected(lastSearchOn);
-	document.body.style.cursor = '';
-}
-
-</script>
-
-	<% 
-		String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-	    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-	%>
-<TABLE cellpadding="1" cellspacing="1" border="1">
-<tr><td>
-<b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
-<input type="button" value="Find" onClick="javascript:search()"/>
-<input type="button" id="findNext" value="Find Next" onClick="javascript:searchContinue()" disabled=true />
-Search only selected:<input type="checkbox" id="inSelected" onChange="javascript:textChange()"/>
-</td></tr>
-</table>
-<br/>
-
-
-<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>	
-<div dojoType="TreeSelectorV3" widgetId="selector"></div>	
-<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
-<div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
-<div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
-
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ page import="org.apache.geronimo.console.util.PortletManager,
+                 javax.portlet.RenderRequest"%>
+<portlet:defineObjects/>
+
+<%
+        String childs = (String)renderRequest.getPortletSession().getAttribute("jndiTree");     
+        renderRequest.getPortletSession().removeAttribute("jndiTree");
+%>
+
+<script>
+        dojo.require("dojo.widget.*");
+        dojo.require("dojo.widget.TreeV3");
+        dojo.require("dojo.widget.TreeNodeV3");
+        dojo.require("dojo.widget.TreeBasicControllerV3");
+        dojo.require("dojo.widget.TreeSelectorV3");
+        dojo.require("dojo.widget.TreeEmphasizeOnSelect");
+        dojo.require("dojo.widget.TreeToggleOnSelect");
+        
+        dojo.hostenv.writeIncludes();
+
+        dojo.addOnLoad(function(){
+
+            var tree = dojo.widget.manager.getWidgetById('tree');
+
+            var treeNodes = <%= childs %>;          
+
+            tree.setChildren(treeNodes);
+
+        });
+
+
+
+var lastFound = '';
+var doCheck = false;;
+function check(curr,last)
+{
+        var cr=curr.split(".");
+        var ls=last.split(".");
+        for(var i =0;i<cr.length;i++)
+                if(parseInt(cr[i]) < parseInt(ls[i]))
+                        return false;
+        return true;
+}
+function findNext(children, str)
+{
+        for(var child = 0;child < children.length;child++)
+        {
+                if(doCheck)
+                {
+                        if(!check(children[child].widgetId,lastFound))
+                                continue;
+                        else
+                                if(children[child].widgetId == lastFound)doCheck = false;
+                }
+                if(children[child].title.indexOf(str) != -1 && children[child].widgetId != lastFound && !doCheck)
+                        return children[child].widgetId;
+                if(children[child].children){
+                        var ret=findNext(children[child].children,str);
+                        if(ret)
+                                return ret;
+                }
+        }       
+        return ;
+}
+
+function select(node)
+{
+        var nodes = node.split(".");
+        var curr ="";
+        for(nod in nodes)
+        {
+                if(curr == "")curr=curr+nodes[nod];
+                else curr=curr+"."+nodes[nod];
+                if(dojo.widget.byId(curr).state != "LOADED" && dojo.widget.byId(curr).children.length != 0)
+                        dojo.widget.byId(curr).setChildren(dojo.widget.byId(curr).children);
+                dojo.widget.byId('controller').expandToLevel(dojo.widget.byId(curr),1);
+        }
+        dojo.widget.byId('selector').select(dojo.widget.byId(node));
+}
+
+function findInSelected(selectedNodes)
+{
+        var search = document.getElementById("searchText").value;
+        if(search == "")
+        {
+                alert('No Text to search');
+                return;
+        }
+        var v= findNext(selectedNodes,search);
+        if(v)
+        {
+                dojo.widget.byId('selector').deselectAll();
+                select(v);
+                document.getElementById("findNext").disabled=false;
+                lastFound =  v;
+                doCheck = true;
+        }
+        else{
+                alert('Nothing found');
+                lastFound =  '';
+                doCheck = false;
+        }
+}
+function textChange(){
+        document.getElementById("findNext").disabled=true;
+        lastFound = '';
+        doCheck = false;
+}
+
+var lastSearchOn = '';
+function search(){
+        document.body.style.cursor = "wait";
+        lastFound = '';
+        doCheck = false;
+        lastSearchOn = [];
+        var nodes;
+        if(document.getElementById("inSelected").checked){
+                nodes = dojo.widget.byId('selector').selectedNodes;
+                if(nodes == '')
+                {
+                        alert('No Node selected to search');
+                }
+                else{
+                        for(obj in nodes)
+                                lastSearchOn.push(nodes[obj]);  
+                        findInSelected(nodes);
+                }
+        }
+        else{ 
+                nodes = dojo.widget.byId('tree').children;
+                lastSearchOn = dojo.widget.byId('tree').children;
+                findInSelected(nodes);
+        }
+        document.body.style.cursor = '';
+}
+function searchContinue(){
+        document.body.style.cursor = "wait";
+        findInSelected(lastSearchOn);
+        document.body.style.cursor = '';
+}
+
+</script>
+
+        <% 
+                String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
+            String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
+        %>
+<TABLE cellpadding="1" cellspacing="1" border="1">
+<tr><td>
+<b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
+<input type="button" value="Find" onClick="javascript:search()"/>
+<input type="button" id="findNext" value="Find Next" onClick="javascript:searchContinue()" disabled=true />
+Search only selected:<input type="checkbox" id="inSelected" onChange="javascript:textChange()"/>
+</td></tr>
+</table>
+<br/>
+
+
+<div dojoType="TreeBasicControllerV3" widgetId="controller"></div>      
+<div dojoType="TreeSelectorV3" widgetId="selector"></div>       
+<div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
+<div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
+

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java Tue Jan 23 22:03:04 2007
@@ -1,60 +1,70 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.kernel.util;
-
-import java.util.List;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-
-
-public class ClassLoaderRegistry {
-    private static List<WeakReference> list = new ArrayList<WeakReference>();
-    public static List getList(){
-        List<ClassLoader> ret = new ArrayList<ClassLoader>();
-        for(int i=0;i<list.size();i++)
-            if(list.get(i) != null)ret.add((ClassLoader)list.get(i).get());
-            else
-                list.remove(i);
-        return ret;
-    }
-    public static boolean add(ClassLoader cloader){
-        if(contains(cloader))
-            return false;
-        return list.add(new WeakReference<ClassLoader>(cloader));
-    } 
-    public static boolean contains(ClassLoader cloader){
-        for(int i=0;i<list.size();i++){
-            WeakReference wk = list.get(i);
-            if(wk.get() == null)list.remove(i);
-            else if(wk.get().equals(cloader))
-                return true;            
-        }
-        return false;
-    }
-    public static boolean remove(ClassLoader cloader){
-        boolean result = false;
-        for(int i=0;i<list.size();i++){
-            WeakReference wk = list.get(i);
-            if(wk.get() == null)list.remove(i);
-            else if(wk.get().equals(cloader)){
-                list.remove(i);
-                result = true;
-            }
-        }
-        return result;
-    } 
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.kernel.util;
+
+import java.util.List;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+
+
+public class ClassLoaderRegistry {
+    private final static List<WeakReference> list = new ArrayList<WeakReference>();
+
+    public synchronized static List getList(){
+        List<ClassLoader> ret = new ArrayList<ClassLoader>();
+        for(int i=0;i<list.size();i++)
+            if(list.get(i) != null) {
+                ret.add((ClassLoader)list.get(i).get());
+            }
+            else {
+                list.remove(i);
+            }
+        return ret;
+    }
+    
+    public synchronized static boolean add(ClassLoader cloader){
+        if(contains(cloader)) {
+            return false;
+        }
+        return list.add(new WeakReference<ClassLoader>(cloader));
+    } 
+    
+    public synchronized static boolean contains(ClassLoader cloader){
+        for(int i=0;i<list.size();i++) {
+            WeakReference wk = list.get(i);
+            if(wk.get() == null) {
+                list.remove(i);
+            }
+            else if(wk.get().equals(cloader))
+                return true;            
+        }
+        return false;
+    }
+    
+    public synchronized static boolean remove(ClassLoader cloader){
+        boolean result = false;
+        for(int i=0;i<list.size();i++){
+            WeakReference wk = list.get(i);
+            if(wk.get() == null)list.remove(i);
+            else if(wk.get().equals(cloader)){
+                list.remove(i);
+                result = true;
+            }
+        }
+        return result;
+    } 
+}

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message