You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jm...@apache.org on 2006/09/12 22:54:05 UTC
svn commit: r442699 - in /maven/archiva/trunk/archiva-webapp/src/main:
java/org/apache/maven/archiva/web/util/DefaultRoleManager.java
resources/xwork.xml webapp/WEB-INF/jsp/admin/index.jsp
webapp/WEB-INF/jsp/login.jsp webapp/WEB-INF/jsp/register.jsp
Author: jmcconnell
Date: Tue Sep 12 13:54:04 2006
New Revision: 442699
URL: http://svn.apache.org/viewvc?view=rev&rev=442699
Log:
added some new permissions
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java?view=diff&rev=442699&r1=442698&r2=442699
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java Tue Sep 12 13:54:04 2006
@@ -88,15 +88,15 @@
manager.saveOperation( operation );
}
- if ( !manager.operationExists( "get-reports" ) )
+ if ( !manager.operationExists( "access-reports" ) )
{
- Operation operation = manager.createOperation( "get-reports" );
+ Operation operation = manager.createOperation( "access-reports" );
manager.saveOperation( operation );
}
- if ( !manager.operationExists( "regenerate-reports" ) )
+ if ( !manager.operationExists( "generate-reports" ) )
{
- Operation operation = manager.createOperation( "regenerate-reports" );
+ Operation operation = manager.createOperation( "generate-reports" );
manager.saveOperation( operation );
}
@@ -156,6 +156,22 @@
manager.savePermission( editAllUsers );
}
+ if ( !manager.permissionExists( "Access Reports" ) )
+ {
+ Permission editAllUsers = manager.createPermission( "Access Reports", "access-reports",
+ manager.getGlobalResource().getIdentifier() );
+
+ manager.savePermission( editAllUsers );
+ }
+
+ if ( !manager.permissionExists( "Generate All Reports" ) )
+ {
+ Permission editAllUsers = manager.createPermission( "Generate All Reports", "generate-reports",
+ manager.getGlobalResource().getIdentifier() );
+
+ manager.savePermission( editAllUsers );
+ }
+
if ( !manager.permissionExists( "Grant Roles" ) )
{
Permission granRoles = manager.createPermission( "Grant Roles", "grant-roles",
@@ -197,6 +213,8 @@
admin.addPermission( manager.getPermission( "Edit Configuration" ) );
admin.addPermission( manager.getPermission( "Run Indexer" ) );
admin.addPermission( manager.getPermission( "Add Repository" ) );
+ admin.addPermission( manager.getPermission( "Access Reports") );
+ admin.addPermission( manager.getPermission( "Generate All Reports") );
admin.addPermission( manager.getPermission( "Regenerate Index" ) );
admin.setAssignable( true );
manager.saveRole( admin );
@@ -206,6 +224,7 @@
}
catch ( RbacObjectNotFoundException ne )
{
+ ne.printStackTrace();
throw new InitializationException( "error in role initialization", ne );
}
@@ -266,7 +285,7 @@
// make the roles
Role repositoryObserver = manager.createRole( "Repository Observer - " + repositoryName );
- repositoryObserver.addPermission( editRepo );
+ repositoryObserver.addPermission( getReports );
repositoryObserver.setAssignable( true );
repositoryObserver = manager.saveRole( repositoryObserver );
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=442699&r1=442698&r2=442699
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Tue Sep 12 13:54:04 2006
@@ -253,15 +253,15 @@
<action name="userManagement" class="userManagement" method="findUser">
<result name="input">/WEB-INF/jsp/findUser.jsp</result>
- <result name="success" type="redirect-action">user</result>
+ <result name="success" type="chain">user</result>
</action>
<action name="assignRoleToUser" class="plexusSecurityUserAssignment" method="assignRole">
- <result name="success" type="redirect-action">user</result>
+ <result name="success" type="chain">user</result>
</action>
<action name="removeRoleFromUser" class="plexusSecurityUserAssignment" method="removeRole">
- <result name="success" type="redirect-action">user</result>
+ <result name="success" type="chain">user</result>
</action>
<action name="permissions" class="plexusSecuritySummary" method="permissionSummary">
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp?view=diff&rev=442699&r1=442698&r2=442699
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp Tue Sep 12 13:54:04 2006
@@ -104,7 +104,7 @@
<ww:param name="repoId" value="%{'${repository.id}'}" />
</ww:url>
<%-- TODO replace with icons --%>
- <pss:ifAuthorized permission="edit-repository" resource="${repository.id}"><ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a></pss:ifAuthorized> | <pss:ifAuthorized permission="delete-repository" resource="${repository.id}"><ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a></pss:ifAuthorized>
+ <pss:ifAuthorized permission="edit-repository" resource="${repository.id}"><ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a></pss:ifAuthorized><pss:ifAuthorized permission="delete-repository" resource="${repository.id}"> <ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a></pss:ifAuthorized>
</div>
<h3>${repository.name}</h3>
<table class="infoTable">
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp?view=diff&rev=442699&r1=442698&r2=442699
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp Tue Sep 12 13:54:04 2006
@@ -38,7 +38,7 @@
</p>
<h2>Login</h2>
- <ww:form action="login">
+ <ww:form action="login" method="post">
<table class="bodyTable">
<tr class="a">
<th>
@@ -66,6 +66,11 @@
</table>
</ww:form>
+
+ <p>
+ <ww:url id="registerUrl" action="register"/>
+ Need an Account? <ww:a href="%{registerUrl}">Register!</ww:a>
+ </p>
</div>
</div>
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp?view=diff&rev=442699&r1=442698&r2=442699
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp Tue Sep 12 13:54:04 2006
@@ -33,7 +33,7 @@
</p>
<h2>Register for an Account</h2>
- <ww:form action="register">
+ <ww:form action="register" method="post">
<table class="bodyTable">
<tr class="b">
<th>