jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edgarp...@apache.org
Subject svn commit: r477145 [2/2] - in /jackrabbit/trunk/contrib/jcr-browser: ./ src/main/java/org/apache/jackrabbit/browser/ src/main/java/org/apache/jackrabbit/browser/command/ src/main/java/org/apache/jackrabbit/browser/iframeio/ src/main/resources/org/apac...
Date Mon, 20 Nov 2006 11:15:30 GMT
Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/property/setvalue.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/property/setvalue.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/property/setvalue.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/property/setvalue.jsp Mon Nov 20 03:15:24 2006
@@ -3,15 +3,14 @@
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <% 
 pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
 %>
-<jcr:session>
 <jcr:set var="item" item="${path}"/>
-
-
 <div class="dialog">
 <h3>Property - Set value</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="response.txt" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 
 <c:if test="${item.node}">
@@ -37,6 +36,3 @@
 </table>
 </form>
 </div>
-
-
-</jcr:session>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/repository/descriptors.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/repository/descriptors.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/repository/descriptors.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/repository/descriptors.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,9 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
-<jcr:session>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
 <h3>Repository descriptors</h3>
 <hr height="1"/>
@@ -14,4 +16,3 @@
 </table>
 <input type="button" value="Close" onClick="hideDialog();"/>
 </div>
-</jcr:session>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/attributes.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/attributes.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/attributes.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/attributes.jsp Mon Nov 20 03:15:24 2006
@@ -2,7 +2,9 @@
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <%@page import="javax.jcr.Session"%>
-<jcr:session>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
 <h3>Session - Attributes</h3>
 <hr height="1"/>
@@ -17,4 +19,3 @@
 <hr height="1"/>
 <input type="button" value="Close" onClick="hideDialog();"/>
 </div>
-</jcr:session>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportdocumentview.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportdocumentview.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportdocumentview.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportdocumentview.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,8 @@
 <div class="dialog">
 <h3>Session - Export document view</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="response.txt" id="dialogForm"
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">Skip binary</th>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportsystemview.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportsystemview.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportsystemview.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/exportsystemview.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,8 @@
 <div class="dialog">
 <h3>Session - Export system view</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="response.txt" id="dialogForm"
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">Skip binary</th>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/importxml.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/importxml.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/importxml.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/importxml.jsp Mon Nov 20 03:15:24 2006
@@ -1,12 +1,21 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <div class="dialog">
 <h3>Session - Import xml</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/importxml.iframe?flavor=text/html" />" 
+	id="dialogForm"
+	method="POST" 
+	enctype="multipart/form-data" 
+	onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">UUID Behavior</th>
 	<td>
-		<select name="uuidBehavior">
+		<input type="hidden" name="persistent" value="false"/>
+		<input type="hidden" name="destJcrPath" value="<%= request.getParameter("path")%>"/>
+		<select name="uuidBehaviour">
 		<option value="0">Create new</option>
 		<option value="1">Remove existing</option>
 		<option value="2">Replace existing</option>
@@ -23,10 +32,19 @@
 <tr>
 	<td colspan="2" align="center">
 		<hr height="1"/>	
-		<input type="button" value="Submit" onClick="submitDialog();"/>
+		<input type="button" value="Submit" onClick="internalSubmitDialog();"/>
 		<input type="button" value="Cancel" onClick="hideDialog();"/>
 	</td>
 </tr>
 </table>
 </form>
 </div>
+<script language="JavaScript" type="text/javascript">
+
+function internalSubmitDialog() {
+    var node = dojo.widget.manager.getWidgetById(currentItem);
+    var nodes = new Array(node);
+	submitDialog(nodes); 
+}
+
+</script>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/addtoken.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/addtoken.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/addtoken.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/addtoken.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,11 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <div class="dialog">
 <h3>Session - Add Lock Token</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/locking/addtoken" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">Token</th>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/removetoken.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/removetoken.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/removetoken.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/removetoken.jsp Mon Nov 20 03:15:24 2006
@@ -1,11 +1,14 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
-<jcr:session>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
 <h3>Session - Remove Lock Token</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/locking/removetoken" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">Token</th>
@@ -13,7 +16,7 @@
 	<c:if test="${not empty jcrsession.lockTokens}">
 	<select type="select" name="token">
 		<c:forEach var="token" items="${jcrsession.lockTokens}">
-			<option><c:out value="${token}"/>${token}</option>
+			<option><c:out value="${token}"/></option>
 		</c:forEach>	
 	</select>
 	</c:if>
@@ -29,4 +32,3 @@
 </table>
 </form>
 </div>
-</jcr:session>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/showtokens.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/showtokens.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/showtokens.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/locking/showtokens.jsp Mon Nov 20 03:15:24 2006
@@ -1,11 +1,14 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
-<jcr:session>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
 <h3>Session - Show tokens</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="response.txt" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <c:forEach var="token" items="${jcrsession.lockTokens}">
 <tr>
@@ -21,4 +24,3 @@
 </table>
 </form>
 </div>
-</jcr:session>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/moveitem.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/moveitem.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/moveitem.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/moveitem.jsp Mon Nov 20 03:15:24 2006
@@ -1,15 +1,19 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Session - Move node</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/move" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">From</th>
 	<td>
+	<input type="hidden" name="persistent" value="false">
 	<input type="hidden" name="srcAbsPath" value="<%= request.getParameter("path")%>">
 	<%= request.getParameter("path")%>
 	</td>
@@ -32,20 +36,32 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>
 
 <script language="JavaScript" type="text/javascript">
 var targetController = dojo.widget.createWidget("TreeLoadingControllerV3");
 var targetSelector = dojo.widget.createWidget("TreeSelectorV3",{widgetId: "targetSelector"});
 var treeEmphaseOnSelect = dojo.widget.createWidget("TreeEmphaseOnSelect",{selector:targetSelector.widgetId});
