diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml index 52ba0b7b2..877fe93b3 100644 --- a/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-webapp/src/main/resources/xwork.xml @@ -275,89 +275,7 @@ user - - - /WEB-INF/jsp/admin/rbac/permissions.jsp - - - - - /WEB-INF/jsp/admin/rbac/permission.jsp - - - - - permissions - - - - permissions - - - - /WEB-INF/jsp/admin/rbac/operations.jsp - - - - - /WEB-INF/jsp/admin/rbac/operation.jsp - - - - - operations - - - - operations - - - - /WEB-INF/jsp/admin/rbac/resources.jsp - - - - - /WEB-INF/jsp/admin/rbac/resource.jsp - - - - - resources - - - - /WEB-INF/jsp/admin/rbac/resources.jsp - - - - /WEB-INF/jsp/admin/rbac/roles.jsp - - - - - /WEB-INF/jsp/admin/rbac/role.jsp - - - - - roles - - - - roles - - - - role - - - - role - - - - + diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/README b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/README deleted file mode 100644 index ac36178d2..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/README +++ /dev/null @@ -1,6 +0,0 @@ -NOTE: since this is the first application of plexus-security I have these pages here for analyzing the roles -from rbac. - -these will be removed shortly - -nada que ver aqui! :P \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operation.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operation.jsp deleted file mode 100644 index 150d22617..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operation.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Operation Modification

- -
- - - - - -
-
- - -
- -
- - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operations.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operations.jsp deleted file mode 100644 index ef4024f61..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/operations.jsp +++ /dev/null @@ -1,55 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Available Operations

- -
- - - - - - -

Roles|Permissions|Operations|Resources

- - - - - - ${operation.name} - - - ${operation.name}
-
- -

- - - new
-

-
- - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permission.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permission.jsp deleted file mode 100644 index cedb1fe32..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permission.jsp +++ /dev/null @@ -1,46 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Permission Modification

- -
- - - - - -
-
-
-
-
- or
-
-
-
-
- - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permissions.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permissions.jsp deleted file mode 100644 index a702b7ab5..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/permissions.jsp +++ /dev/null @@ -1,59 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Available Permissions

- -
- - - - - -

Roles|Permissions|Operations|Resources

- -

- Permissions list page -

- - - - - ${permission.name} - - - ${permission.name}
-
- -

- - - new
-

- - -
- \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resource.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resource.jsp deleted file mode 100644 index c030e9014..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resource.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Resource Modification

- -
- - - - - -
- -
-
- -
- - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resources.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resources.jsp deleted file mode 100644 index 4d7d0c5f9..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/resources.jsp +++ /dev/null @@ -1,55 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Available Resources

- -
- - - - - - -

Roles|Permissions|Operations|Resources

- - - - - - ${resource.identifier} - - ${resource.identifier}
-
- -

- - - new
-

-
- - - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/role.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/role.jsp deleted file mode 100644 index d5fa08add..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/role.jsp +++ /dev/null @@ -1,67 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Role Modification

- -
- - - - - -
-
-
-
- Currently Assigned Permissions:
- - - - ${permission.name} - - ${permission.name} | remove
-
-
-
-
- Currently Assigned Roles:
- - - - - - ${arole.name} | remove
-
-
-
- -

- -

-
-
- - \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/roles.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/roles.jsp deleted file mode 100644 index 8c3e7958d..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/rbac/roles.jsp +++ /dev/null @@ -1,55 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed 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 prefix="ww" uri="/webwork" %> - - - - Configuration - - - - - -

Available Roles

- -
- - - - - - - -

Roles|Permissions|Operations|Resources

- - - - - ${role.name} - - - ${role.name}
-
- -

- - - new
-

-
- - \ No newline at end of file