You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/03/12 18:00:20 UTC
directory-fortress-commander git commit: FC-81 - web label cleanup
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 19436ad68 -> 5902e7942
FC-81 - web label cleanup
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/5902e794
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/5902e794
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/5902e794
Branch: refs/heads/master
Commit: 5902e7942e49cf79df42f3ffcb43ff830f4afcf3
Parents: 19436ad
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Mar 12 12:00:01 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Mar 12 12:00:01 2015 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../directory/fortress/web/FtBookmarkablePageLink.java | 8 ++++++++
.../java/org/apache/directory/fortress/web/LaunchPage.java | 2 +-
.../java/org/apache/directory/fortress/web/ObjectPage.java | 2 +-
.../java/org/apache/directory/fortress/web/PermPage.java | 2 +-
.../directory/fortress/web/panel/AuditAuthzListPanel.java | 2 +-
.../apache/directory/fortress/web/panel/SDDetailPanel.java | 2 +-
.../org/apache/directory/fortress/web/panel/SDListPanel.java | 2 +-
.../org/apache/directory/fortress/web/ErrorPage.html | 2 +-
.../apache/directory/fortress/web/FortressWebBasePage.html | 2 +-
.../org/apache/directory/fortress/web/LaunchPage.html | 2 +-
.../org/apache/directory/fortress/web/LoginPage.html | 2 +-
.../org/apache/directory/fortress/web/LogoutPage.html | 2 +-
src/main/webapp/WEB-INF/web.xml | 4 ++--
src/main/webapp/login/error.html | 2 +-
src/main/webapp/login/login.html | 6 +++---
src/main/webapp/login/pagenotfound.html | 2 +-
src/main/webapp/login/unauthorized.html | 2 +-
src/main/webapp/login/unexpected.html | 2 +-
19 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a065047..1f39e79 100755
--- a/pom.xml
+++ b/pom.xml
@@ -429,7 +429,7 @@
</configuration>
</plugin>
- <!-- Compile the commander source -->
+ <!-- Compile the fortress web source -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/FtBookmarkablePageLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FtBookmarkablePageLink.java b/src/main/java/org/apache/directory/fortress/web/FtBookmarkablePageLink.java
new file mode 100644
index 0000000..6bb77f7
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/web/FtBookmarkablePageLink.java
@@ -0,0 +1,8 @@
+package org.apache.directory.fortress.web;
+
+/**
+ * Created by smckinn on 3/12/15.
+ */
+public class FtBookmarkablePageLink
+{
+}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
index 057cfb0..42eefd0 100644
--- a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
@@ -44,6 +44,6 @@ public class LaunchPage extends FortressWebBasePage
{
setResponsePage( LoginPage.class );
}
- add( new Label( "label1", "Click on a link above for RBAC administration." ) );
+ add( new Label( "label1", "Click on a link above." ) );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
index 9dfeb4e..c7bf423 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
@@ -41,7 +41,7 @@ public class ObjectPage extends FortressWebBasePage
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
- private String label = "RBAC Permission Object Page";
+ private String label = "Permission Object Page";
public ObjectPage( PageParameters parameters )
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/PermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermPage.java b/src/main/java/org/apache/directory/fortress/web/PermPage.java
index 1755145..81ecfc1 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermPage.java
@@ -41,7 +41,7 @@ public class PermPage extends FortressWebBasePage
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
- private String label = "RBAC Permission Operation Page";
+ private String label = "Permission Operation Page";
public PermPage( PageParameters parameters )
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
index 7291539..d8ae2f2 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
@@ -554,7 +554,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
if ( userAudit.isAdmin() )
title = "Admin Permission Search Modal";
else
- title = "RBAC Permission Search Modal";
+ title = "Permission Search Modal";
permsModalWindow.setTitle( title );
permsModalWindow.setInitialWidth( 650 );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
index 42f5aae..539ea7f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
@@ -514,7 +514,7 @@ public class SDDetailPanel extends FormComponentPanel
}
} );
- rolesModalWindow.setTitle( "RBAC Role Selection Modal" );
+ rolesModalWindow.setTitle( "Role Selection Modal" );
rolesModalWindow.setInitialWidth( 700 );
rolesModalWindow.setInitialHeight( 450 );
rolesModalWindow.setCookieName( "role-assign-modal" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
index 5a076c5..149824a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
@@ -340,7 +340,7 @@ public class SDListPanel extends FormComponentPanel
}
} );
- rolesModalWindow.setTitle( "RBAC Role Search Modal" );
+ rolesModalWindow.setTitle( "Role Search Modal" );
rolesModalWindow.setInitialWidth( 700 );
rolesModalWindow.setInitialHeight( 450 );
rolesModalWindow.setCookieName( "role-assign-modal" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html b/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
index 7f20395..185c692 100644
--- a/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
@@ -20,7 +20,7 @@
<head></head>
<body>
<wicket:extend>
- <h3> Commander Error Page </h3>
+ <h3>Fortress Web Error Page</h3>
<div class="ui-widget">
<div style="padding: 0pt 0.7em;" class="ui-state-error ui-corner-all">
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html b/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
index eb493c4..5bd2b16 100644
--- a/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
@@ -38,7 +38,7 @@
}
</style>
- <title>Fortress Web RBAC Administration</title>
+ <title>Fortress Web Administration</title>
<link rel="shortcut icon" href="images/favicon.ico"/>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html b/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
index 21bde66..42e97de 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
@@ -20,7 +20,7 @@
<head></head>
<body>
<wicket:extend>
- <h3>Commander Launch Page</h3>
+ <h3>Fortress Web Launch Page</h3>
<strong><span wicket:id="label1"></span></strong>
<!--
<BR/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/LoginPage.html b/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
index 8d9b30d..f5339c7 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
@@ -22,7 +22,7 @@
</head>
<body>
<wicket:extend>
- <h3> Commander Login Form </h3>
+ <h3>Fortress Web Login Page</h3>
<form wicket:id="loginFields">
<fieldset>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html b/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
index 7e2cb4f..6d9f46d 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
@@ -20,7 +20,7 @@
<head></head>
<body>
<wicket:extend>
- <h3>Commander Logout Page</h3>
+ <h3>Fortress Web Logout Page</h3>
<strong><span wicket:id="label1"></span></strong>
</wicket:extend>
</body>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c39f7e0..9f993a4 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -21,7 +21,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Commander Web Admin</display-name>
+ <display-name>Fortress Web Admin</display-name>
<servlet>
<servlet-name>wicket</servlet-name>
@@ -107,7 +107,7 @@
</security-constraint>
<security-constraint>
- <display-name>Commander Security Constraint</display-name>
+ <display-name>Fortress Web Security Constraints</display-name>
<web-resource-collection>
<web-resource-name>Protected Area</web-resource-name>
<!-- Define the context-relative URL(s) to be protected -->
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/login/error.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/login/error.html b/src/main/webapp/login/error.html
index 44fcc2f..f936927 100644
--- a/src/main/webapp/login/error.html
+++ b/src/main/webapp/login/error.html
@@ -21,7 +21,7 @@
<head>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
- <title> Fortress Web RBAC Administration </title>
+ <title>Fortress Web Login Error Page</title>
</head>
<body>
<h3>Invalid userid or password detected</h3>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/login/login.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/login/login.html b/src/main/webapp/login/login.html
index 2472ca3..6dc3475 100644
--- a/src/main/webapp/login/login.html
+++ b/src/main/webapp/login/login.html
@@ -21,13 +21,13 @@
<head>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
- <title> Fortress Web RBAC Administration </title>
- <h3> Fortress Web Login Form </h3>
+ <title>Fortress Web Login Page</title>
+ <h3>Login to Fortress Web</h3>
</head>
<body>
<FORM METHOD=POST ACTION="j_security_check">
<fieldset>
- <legend>Login Operations</legend>
+ <legend>Enter Creds</legend>
<table id="inputFormTable">
<tr>
<td>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/login/pagenotfound.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/login/pagenotfound.html b/src/main/webapp/login/pagenotfound.html
index b6080e3..2b332d9 100644
--- a/src/main/webapp/login/pagenotfound.html
+++ b/src/main/webapp/login/pagenotfound.html
@@ -21,7 +21,7 @@
<head>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
- <title> Fortress Web RBAC Administration </title>
+ <title>Fortress Web Page Not Found</title>
</head>
<body>
<h3>Page not found</h3>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/login/unauthorized.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/login/unauthorized.html b/src/main/webapp/login/unauthorized.html
index e567f1b..3fa118b 100644
--- a/src/main/webapp/login/unauthorized.html
+++ b/src/main/webapp/login/unauthorized.html
@@ -21,7 +21,7 @@
<head>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
- <title> Fortress Web RBAC Administration </title>
+ <title>Fortress Web Unauthorized Page</title>
</head>
<body>
<h3>Unauthorized access attempt detected</h3>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/5902e794/src/main/webapp/login/unexpected.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/login/unexpected.html b/src/main/webapp/login/unexpected.html
index ef48e0e..c2e97d3 100644
--- a/src/main/webapp/login/unexpected.html
+++ b/src/main/webapp/login/unexpected.html
@@ -21,7 +21,7 @@
<head>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
- <title> Fortress Web RBAC Administration </title>
+ <title>Fortress Web Unexpected Page</title>
</head>
<body>
<h3>Unexpected error occurred</h3>