-targetController.RpcUrl="tree.jsp";
-var treeNodes = [{title: "Root", objectId: "/", isFolder: true}] ;
+targetController.RpcUrl="tree.jsp?prefix=target";
+var treeNodes = [{title: "Root", widgetId: "target/", isFolder: true}] ;
 var targetTree = dojo.widget.createWidget("TreeV3", {listeners: [targetSelector.widgetId, targetController.widgetId]},dojo.byId("targetTreeDiv"));
 targetTree.setChildren(treeNodes);
 
 function internalSubmitDialog() {
-	document.getElementById('destAbsPath').value = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId;	
-	submitDialog();
+
+	var targetPath = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId ;
+
+	// nodes to refresh 
+	var parentFrom = dojo.widget.manager.getWidgetById(currentItem).parent ;
+	var parentTo =  dojo.widget.manager.getWidgetById(targetPath) ;
+	var nodes = new Array(parentFrom, parentTo);
+
+	if (targetPath.charAt(targetPath.length-1) != '/') {
+		targetPath = targetPath + '/' ;
+	} 
+	document.getElementById('destAbsPath').value = targetPath;	
+
+	submitDialog(nodes);
 }
+
 </script>

Added: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/namespaces.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/namespaces.jsp?view=auto&rev=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/namespaces.jsp (added)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/namespaces.jsp Mon Nov 20 03:15:24 2006
@@ -0,0 +1,29 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
+<%@page import="javax.jcr.Session"%>
+<div class="dialog">
+<h3>Registered namespaces</h3>
+<hr height="1"/>	
+<table class="dialog">
+<tr>
+	<th>prefix</th>
+	<th>uri</th>
+</tr>
+<c:forEach var="prefix" items="${jcrsession.namespacePrefixes}">
+<tr>
+	<td><c:out value="${prefix}"/></td>
+	<td><%= ((Session) pageContext.getAttribute("jcrsession")).getNamespaceURI(pageContext.getAttribute("prefix").toString()) %></td>
+</tr>
+</c:forEach>
+<tr>
+	<td colspan="2" align="center">
+		<hr height="1"/>	
+		<input type="button" value="Close" onClick="hideDialog();"/>
+	</td>
+</tr>
+</table>
+</div>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/refresh.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/refresh.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/refresh.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/refresh.jsp Mon Nov 20 03:15:24 2006
@@ -1,19 +1,32 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <div class="dialog">
 <h3>Session - Refresh</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/refresh"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">Keep changes</th>
-	<td><input type="checkbox" name="keepChanges"/></td>
+	<td><input type="checkbox" name="keepChanges" value="true"/></td>
 </tr>
 <tr>
 	<td colspan="2" align="center">
 		<hr height="1"/>	
-		<input type="button" value="Submit" onClick="submitDialog();"/>
+		<input type="button" value="Submit" onClick="internalSubmitDialog();"/>
 		<input type="button" value="Cancel" onClick="hideDialog();"/>
 	</td>
 </tr>
 </table>
 </form>
 </div>
+
+<script language="JavaScript" type="text/javascript">
+function internalSubmitDialog() {
+	// nodes to refresh 
+	var root = dojo.widget.manager.getWidgetById('/');
+	var nodes = new Array(root);
+	submitDialog(nodes);
+}
+</script>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/renameitem.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/renameitem.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/renameitem.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/renameitem.jsp Mon Nov 20 03:15:24 2006
@@ -1,36 +1,46 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
-<%@page import="javax.jcr.NamespaceRegistry"%>
 <% 
 pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
 %>
 <div class="dialog">
-<jcr:session>
 <jcr:set var="node" item="${path}"/>
+<c:if test="${!node.node}">
+	<jcr:set var="node" item="${node.parent}"/>
+</c:if>
 <h3>Session - Rename</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/rename"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">From</th>
 	<td>
-	<input type="hidden" name="srcAbsPath" value="<%= request.getParameter("path")%>">
+	<input type="hidden" name="persistent" value="false">
+	<input type="hidden" name="srcPath" value="<c:out value="${node.path}"/>">
 	<c:out value="${node.name}"/>
 	</td>
 </tr>
 <tr>
 	<th>To</th>
-	<td><input type="text" name="newName" value=""/></td>
+	<td><input type="text" name="destPath" value="<c:out value="${node.name}"/>"/></td>
 </tr>
 <tr>
 	<td colspan="2" align="center">
 		<hr height="1"/>	
-		<input type="button" value="Submit" onClick="submitDialog();"/>
+		<input type="button" value="Submit" onClick="internalSubmitDialog();"/>
 		<input type="button" value="Close" onClick="hideDialog();"/>
 	</td>
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>
+<script language="JavaScript" type="text/javascript">
+function internalSubmitDialog() {
+    var node = dojo.widget.manager.getWidgetById(currentItem);
+    var nodes = new Array(node.parent);
+	submitDialog(nodes); 
+}
+</script>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/save.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/save.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/save.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/save.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,9 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <div class="dialog">
 <h3>Session - Save</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/save"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<td colspan="2" align="center">

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/setnamespaceprefix.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/setnamespaceprefix.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/setnamespaceprefix.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/session/setnamespaceprefix.jsp Mon Nov 20 03:15:24 2006
@@ -2,11 +2,14 @@
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <%@page import="javax.jcr.NamespaceRegistry"%>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Session - Set Namespace prefix</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/session/setnamespaceprefix" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th>Prefix: Uri</th>
@@ -36,5 +39,4 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/accessibleworkspaces.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/accessibleworkspaces.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/accessibleworkspaces.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/accessibleworkspaces.jsp Mon Nov 20 03:15:24 2006
@@ -1,7 +1,9 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
-<jcr:session>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
 <h3>Workspace - Accessible workspaces</h3>
 <hr height="1"/>
@@ -13,4 +15,3 @@
 <hr height="1"/>
 <input type="button" value="Close" onClick="hideDialog();"/>
 </div>
-</jcr:session>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/copyitem.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/copyitem.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/copyitem.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/copyitem.jsp Mon Nov 20 03:15:24 2006
@@ -1,21 +1,25 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Workspace - Copy Node</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/copy" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">From</th>
 	<td>
+	<input type="hidden" name="srcWorkspace" value="<c:out value="${jcrsession.workspace.name}"/>">
 	<input type="hidden" name="srcAbsPath" value="<%= request.getParameter("path")%>">
 	<%= request.getParameter("path")%>
 	</td>
 </tr>
 <tr>
-	<th>To</th>
+	<th>Target parent</th>
 	<td height="300">
 		<input type="hidden" name="destAbsPath" id="destAbsPath" value="">
 		<div class="targetTreeContainer">
