[Registry-dev] svn commit r17857 - in
trunk/registry/modules/webapps/src/main:
java/org/wso2/registry/web/actions webapp/admin
webapp/admin/ajax webapp/admin/css webapp/admin/js
chanaka at wso2.com
chanaka at wso2.com
Tue Jun 3 21:44:08 PDT 2008
Author: chanaka
Date: Tue Jun 3 21:44:08 2008
New Revision: 17857
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17857
Log:
patch applied to trunk
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AssociationTreeViewAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AssociationTreeViewAction.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AssociationTreeViewAction.java?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AssociationTreeViewAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AssociationTreeViewAction.java Tue Jun 3 21:44:08 2008
@@ -14,12 +14,14 @@
private String resourcePath;
private String associationTree = "";
private int assoIndex = 0;
+ private String parentPath="";
public void execute(HttpServletRequest request) throws RegistryException {
setRequest(request);
List fatherAsso = provideChildAssociations(resourcePath);
Iterator ifatherAssofaterAsso = fatherAsso.iterator();
+ parentPath = resourcePath;
while (ifatherAssofaterAsso.hasNext()) {
Association asso = (Association) ifatherAssofaterAsso.next();
createAssociationTree(asso.getDestinationPath(), asso.getAssociationType());
@@ -36,7 +38,7 @@
String fatherResourceType = father instanceof Collection ? ResourceData.COLLECTION : ResourceData.RESOURCE;
//infinityLoop.add(new String(path));
//String infinityLoopItem =
- List fatherAsso = provideChildAssociations(path);
+ List fatherAsso = provideChildAssociations(path,parentPath);
associationTree += "<div class=\"father-object\" >";
associationTree += "<ul class=\"tree-row-object\"><li class=\"first\">";
@@ -95,9 +97,27 @@
List associations = new ArrayList();
Registry registry = getRegistry();
Resource resource = registry.get(resourcePath);
+ Association[] asso = registry.getAllAssociations(resource.getPath());
+ associations.addAll(Arrays.asList(asso));
+
+ return associations;
+ }
+ public List provideChildAssociations(String resourcePath,String parentPath) throws RegistryException {
+ List associations = new ArrayList();
+ Registry registry = getRegistry();
+ Resource resource = registry.get(resourcePath);
Association[] asso = registry.getAllAssociations(resource.getPath());
associations.addAll(Arrays.asList(asso));
+ Iterator iTempAsso = associations.iterator();
+ for (int i=0;iTempAsso.hasNext();i++) {
+ Association tempAsso = (Association) iTempAsso.next();
+ if(tempAsso.getSourcePath().equals(parentPath)){
+ associations.remove(i);
+ }
+
+ }
+
return associations;
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp Tue Jun 3 21:44:08 2008
@@ -242,7 +242,7 @@
for (int pageItem = 1; pageItem <= numberOfPages; pageItem++) { %>
<a class=<% if(pageNumber==pageItem){ %>"pageLinks-selected"<% } else {%>"pageLinks"<% } %>
- onclick="navigatePages(<%=pageItem%>)" style="margin-left:5px;margin-right:5px;"><%=pageItem%></a>
+ onclick="navigatePages(<%=pageItem%>)" ><%=pageItem%></a>
<% }
} else {
String place = "middle";
@@ -266,8 +266,7 @@
for (int pageItem = 1; pageItem <= 2; pageItem++) { %>
- <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"
- style="margin-left:5px;margin-right:5px;"><%=pageItem%>
+ <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"><%=pageItem%>
</a>
<% } %>
...
@@ -277,7 +276,7 @@
for (int pageItem = pageItemFrom; pageItem <= pageItemTo; pageItem++) { %>
<a class=<% if(pageNumber==pageItem){ %>"pageLinks-selected"<% } else {%>"pageLinks"<% } %>
- onclick="navigatePages(<%=pageItem%>)" style="margin-left:5px;margin-right:5px;"><%=pageItem%></a>
+ onclick="navigatePages(<%=pageItem%>)"><%=pageItem%></a>
<% }
if (place == "start" || place == "middle") {
@@ -286,8 +285,7 @@
<%
for (int pageItem = (numberOfPages - 1); pageItem <= numberOfPages; pageItem++) { %>
- <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"
- style="margin-left:5px;margin-right:5px;"><%=pageItem%>
+ <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"><%=pageItem%>
</a>
<% }
}
@@ -313,4 +311,4 @@
<% } %>
</table>
-<script language="javascript" type="text/javascript">fixResourceTabel();</script>
\ No newline at end of file
+<script language="javascript" type="text/javascript">fixResourceTabel();</script>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp Tue Jun 3 21:44:08 2008
@@ -41,7 +41,9 @@
details.getPath() + "&aspect=" + lifecycle +
"&action=" + action;
%>
- <td><form method="post" action="<%=actionURL%>"><input class="button" style="margin-left:10px;" type="submit" value="<%=action%>"/></form></td>
+ <td><% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %>
+ <form method="post" action="<%=actionURL%>"><input class="button" style="margin-left:10px;" type="submit" value="<%=action%>"/></form></td>
+ <% } %>
<%
}
%>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css Tue Jun 3 21:44:08 2008
@@ -387,8 +387,10 @@
margin-bottom:10px;
padding-left:30px;
line-height:20px;
-font-size:14px;
-color:#61180f;
+font-size:13px;
+background-color:#ebf5e3;
+border:solid 1px #26953c;
+color:#5c9e25;
}
/* Tag cloude styles */
.cloude-text{
@@ -813,14 +815,20 @@
.pageLinks{
background:#FFFFFF none repeat scroll 0%;
border:1px solid #DDDDDD;
-padding:2px 6px;
+padding:2px 3px;
text-decoration:none;
+margin:0px;
+margin-left:2px;
+margin-right:2px;
}
.pageLinks-selected{
background:#e8e9ae none repeat scroll 0%;
border:1px solid #DDDDDD;
-padding:2px 6px;
+padding:2px 3px;
text-decoration:none;
+margin:0px;
+margin-left:2px;
+margin-right:2px;
}
.resourceTreePage{
border:4px solid #CCCCCC;
@@ -910,4 +918,4 @@
color:#c6c6c6;
text-align:center;
padding:20px;
-}
\ No newline at end of file
+}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Tue Jun 3 21:44:08 2008
@@ -115,7 +115,10 @@
permissionType = "2";
}
- new Ajax.Updater('perExpanded', '/wso2registry/system/authorize', { method: 'post', parameters: {pathToAuthorize: pathToAuthorize, userToAuthorize: userToAuthorize, actionToAuthorize: actionToAuthorize, permissionType: permissionType} });
+ new Ajax.Updater('permissionDiv', '/wso2registry/system/authorize', { method: 'post', parameters: {pathToAuthorize: pathToAuthorize, userToAuthorize: userToAuthorize, actionToAuthorize: actionToAuthorize, permissionType: permissionType} });
+ $('permissionSuccess').style.display="block";
+ $('permissionSuccess').innerHTML = "Permission Applied Successfuly!";
+ setTimeout("showHideCommon('permissionSuccess')",5000);
}else {
reasonDiv.innerHTML = reason;
reasonDiv.style.display = "block";
@@ -142,7 +145,10 @@
}
}
- new Ajax.Updater('perExpanded', '/wso2registry/system/authorize/mass', { method: 'post', parameters: {permissionInput: msgBody, resourcePath: resourcePath} });
+ new Ajax.Updater('permissionDiv', '/wso2registry/system/authorize/mass', { method: 'post', parameters: {permissionInput: msgBody, resourcePath: resourcePath} });
+ $('permissionSuccess').style.display="block";
+ $('permissionSuccess').innerHTML = "Permission Applied Successfuly!";
+ setTimeout("showHideCommon('permissionSuccess')",5000);
}
function addRolePermission(pathToAuthorize) {
@@ -161,7 +167,10 @@
permissionType = "2";
}
- new Ajax.Updater('perExpanded', '/wso2registry/system/authorizeRole', { method: 'post', parameters: {pathToAuthorize: pathToAuthorize, roleToAuthorize: roleToAuthorize, actionToAuthorize: actionToAuthorize, permissionType: permissionType} });
+ new Ajax.Updater('permissionDiv', '/wso2registry/system/authorizeRole', { method: 'post', parameters: {pathToAuthorize: pathToAuthorize, roleToAuthorize: roleToAuthorize, actionToAuthorize: actionToAuthorize, permissionType: permissionType} });
+ $('permissionSuccess').style.display="block";
+ $('permissionSuccess').innerHTML = "Permission Applied Successfuly!";
+ setTimeout("showHideCommon('permissionSuccess')",5000);
} else {
reasonDiv.innerHTML = reason;
reasonDiv.style.display = "block";
@@ -188,7 +197,10 @@
}
}
- new Ajax.Updater('perExpanded', '/wso2registry/system/authorizeRoles', { method: 'post', parameters: {permissionInput: msgBody, resourcePath: resourcePath} });
+ new Ajax.Updater('permissionDiv', '/wso2registry/system/authorizeRoles', { method: 'post', parameters: {permissionInput: msgBody, resourcePath: resourcePath} });
+ $('permissionSuccess').style.display="block";
+ $('permissionSuccess').innerHTML = "Permission Applied Successfuly!";
+ setTimeout("showHideCommon('permissionSuccess')",5000);
}
function addComment(resourcePath) {
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp Tue Jun 3 21:44:08 2008
@@ -14,6 +14,7 @@
<% if (errorMessage != null) { %>
<div class="error-message"><%=errorMessage%></div>
<% } %>
+
<div id="permisionReason" class="validationError" style="display: none;"></div>
<h3>User Permissions</h3>
<div id="userPermisionsDiv" class="userPermisionsDiv leftSpace">
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp?rev=17857&r1=17856&r2=17857&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp Tue Jun 3 21:44:08 2008
@@ -838,7 +838,7 @@
for (int pageItem = 1; pageItem <= numberOfPages; pageItem++) { %>
<a class=<% if(pageNumber==pageItem){ %>"pageLinks-selected"<% } else {%>"pageLinks"<% } %>
- onclick="navigatePages(<%=pageItem%>)" style="margin-left:5px;margin-right:5px;"><%=pageItem%></a>
+ onclick="navigatePages(<%=pageItem%>)" ><%=pageItem%></a>
<% }
} else {
String place = "middle";
@@ -862,8 +862,7 @@
for (int pageItem = 1; pageItem <= 2; pageItem++) { %>
- <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"
- style="margin-left:5px;margin-right:5px;"><%=pageItem%>
+ <a class="pageLinks" onclick="navigatePages(<%=pageItem%>)"><%=pageItem%>
</a>
<% } %>
...
@@ -873,7 +872,7 @@
for (int pageItem = pageItemFrom; pageItem <= pageItemTo; pageItem++) { %>
<a class=<% if(pageNumber==pageItem){ %>"pageLinks-selected"<% } else {%>"pageLinks"<% } %>
- onclick="navigatePages(<%=pageItem%>)" style="margin-left:5px;margin-right:5px;"><%=pageItem%></a>
+ onclick="navigatePages(<%=pageItem%>)"><%=pageItem%></a>
<% }
if (place == "start" || place == "middle") {
@@ -956,9 +955,10 @@
</div>
<div class="box1-mid" id="perExpanded" style="display:none;">
<!-- all the content goes here -->
-
+ <div class="success-message" id="permissionSuccess" style="display:none;"></div>
+ <div id="permissionDiv">
<jsp:include page="permisions.jsp"/>
-
+ </div>
<!-- End box1-mid div -->
</div>
@@ -981,7 +981,7 @@
<table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
<tr>
<td>
- <% if (details.isLoggedIn() && !details.isVersionView()) { %><a
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %><a
onclick="showHideCommon('tagAddTable');expandIfNot('tag');$('tfTag').focus();"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Add New Tag"/></a><% } %>
@@ -1024,7 +1024,7 @@
Go to the current version to add tags
<% } else { %>
-
+ <% if (details.isPutAllowed()) { %>
<div id="tagAddTable" style="margin-top:5px;">
<input id="tfPath" type="hidden" name="resourcePath" value="<%=details.getPath()%>"/>
@@ -1039,7 +1039,8 @@
</div>
- <% } %>
+ <% }
+ } %>
</div>
<!-- ------------------------------------------------- -->
@@ -1060,7 +1061,7 @@
src="/wso2registry/admin/images/icon-feed-small.gif"/></a>
</td>
<td>
- <% if (details.isLoggedIn() && !details.isVersionView()) { %><a
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %><a
onclick="showHideCommon('add-comment-div');expandIfNot('comments');$('comment').focus();"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Add New Comment"/></a><% } %>
@@ -1133,7 +1134,7 @@
<tr>
<td>
- <% if (details.isLoggedIn() && !details.isVersionView()) { %><a
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %><a
onclick="showHideCommon('add-lifecycle-div');expandIfNot('lifecycle');$('lifecycle').focus();"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Assign New Lifecycle"/></a><% } %>
@@ -1222,9 +1223,11 @@
"&action=" + action;
%>
<td>
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %>
<form method="post" action="<%=actionURL%>"><input class="button" style="margin-left:10px;"
type="submit" value="<%=action%>"/>
</form>
+ <% } %>
</td>
<%
}
@@ -1252,7 +1255,7 @@
<table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
<tr>
<td>
- <% if (details.isLoggedIn() && !details.isVersionView()) { %><a
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %><a
onclick="showHideCommon('dependenciesAddDiv');expandIfNot('dependencies');$('depPaths').focus();"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Assign New Dependencies"/></a><% } %>
@@ -1321,7 +1324,7 @@
<table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
<tr>
<td>
- <% if (details.isLoggedIn() && !details.isVersionView()) { %><a
+ <% if (details.isLoggedIn() && !details.isVersionView() && details.isPutAllowed()) { %><a
onclick="showHideCommon('associationsAddDiv');expandIfNot('associations');$('type').focus();"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Assign New associations"/></a><% } %>
More information about the Registry-dev
mailing list