@@ -32,20 +36,32 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>
 
 <script language="JavaScript" type="text/javascript">
 var targetController = dojo.widget.createWidget("TreeLoadingControllerV3");
 var targetSelector = dojo.widget.createWidget("TreeSelectorV3",{widgetId: "targetSelector"});
 var treeEmphaseOnSelect = dojo.widget.createWidget("TreeEmphaseOnSelect",{selector:targetSelector.widgetId});
-targetController.RpcUrl="tree.jsp";
-var treeNodes = [{title: "Root", objectId: "/", isFolder: true}] ;
+targetController.RpcUrl="tree.jsp?prefix=target";
+var treeNodes = [{title: "Root", widgetId: "target/", isFolder: true}] ;
 var targetTree = dojo.widget.createWidget("TreeV3", {listeners: [targetSelector.widgetId, targetController.widgetId]},dojo.byId("targetTreeDiv"));
 targetTree.setChildren(treeNodes);
 
 function internalSubmitDialog() {
-	document.getElementById('destAbsPath').value = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId;	
-	submitDialog();
+
+	var targetPath = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId ;
+
+	// nodes to refresh 
+	var parentFrom = dojo.widget.manager.getWidgetById(currentItem).parent ;
+	var parentTo =  dojo.widget.manager.getWidgetById(targetPath) ;
+	var nodes = new Array(parentFrom, parentTo);
+
+	// Add '/' at the end if needed
+	if (targetPath.charAt(targetPath.length-1) != '/') {
+		targetPath = targetPath + '/' ;
+	} 
+	document.getElementById('destAbsPath').value =  targetPath;		
+	
+	submitDialog(nodes);
 }
 </script>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/importxml.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/importxml.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/importxml.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/importxml.jsp Mon Nov 20 03:15:24 2006
@@ -1,12 +1,21 @@
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <div class="dialog">
 <h3>Workspace - Import xml</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/importxml.iframe?flavor=text/html" />" 
+	id="dialogForm"
+	method="POST" 
+	enctype="multipart/form-data" 
+	onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="100">UUID Behavior</th>
 	<td>
-		<select name="uuidBehavior">
+		<input type="hidden" name="persistent" value="true"/>
+		<input type="hidden" name="destJcrPath" value="<%= request.getParameter("path")%>"/>	
+		<select name="uuidBehaviour">
 		<option value="0">Create new</option>
 		<option value="1">Remove existing</option>
 		<option value="2">Replace existing</option>
@@ -23,10 +32,19 @@
 <tr>
 	<td colspan="2" align="center">
 		<hr height="1"/>	
-		<input type="button" value="Submit" onClick="submitDialog();"/>
+		<input type="button" value="Submit" onClick="internalSubmitDialog();"/>
 		<input type="button" value="Cancel" onClick="hideDialog();"/>
 	</td>
 </tr>
 </table>
 </form>
 </div>
+<script language="JavaScript" type="text/javascript">
+
+function internalSubmitDialog() {
+    var node = dojo.widget.manager.getWidgetById(currentItem);
+    var nodes = new Array(node);
+	submitDialog(nodes); 
+}
+
+</script>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/moveitem.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/moveitem.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/moveitem.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/moveitem.jsp Mon Nov 20 03:15:24 2006
@@ -1,15 +1,19 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Workspace - Move Node</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/move" />" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">From</th>
 	<td>
+	<input type="hidden" name="persistent" value="true">
 	<input type="hidden" name="srcAbsPath" value="<%= request.getParameter("path")%>">
 	<%= request.getParameter("path")%>
 	</td>
@@ -32,20 +36,31 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>
 
 <script language="JavaScript" type="text/javascript">
 var targetController = dojo.widget.createWidget("TreeLoadingControllerV3");
 var targetSelector = dojo.widget.createWidget("TreeSelectorV3",{widgetId: "targetSelector"});
 var treeEmphaseOnSelect = dojo.widget.createWidget("TreeEmphaseOnSelect",{selector:targetSelector.widgetId});
-targetController.RpcUrl="tree.jsp";
-var treeNodes = [{title: "Root", objectId: "/", isFolder: true}] ;
+targetController.RpcUrl="tree.jsp?prefix=target";
+var treeNodes = [{title: "Root", widgetId: "target/", isFolder: true}] ;
 var targetTree = dojo.widget.createWidget("TreeV3", {listeners: [targetSelector.widgetId, targetController.widgetId]},dojo.byId("targetTreeDiv"));
 targetTree.setChildren(treeNodes);
 
 function internalSubmitDialog() {
-	document.getElementById('destAbsPath').value = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId;	
-	submitDialog();
+
+	var targetPath = dojo.widget.manager.getWidgetById('targetSelector').selectedNodes[0].objectId ;
+
+	// nodes to refresh 
+	var parentFrom = dojo.widget.manager.getWidgetById(currentItem).parent ;
+	var parentTo =  dojo.widget.manager.getWidgetById(targetPath) ;
+	var nodes = new Array(parentFrom, parentTo);
+
+	if (targetPath.charAt(targetPath.length-1) != '/') {
+		targetPath = targetPath + '/' ;
+	} 
+	document.getElementById('destAbsPath').value = targetPath;	
+
+	submitDialog(nodes);
 }
 </script>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/namespaces.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/namespaces.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/namespaces.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/namespaces.jsp Mon Nov 20 03:15:24 2006
@@ -2,8 +2,10 @@
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <%@page import="javax.jcr.NamespaceRegistry"%>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Registered namespaces</h3>
 <hr height="1"/>	
 <table class="dialog">
@@ -26,6 +28,4 @@
 	</td>
 </tr>
 </table>
-
-</jcr:session>
 </div>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/registernamespace.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/registernamespace.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/registernamespace.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/registernamespace.jsp Mon Nov 20 03:15:24 2006
@@ -1,11 +1,14 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Register namespace</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/registernamespace"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">prefix</th>
@@ -24,5 +27,4 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/renameitem.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/renameitem.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/renameitem.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/renameitem.jsp Mon Nov 20 03:15:24 2006
@@ -3,33 +3,44 @@
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <% 
 pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
 %>
 <div class="dialog">
-<jcr:session>
 <jcr:set var="node" item="${path}"/>
 <h3>Workspace - Rename node</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/rename"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th height="25" width="50">From</th>
 	<td>
-	<input type="hidden" name="srcAbsPath" value="<%= request.getParameter("path")%>">
+	<input type="hidden" name="persistent" value="true">	
+	<input type="hidden" name="srcPath" value="<%= request.getParameter("path")%>">
 	<c:out value="${node.name}"/>
 	</td>
 </tr>
 <tr>
 	<th>To</th>
-	<td><input type="text" name="newName" value=""/></td>
+	<td><input type="text" name="destPath" value="<c:out value="${node.name}"/>"/></td>
 </tr>
 <tr>
 	<td colspan="2" align="center">
 		<hr height="1"/>	
-		<input type="button" value="Submit" onClick="submitDialog();"/>
+		<input type="button" value="Submit" onClick="internalSubmitDialog();"/>
 		<input type="button" value="Close" onClick="hideDialog();"/>
 	</td>
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>
+
+<script language="JavaScript" type="text/javascript">
+
+function internalSubmitDialog() {
+    var node = dojo.widget.manager.getWidgetById(currentItem);
+    var nodes = new Array(node.parent);
+	submitDialog(nodes); 
+}
+
+</script>
\ No newline at end of file

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/unregisternamespace.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/unregisternamespace.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/unregisternamespace.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/dialog/workspace/unregisternamespace.jsp Mon Nov 20 03:15:24 2006
@@ -2,22 +2,25 @@
 <%@taglib uri="http://jakarta.apache.org/taglib/string" prefix="str" %>
 <%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
 <%@page import="javax.jcr.NamespaceRegistry"%>
+<%
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
 <div class="dialog">
-<jcr:session>
 <h3>Unregister namespace</h3>
 <hr height="1"/>	
-<form action="response.txt" id="dialogForm">
+<form action="<c:url value="/command/workspace/unregisternamespace"/>" id="dialogForm" 
+method="POST" onsubmit="return false;">
 <table class="dialog">
 <tr>
 	<th>Prefix: Uri</th>
 </tr>
 <tr>
 	<td>
-		<select name="uri">
+		<select name="prefix">
 			<c:set value="${jcrsession.workspace.namespaceRegistry}" var="namespaceRegistry"/>
 			<c:forEach var="prefix" items="${namespaceRegistry.prefixes}">
 <%String uri = ((NamespaceRegistry) pageContext.getAttribute("namespaceRegistry")).getURI(pageContext.getAttribute("prefix").toString()) ;%>			
-				<option value="<%= uri %>"><c:out value="${prefix}"/>: <%= uri %></option>
+				<option value="<c:out value="${prefix}"/>"><c:out value="${prefix}"/>: <%= uri %></option>
 			</c:forEach>			
 		</select>
 	</td>
@@ -32,5 +35,4 @@
 </tr>
 </table>
 </form>
-</jcr:session>
 </div>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/index.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/index.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/index.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/index.jsp Mon Nov 20 03:15:24 2006
@@ -14,9 +14,12 @@
 
 <script language="JavaScript" type="text/javascript">
 	dojo.require("dojo.io.*");
-	dojo.require("dojo.io.ScriptSrcIO");
 	dojo.require("dojo.event.*");
-	
+	dojo.require("dojo.io.ScriptSrcIO");
+	dojo.require("dojo.io.IframeIO");	
+
+	dojo.require("dojo.lfx.rounded");
+
 	dojo.require("dojo.widget.TreeV3");
 	dojo.require("dojo.widget.TreeNodeV3");
 	dojo.require("dojo.widget.TreeBasicControllerV3");
@@ -26,7 +29,7 @@
 	dojo.require("dojo.widget.TreeDeselectOnDblselect");	
 	dojo.require("dojo.widget.TreeContextMenuV3");
 	
-	dojo.require("dojo.widget.DatePicker");
+	dojo.require("dojo.widget.DropdownDatePicker");	
 	dojo.require("dojo.widget.Dialog");
 	dojo.require("dojo.widget.FilteringTable");
 	dojo.require("dojo.widget.Menu2");
@@ -36,19 +39,20 @@
 	dojo.require("dojo.widget.SplitContainer");
 	dojo.require("dojo.widget.ColorPalette");
 	dojo.require("dojo.widget.TabContainer");
+	dojo.require("dojo.widget.Toaster");	
+
 	dojo.hostenv.writeIncludes();
-	
+
     var reporter = function(reporter) {
             this.go = function(message) {
 			var node = message.node ;
-            		onTreeNodeSelected(node.objectId);
+            		onTreeNodeSelected(node.widgetId);
             }
     }
 
 	var myDojoTreeListener = {
 	    nodeCollapsed: function(message){
 		var node = message.source ;
-		var treeController = dojo.widget.manager.getWidgetById('treeController');
 		node.destroyChildren();
 		node.state = node.loadStates.UNCHECKED;
 		node.setFolder();
@@ -63,15 +67,15 @@
         	selector.eventNames['select'],new reporter('selector'),'go');
 
 
-	var firstTree = dojo.widget.manager.getWidgetById('firstTree');
-	dojo.event.topic.subscribe(
-		firstTree.eventNames['afterCollapse'],myDojoTreeListener,"nodeCollapsed");
-
-	// Load item list
-	refreshList("/");
-	populateDescription();
-        
-	});	
+		var firstTree = dojo.widget.manager.getWidgetById('firstTree');
+		dojo.event.topic.subscribe(
+			firstTree.eventNames['afterCollapse'],myDojoTreeListener,"nodeCollapsed");
+	
+		// Load item list
+		refreshDescription('/');
+		refreshList('/');
+		
+    });	
 	
 </script>
 
@@ -86,13 +90,19 @@
 		font: 12px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
     }
 
+    #roundMePreview{
+		margin:20px;
+		padding:10px;
+		border:2px solid green;
+		width:90%;
+		background-color:#fff;
+	}
+
    </style>
 </head>
 <body>
 
-<!-- D I A L O G S -->
-<a dojoType="dialog" id="dialog" toggle="wipe" toggleDuration="250" executeScripts="true" scriptSeparation="false"><div id="dialogContent"></div></a>
-<!-- E N D    D I A L O G S -->
+<a dojoType="dialog" id="dialog" toggle="wipe" toggleDuration="250" executeScripts="true" scriptSeparation="false"></a>
 
 <!-- T R E E    C O N T R O L L ER -->
 <div dojoType="TreeLoadingControllerV3" widgetId="treeController" RpcUrl="tree.jsp"></div>
@@ -101,9 +111,8 @@
 <div dojoType="TreeEmphaseOnSelect" selector="selector"></div>
 <div dojoType="TreeContextMenuV3" toggle="explode" contextMenuForWindow="false" widgetId="treeContextMenu">
 	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuAddNode" caption="Add node" onClick="showDialog('node/addnode');"></div>
-	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuCopy" caption="Copy" onClick="showDialog('workspace/copyitem');"></div>
 	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuRemove" caption="Remove" onClick="showDialog('node/remove');" iconSrc="<c:url value="/images/x.gif"/>"></div>
-	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuRename" caption="Rename" onClick="showDialog('node/rename');"></div>
+	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuRename" caption="Rename" onClick="showDialog('session/renameitem');"></div>
 	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuSave" caption="Save" onClick="showDialog('node/save');"></div>
 	<div dojoType="TreeMenuItemV3" widgetId="treeContextMenuSetProperty" caption="Set property" submenuId="setPropertyMenu"></div>
 </div>
@@ -136,6 +145,9 @@
 			<div dojoType="MenuItem2" caption="Done Merge" onClick="showDialog('node/versioning/donemerge');"></div>
 			<div dojoType="MenuItem2" caption="Cancel Merge" onClick="showDialog('node/versioning/cancelmerge');"></div>
 			<div dojoType="MenuSeparator2"></div>
+			<div dojoType="MenuItem2" caption="Add version label" onClick="showDialog('node/versioning/addversionlabel');"></div>
+			<div dojoType="MenuItem2" caption="Remove version label" onClick="showDialog('node/versioning/removeversionlabel');"></div>
+			<div dojoType="MenuSeparator2"></div>
 			<div dojoType="MenuItem2" caption="Version history" onClick="showDialog('node/versioning/versionhistory');"></div>
 		</div>
 
@@ -181,6 +193,7 @@
 			<div dojoType="MenuSeparator2"></div>
 			<div dojoType="MenuItem2" caption="Locking" submenuId="sessionLockingMenu"></div>
 			<div dojoType="MenuSeparator2"></div>
+			<div dojoType="MenuItem2" caption="Namespaces" onClick="showDialog('session/namespaces');"></div>
 			<div dojoType="MenuItem2" caption="Set namespace prefix" onClick="showDialog('session/setnamespaceprefix');"></div>
 			<div dojoType="MenuSeparator2"></div>
 			<div dojoType="MenuItem2" caption="Attributes" onClick="showDialog('session/attributes');"></div>
@@ -191,7 +204,7 @@
 			<div dojoType="MenuItem2" caption="Add node" onClick="showDialog('node/addnode');"></div>
 			<div dojoType="MenuItem2" caption="Refresh" onClick="showDialog('node/refresh');"></div>
 			<div dojoType="MenuItem2" caption="Remove" onClick="showDialog('node/remove');" iconSrc="<c:url value="/images/x.gif"/>"></div>
-			<div dojoType="MenuItem2" caption="Rename" onClick="showDialog('node/rename');"></div>
+			<div dojoType="MenuItem2" caption="Rename" onClick="showDialog('session/renameitem');"></div>
 			<div dojoType="MenuItem2" caption="Save" onClick="showDialog('node/save');"></div>
 			<div dojoType="MenuItem2" caption="Set property" submenuId="setPropertyMenu"></div>
 			<div dojoType="MenuItem2" caption="Set mandatory properties" onClick="showDialog('node/setmandatoryproperties');"></div>
@@ -231,36 +244,21 @@
 		
 	</div>
 	
-	<div dojoType="LayoutContainer" layoutAlign="bottom" class="statusBar" style="height: 28px" widgetId="statusBar">
-
-		<div dojoType="ContentPane" layoutAlign="left" class="logoPanel">
-			<img src="<c:url value="/images/jackrabbit-small.gif"/>" width="35" height="27" border="0"/>
-		</div>
-		<div dojoType="ContentPane" layoutAlign="left" class="statusPanel">
-			<%= request.getRemoteUser() %>@default
-		</div>
-		<div dojoType="ContentPane" layoutAlign="client" class="statusPanel" style="padding-right: 0px; z-index: 1;">
-			<div id="path">/</div> 
-		</div>
-	</div>
-
 	<div dojoType="SplitContainer"
 		orientation="horizontal"
 		sizerWidth="5"
 		activeSizing="0"
 		layoutAlign="client">
 	
-		
 		<div dojoType="ContentPane" class="treeDiv" style="padding-right: 0px; z-index: 1;">
 
 			<div dojoType="TreeV3" widgetId="firstTree" listeners="treeController;selector;treeContextMenu">
-			    <div dojoType="TreeNodeV3" title="Root" isFolder="true" objectId="/">
+			    <div dojoType="TreeNodeV3" title="Root" isFolder="true" widgetId="/">
 			    </div>
 			</div>	
 			
 		</div>		
 
-
 		<div dojoType="SplitContainer"
 			id="rightPane"
 			orientation="vertical"
@@ -270,7 +268,6 @@
 			sizeShare="80">
 			
 			<div dojoType="ContentPane" sizeMin="20" sizeShare="30" class="itemList">
-			
 				<table 
 					class="itemList" 
 					dojoType="filteringTable"
@@ -294,23 +291,39 @@
 					</tr>
 				</thead>
 				<tbody>
-
 				</tbody>
 				</table>
-
 			</div>
-
 			
 			<div dojoType="ContentPane" sizeMin="20" sizeShare="30" class="infoPane">
-				<div id="mainTabContainer" dojoType="TabContainer" style="width: 100%; height: 100%;" class="infoPane">
-					<div id="itemTab" dojoType="ContentPane" label="Item" class="infoPane"><div id="itemInfo"></div></div>
-					<div id="typeTab" dojoType="ContentPane" label="Type" class="typePane"><div id="typeInfo">type info</div></div>
-					<div id="definitionTab" dojoType="ContentPane" label="Definition" class="infoPane"><div id="definitionInfo"></div></div>
+				<div id="mainTabContainer" dojoType="TabContainer" style="overflow: none; width: 100%; height: 100%;" class="infoPane">
+					<div id="itemTab" dojoType="ContentPane" label="Item" class="infoPane" cacheContent="false" preload="false"></div>
+					<div id="typeTab" dojoType="ContentPane" label="Type" class="typePane" cacheContent="false" preload="false"></div>
+					<div id="definitionTab" dojoType="ContentPane" label="Definition" class="infoPane" cacheContent="false" preload="false"></div>
 				</div>
 			</div>
 		</div>
 		
 	</div>
+	
+	<div dojoType="LayoutContainer" layoutAlign="bottom" class="statusBar" style="height: 28px" widgetId="statusBar">
+
+		<div dojoType="ContentPane" layoutAlign="left" class="logoPanel">
+			<img src="<c:url value="/images/jackrabbit-small.gif"/>" width="35" height="27" border="0"/>
+		</div>
+		
+		<div dojoType="ContentPane" layoutAlign="left" class="statusPanel">
+			<%= request.getRemoteUser() %>@default
+		</div>
+		
+		<div dojoType="ContentPane" layoutAlign="client" class="statusPanel" style="padding-right: 0px; z-index: 1;">
+			<div id="path">/</div> 
+		</div>
+		
+	</div>
+	
 </div>
+<div dojoType="toaster" id="successToast" positionDirection="bl-up" showDelay="4000" messageTopic="successMessageTopic"></div>
+<div dojoType="toaster" id="errorToast" positionDirection="bl-up" showDelay="4000" messageTopic="errorMessageTopic" width="250"></div>
 </body>
 </html>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/definition.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/definition.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/definition.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/definition.jsp Mon Nov 20 03:15:24 2006
@@ -1 +1,58 @@
-definition
\ No newline at end of file
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<% 
+pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
+<%@page import="javax.jcr.version.OnParentVersionAction"%>
+<%@page import="javax.jcr.Node"%>
+<%@page import="javax.jcr.PropertyType"%>
+<jcr:set var="item" item="${path}"/>
+<!-- Item definition -->
+<table  width="100%" class="itemInfo" style="valign: top;">
+  <tr>
+    <td>Node type: <c:out value="${item.definition.name}"/></td>
+    <td>Declaring node type: <c:out value="${item.definition.declaringNodeType.name}"/></td>
+    <td>Autocreated: <c:out value="${item.definition.autoCreated}"/></td>
+    <td>Mandatory: <c:out value="${item.definition.mandatory}"/></td>
+  </tr>
+  <tr>
+    <td>OPV:
+<c:set var="opv"><c:out value="${item.definition.onParentVersion}"/></c:set>
+<%= OnParentVersionAction.nameFromValue(Integer.valueOf(pageContext.getAttribute("opv").toString()))%>
+</td>
+    <td>Protected: <c:out value="${item.definition.protected}"/></td>
+    <td></td>
+    <td></td>
+  </tr>
+<c:if test="${item.node}">
+<% Node node = (Node) pageContext.getAttribute("item"); %>
+  <tr>
+    <td>Required primary types: <br/>
+<c:forEach items="${item.definition.requiredPrimaryTypes}" var="type">
+<c:out value="${type.name}"/><br/>
+</c:forEach>
+</td>
+    <td>Default Primary type: <c:out value="${item.definition.defaultPrimaryType.name}"/></td>
+    <td>Allows same name siblings: <%= node.getDefinition().allowsSameNameSiblings() %></td>
+    <td></td>
+  </tr>
+</c:if>
+<c:if test="${!item.node}">
+  <tr>
+<c:set var="requiredType"><c:out value="${item.definition.requiredType}"/></c:set>
+    <td>Required type: <%= PropertyType.nameFromValue(Integer.valueOf(pageContext.getAttribute("requiredType").toString())) %></td>
+    <td>Value constraints: <br/>
+<c:forEach items="${item.definition.valueConstraints}" var="constraint">
+<c:out value="${constraint}"/><br/>
+</c:forEach>
+	</td>
+    <td>Default values: <br/>
+<c:forEach items="${item.definition.defaultValues}" var="defaultValue">
+<c:out value="${defaultValue}"/><br/>
+</c:forEach>
+	</td>
+    <td>Multiple: <c:out value="${item.definition.multiple}"/></td>
+  </tr>
+</c:if>
+</table>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/item.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/item.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/item.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/item.jsp Mon Nov 20 03:15:24 2006
@@ -2,33 +2,113 @@
 <%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <% 
 pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
 %>
-<jcr:session>
+<%@page import="javax.jcr.Node"%>
 <jcr:set var="node" item="${path}"/>
-<table class="itemInfo">
- <tr><td width="150">path</td><td><c:out value="${node.path}"/></td></tr>
- <tr><td>New</td><td><c:out value="${node.new}"/></td></tr>
- <tr><td>Modified</td><td><c:out value="${node.modified}"/></td></tr>
- <tr><td>depth</td><td><c:out value="${node.depth}"/></td></tr>
+<table width="100%" >
+<tr>
+<td width="50%" valign="top">
+<table width="100%" class="itemInfo">
+<tr>
+	 <td width="33%" >New: <c:out value="${node.new}"/></td>
+	 <td width="33%" >Modified: <c:out value="${node.modified}"/></td>
+	 <td width="33%" >Depth: <c:out value="${node.depth}"/></td>
+</tr>
 <c:if test="${node.node}">
-  <tr><td>corresponding paths</td><td></td></tr>
-  <tr><td>index</td><td><c:out value="${node.index}"/></td></tr>
-  <tr><td>child nodes</td><td><c:out value="${node.nodes.size}"/></td></tr>
-  <tr><td>child properties</td><td><c:out value="${node.properties.size}"/></td></tr>
-  <tr><td>primary item</td><td></td></tr>
-  <tr><td>references</td><td><c:out value="${node.references.size}"/></td></tr>
-  <tr><td>versionable</td><td></td></tr>
-  <tr><td>is checked out</td><td></td></tr>
-  <tr><td>base version</td><td></td></tr>
-  <tr><td>lockable</td><td></td></tr>
-  <tr><td>is locked</td><td></td></tr>
-  <tr><td>holds lock</td><td></td></tr>
-  <tr><td>locked node</td><td></td></tr>
-  <tr><td>lock owner</td><td></td></tr>
-  <tr><td>is deep</td><td></td></tr>
-  <tr><td>token</td><td></td></tr>
-  <tr><td>live</td><td></td></tr>
-  <tr><td>scope</td><td></td></tr>
+<% Node node = (Node) pageContext.getAttribute("node") ; %>
+<tr>
+	 <td width="33%" >Index: <c:out value="${node.index}"/></td>
+	 <td width="33%" >Child nodes: <c:out value="${node.nodes.size}"/></td>
+	 <td width="33%" >Child properties: <c:out value="${node.properties.size}"/></td>
+</tr>
+<% if (node.isNodeType("mix:referenceable")) {%> 
+ <tr>
+	 <td ><b>Referenceable</b>: <img src="<c:url value="/images/ok.gif"/>" height="12" width="12"></td>
+ 	 <td >References: <c:out value="${node.references.size}"/></td>
+ 	 <td ></td>
+ </tr>
+<% } else { %> 
+  <tr>
+	 <td colspan="3"><b>Referenceable</b>: 
+		<img src="<c:url value="/images/x.gif"/>" height="12" width="12"> 
+	 </td>
+ </tr>
+<% } %>
+ <% if (node.isNodeType("mix:versionable")) {%> 
+ <tr>
+	 <td width="33%" ><b>Versionable</b>: <img src="<c:url value="/images/ok.gif"/>" height="12" width="12"></td>
+	 <td width="33%" >Checked out: <c:out value="${node.checkedOut}"/> </td>
+	 <td width="33%" >Base: 
+<jcr:set item="${node.path}" property="jcr:isCheckedOut" var="prop"/>
+<c:if test="${!prop.new}">
+	  <c:out value="${node.baseVersion.name}"/>
+</c:if>	 	  
+	 </td>
+ </tr>
+ <tr>
+	 <td colspan="3" ><b>Version labels</b>:<br/>
+<c:if test="${!prop.new}">	 
+<% pageContext.setAttribute("labels", node.getVersionHistory().getVersionLabels(node.getBaseVersion())) ;%>
+<c:forEach var="label" items="${labels}">
+	<c:out value="${label}"></c:out>
+</c:forEach>
 </c:if>
+	 </td>
+ </tr> 
+<% } else { %> 
+  <tr>
+	 <td colspan="3"><b>Versionable</b>: 
+		<img src="<c:url value="/images/x.gif"/>" height="12" width="12"> 
+	 </td>
+ </tr>
+<% } %>
+<% if (node.isNodeType("mix:lockable")) {%> 
+  <tr>
+	 <td width="33%" ><b>Lockable</b>: <img src="<c:url value="/images/ok.gif"/>" height="12" width="12"> </td>
+	 <td width="33%" >Locked: <c:out value="${node.locked}"/></td>
+	 <td width="33%" >Holds Lock: <%= node.holdsLock() %></td>	 
+ </tr>
+<c:if test="${node.locked}">
+  <tr>
+	 <td colspan="3">Locked Node: <c:out value="${node.lock.node.path}"/></td>
+ </tr>
+  <tr>
+	 <td width="67%" colspan="2">Token: <c:out value="${node.lock.lockToken}"/></td>
+	 <td width="33%" >Is Deep: <c:out value="${node.lock.deep}"/></td>
+ </tr>
+  <tr>
+	 <td width="33%" >Owner: <c:out value="${node.lock.lockOwner}"/></td>
+	 <td width="33%" >Session Scoped: <c:out value="${node.lock.sessionScoped}"/></td>
+	 <td width="33%" >Live: <c:out value="${node.lock.live}"/></td>
+ </tr>
+</c:if> 
+<% } else { %> 
+  <tr>
+	 <td colspan="3"><b>Lockable</b>: 
+		<img src="<c:url value="/images/x.gif"/>" height="12" width="12"> 
+	 </td>
+ </tr>
+<% } %>
+</c:if>
+ </table>
+</td>
+<td width="50%" valign="top">
+	<div id="roundMePreview">
+		TODO: Preview 
+	</div>			
+</td>
+</tr>
 </table>
-</jcr:session>
\ No newline at end of file
+<script language="JavaScript" type="text/javascript">
+    dojo.addOnLoad(function(){
+    
+		dojo.lfx.rounded({
+				tl:{ radius:15 },
+				tr:{ radius:10 },
+				br:{ radius:15 }
+			}, ["roundMePreview"]
+		);	        
+		
+    });	
+</script>
\ No newline at end of file

Added: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/type.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/type.jsp?view=auto&rev=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/type.jsp (added)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/info/type.jsp Mon Nov 20 03:15:24 2006
@@ -0,0 +1,25 @@
+<%@taglib uri="http://jackrabbit.apache.org/jcr-taglib" prefix="jcr" %>
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<% 
+pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
+%>
+<%@page import="javax.jcr.Node"%>
+<jcr:set var="item" item="${path}"/>
+<table  width="100%" class="itemInfo" style="valign: top;">
+<c:if test="${item.node}">
+<% Node node = (Node) pageContext.getAttribute("item"); %>
+  <tr>
+    <td>Primary node type: <c:out value="${item.primaryNodeType.name}"/></td>
+    <td>Has Orderable Child Nodes: <%= node.getPrimaryNodeType().hasOrderableChildNodes() %></td>
+    <td>Row 1: Col 2</td>
+    <td>Row 1: Col 2</td>
+  </tr>
+</c:if>
+<c:if test="${!item.node}">
+  <tr>
+    <td>Row 1: Col 1</td>
+    <td>Row 1: Col 2</td>
+  </tr>
+</c:if>
+</table>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/itemlist.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/itemlist.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/itemlist.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/itemlist.jsp Mon Nov 20 03:15:24 2006
@@ -4,9 +4,10 @@
 <%@page import="javax.jcr.PropertyType"%>
 <% 
 pageContext.setAttribute("path", request.getParameter("path")); 
+pageContext.setAttribute("jcrsession", session.getAttribute("jcr.session"));
 %>
-<jcr:session>
 [<% int index = 0 ;%>
+<%@page import="javax.jcr.Property"%>
 <jcr:set var="parent" item="${path}"/>
 <c:forEach var="node" items="${parent.nodes}">
 {
@@ -14,7 +15,7 @@
 Index:<%= index++ %>,
 Node:'<str:escape><c:out value="${node.node}"/></str:escape>',
 Name:'<a href="<c:url value="/repository/default"/><str:escape><c:out value="${node.path}"/></str:escape>" target="_new"><str:escape><c:out value="${node.name}"/></str:escape></a>',
-Value:'',
+Value:'-',
 Type:'<str:escape><c:out value="${node.primaryNodeType.name}"/></str:escape>',
 New:'<c:out value="${node.new}"/>',
 Modified:'<c:out value="${node.modified}"/>'
@@ -22,7 +23,9 @@
 </c:forEach>
 <% int nodesIndex = index ;%>
 <c:forEach var="prop" items="${parent.properties}">
-<% if (nodesIndex!=index) {%>,<%}%>
+<% 
+Property prop = (Property) pageContext.getAttribute("prop") ;
+if (nodesIndex!=index) {%>,<%}%>
 {
 	Id:'<str:escape><c:out value="${prop.path}"/></str:escape>',
 	Index:<%= index++ %>,
@@ -38,10 +41,9 @@
 	</c:otherwise> 
 </c:choose>
 
-	Type:'<str:escape><%= PropertyType.nameFromValue((int) pageContext.getAttributesScope("prop")) %></str:escape>',
+	Type:'<str:escape><%= PropertyType.nameFromValue(prop.getType()) %></str:escape>',
 	New:'<c:out value="${prop.new}"/>',
 	Modified:'<c:out value="${prop.modified}"/>'
 }
 </c:forEach>
 ]
-</jcr:session>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/tree.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/tree.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/tree.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/browser/tree.jsp Mon Nov 20 03:15:24 2006
@@ -3,15 +3,22 @@
 <% 
   pageContext.setAttribute("action",request.getParameter("action")) ;
   String data = request.getParameter("data").trim() ;
+  // Prefix
+  String prefix = request.getParameter("prefix");
+  if (prefix==null) {
+	  prefix = "";
+  }
+  pageContext.setAttribute("prefix", prefix) ;  
   //{"node":{"widgetId":"tree/","objectId":"","index":0}
+  System.out.println(Calendar.getInstance().getTime() + ". ip = " + request.getRemoteAddr());
   System.out.println(Calendar.getInstance().getTime() + ". data = " + data);
-  int start = data.indexOf("objectId\":\"");
+  int start = data.indexOf("widgetId\":\"");
   String path = data.substring(start+11,data.indexOf("\",",start)) ;
-  pageContext.setAttribute("path", path) ;
+  pageContext.setAttribute("path", path.substring(prefix.length())) ;
+  pageContext.setAttribute("jcrsession",session.getAttribute("jcr.session"));
   int x = 0;
 %>
 <%@page import="java.util.Calendar"%>
-<jcr:session>
 <c:if test="${action eq 'getChildren'}">
 (
 [
@@ -21,10 +28,12 @@
 	{
 	title:"<c:out value="${child.name}"/>",
 	isFolder:true,
+	widgetId:"<c:out value="${prefix}"/><c:out value="${child.path}"/>"
+<% 		if (prefix.length()>0) { %>,
 	objectId:"<c:out value="${child.path}"/>"
+<% 		} %>
 	}
 </c:forEach>
 ]
 )
 </c:if>
-</jcr:session>

Propchange: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/dojo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 20 03:15:24 2006
@@ -0,0 +1,11 @@
+
+src
+__package__.js
+dojo.js
+flash6_gateway.swf
+iframe_history.html
+LICENSE
+README
+storage_dialog.swf
+Storage_version6.swf
+Storage_version8.swf

Added: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/images/ok.gif
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/images/ok.gif?view=auto&rev=477145
==============================================================================
Binary file - no diff available.

Propchange: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/images/ok.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/images/x.gif
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/images/x.gif?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
Binary files - no diff available.

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/login.jsp?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/login.jsp (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/login.jsp Mon Nov 20 03:15:24 2006
@@ -4,26 +4,8 @@
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Welcome to Jackrabbit JCR Browser</title>
+<title>Jackrabbit JCR Web Browser</title>
 <link href="<c:url value="/style.css"/>" type="text/css" rel="stylesheet">
-<script src="<c:url value="/dojo/dojo.js"/>"></script>
-<script>
-			dojo.require("dojo.lfx.rounded");
-			dojo.hostenv.writeIncludes();
-
-			dojo.addOnLoad(function(){
-				dojo.lfx.rounded({
-						tl:{ radius:15 },
-						tr:{ radius:10 },
-						br:{ radius:15 },
-						bl:{ radius:15 }
-					}, 
-					["roundMe"]
-				);
-				//dojo.lfx.rounded({}, ["roundMe3"]);
-			});
-		</script>
-
 </head>
 
 <body bgcolor="#ffffff" link="#0000FF" vlink="0000FF">
@@ -35,7 +17,7 @@
 		<td><img src="<c:url value="/images/jackrabbitlogo.gif"/>" width="320" height="83"
 			border="0" /></td>
 		<td width="100%" align="right" style="padding-left: 20;"><br />
-		<h2>Welcome to JCR Browser</h2>
+		<h2>JCR Web Browser</h2>
 		</td>
 	</tr>
 	<tr>
@@ -44,7 +26,7 @@
 		</td>
 	</tr>	
 	<tr>
-		<td height="450" width="50%">
+		<td height="350" width="50%">
 		<h4>Welcome</h4>
 		<ul>
 			<li>user: jackrabbit</li>

Modified: jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/style.css
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/style.css?view=diff&rev=477145&r1=477144&r2=477145
==============================================================================
--- jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/style.css (original)
+++ jackrabbit/trunk/contrib/jcr-browser/src/main/webapp/style.css Mon Nov 20 03:15:24 2006
@@ -157,15 +157,14 @@
 
 div.dialog {
 	background : #eee;
-	border : 1px solid #999;
+	border : 2px solid #5178a1;
 	-moz-border-radius : 5px;
 	padding : 4px;
+	width: 350px;
 }
 
 table.dialog {
-	padding: 0;
-	margin: 0;
-	width: 400px;
+	width: 100%;
 	align: left;
 }
 
@@ -190,5 +189,11 @@
 	padding: 0px;
 	margin: 0px;	
 }
-	
+
+.dojoToasterContent {
+	overflow: auto;
+	font: 12px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;	
+}
+
 --></style>



Mime
View raw message