You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/25 20:56:35 UTC
[09/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
o Removed the warning caused by the missing serialVersionUID (FC-24)
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/39c304ec
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/39c304ec
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/39c304ec
Branch: refs/heads/master
Commit: 39c304ec5d2dab0c8d268c061ae3aa19e6f45f93
Parents: 709219c
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Nov 21 14:07:13 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Nov 25 20:48:02 2014 +0100
----------------------------------------------------------------------
pom.xml | 1094 ++++++++++--------
.../fortress/web/FortressWebBasePage.java | 20 +-
.../directory/fortress/web/GroupPage.java | 44 +-
.../directory/fortress/web/LaunchPage.java | 13 +-
.../directory/fortress/web/LoginPage.java | 11 +-
.../directory/fortress/web/ObjectAdminPage.java | 44 +-
.../directory/fortress/web/ObjectPage.java | 44 +-
.../directory/fortress/web/OuPermPage.java | 48 +-
.../directory/fortress/web/OuUserPage.java | 46 +-
.../directory/fortress/web/PermAdminPage.java | 45 +-
.../apache/directory/fortress/web/PermPage.java | 45 +-
.../directory/fortress/web/PwPolicyPage.java | 48 +-
.../directory/fortress/web/RbacSession.java | 7 +
.../directory/fortress/web/RoleAdminPage.java | 29 +-
.../apache/directory/fortress/web/RolePage.java | 27 +-
.../directory/fortress/web/SdDynamicPage.java | 45 +-
.../directory/fortress/web/SdStaticPage.java | 44 +-
.../web/SecureBookmarkablePageLink.java | 15 +-
.../web/SecureIndicatingAjaxButton.java | 11 +-
.../fortress/web/SecureIndicatingAjaxLink.java | 11 +-
.../apache/directory/fortress/web/UserPage.java | 41 +-
.../web/panel/AuditAuthzDetailPanel.java | 61 +-
.../fortress/web/panel/AuditAuthzListPanel.java | 352 ++++--
.../web/panel/AuditBindDetailPanel.java | 59 +-
.../fortress/web/panel/AuditBindListPanel.java | 238 ++--
.../fortress/web/panel/AuditModDetailPanel.java | 20 +-
.../fortress/web/panel/AuditModListPanel.java | 280 +++--
.../web/panel/ConstraintAdminRolePanel.java | 101 +-
.../fortress/web/panel/ConstraintBasePanel.java | 410 ++++---
.../fortress/web/panel/ConstraintPanel.java | 103 +-
.../fortress/web/panel/ConstraintRolePanel.java | 101 +-
.../fortress/web/panel/GroupDetailPanel.java | 175 ++-
.../fortress/web/panel/GroupListPanel.java | 195 ++--
.../directory/fortress/web/panel/InfoPanel.java | 15 +
.../directory/fortress/web/panel/JpegImage.java | 22 +-
.../directory/fortress/web/panel/Member.java | 8 +
.../directory/fortress/web/panel/NavPanel.java | 207 +++-
.../fortress/web/panel/OUDetailPanel.java | 193 ++-
.../fortress/web/panel/OUListPanel.java | 35 +-
.../fortress/web/panel/OUSearchModalPanel.java | 29 +-
.../fortress/web/panel/ObjectDetailPanel.java | 69 +-
.../fortress/web/panel/ObjectListPanel.java | 214 ++--
.../web/panel/ObjectSearchModalPanel.java | 26 +-
.../fortress/web/panel/PermDetailPanel.java | 290 +++--
.../fortress/web/panel/PermListPanel.java | 265 +++--
.../web/panel/PermSearchModalPanel.java | 26 +-
.../fortress/web/panel/PwPolicyDetailPanel.java | 256 ++--
.../fortress/web/panel/PwPolicyListPanel.java | 277 +++--
.../web/panel/PwPolicySearchModalPanel.java | 30 +-
.../fortress/web/panel/RequestMod.java | 18 +-
.../web/panel/RoleAdminDetailPanel.java | 91 +-
.../fortress/web/panel/RoleDetailPanel.java | 327 ++++--
.../fortress/web/panel/RoleListPanel.java | 245 ++--
.../web/panel/RoleSearchModalPanel.java | 75 +-
.../fortress/web/panel/SDDetailPanel.java | 279 +++--
.../fortress/web/panel/SDListPanel.java | 279 +++--
.../web/panel/UserAuditDetailPanel.java | 17 +-
.../fortress/web/panel/UserDetailPanel.java | 339 +++++-
.../fortress/web/panel/UserListPanel.java | 146 ++-
.../web/panel/UserSearchModalPanel.java | 31 +-
60 files changed, 4994 insertions(+), 2642 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f790ece..91e438a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
"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
+ 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
@@ -18,531 +18,605 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.directory</groupId>
- <artifactId>fortress-web</artifactId>
- <packaging>war</packaging>
- <version>1.0-RC40-SNAPSHOT</version>
- <name>Apache Fortress Web</name>
- <url>http://directory.apache.org/foress/</url>
- <description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-web</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-RC40-SNAPSHOT</version>
+ <name>Apache Fortress Web</name>
+ <url>http://directory.apache.org/foress/</url>
+ <description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>15</version>
+ </parent>
- <scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
- </developerConnection>
- <tag>HEAD</tag>
- </scm>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
- </issueManagement>
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
+ </developerConnection>
+ <tag>HEAD</tag>
+ </scm>
- <mailingLists>
- <mailingList>
- <name>Apache Directory -- Fortress List</name>
- <post>fortress@directory.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/directory-fortress/</archive>
- </mailingList>
- </mailingLists>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
+ </issueManagement>
- <!-- ====================================================== -->
- <!-- The list of current developers -->
- <!-- ====================================================== -->
- <developers>
- <developer>
- <id>smckinney</id>
- <name>Shawn McKinney</name>
- <email>smckinney@apache.org</email>
- </developer>
+ <mailingLists>
+ <mailingList>
+ <name>Apache Directory -- Fortress List</name>
+ <post>fortress@directory.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/directory-fortress/</archive>
+ </mailingList>
+ </mailingLists>
- <developer>
- <id>kmckinney</id>
- <name>Kevin McKinney</name>
- </developer>
- </developers>
+ <!-- ====================================================== -->
+ <!-- The list of current developers -->
+ <!-- ====================================================== -->
+ <developers>
+ <developer>
+ <id>smckinney</id>
+ <name>Shawn McKinney</name>
+ <email>smckinney@apache.org</email>
+ </developer>
- <properties>
- <title>${project.name} ${project.version}</title>
- <wicket.version>6.16.0</wicket.version>
- <wicket.jquery.version>6.16.0</wicket.jquery.version>
- <wicket.kendo-ui.version>6.14.0</wicket.kendo-ui.version>
- <version.log4j>1.2.17</version.log4j>
- <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
- <spring.version>3.2.3.RELEASE</spring.version>
- <spring.security.version>3.1.4.RELEASE</spring.security.version>
- <javadoc.version>2.9.1</javadoc.version>
- <jetty.version>8.1.8.v20121106</jetty.version>
- <jetty.stopKey>stopJetty</jetty.stopKey>
- <jetty.stopPort>9081</jetty.stopPort>
- <jetty.port>9080</jetty.port>
- <skipTests>true</skipTests>
- </properties>
+ <developer>
+ <id>kmckinney</id>
+ <name>Kevin McKinney</name>
+ </developer>
- <dependencies>
- <!-- Fortress Realm pulls in Fortress Core for RBAC 'CRUD' & policy enforcement apis. -->
- <dependency>
- <groupId>org.apache.directory</groupId>
- <artifactId>fortress-realm-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j.log4j12}</version>
- </dependency>
+ <developer>
+ <id>elecharny</id>
+ <name>Emmanuel Lecharny</name>
+ <email>elecharny@apache.org</email>
+ </developer>
+ </developers>
- <!-- Servlet API DEPENDENCIES -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
+ <properties>
+ <title>${project.name} ${project.version}</title>
+ <wicket.version>6.16.0</wicket.version>
+ <wicket.jquery.version>6.16.0</wicket.jquery.version>
+ <wicket.kendo-ui.version>6.14.0</wicket.kendo-ui.version>
+ <version.log4j>1.2.17</version.log4j>
+ <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
+ <spring.version>3.2.3.RELEASE</spring.version>
+ <spring.security.version>3.1.4.RELEASE</spring.security.version>
+ <javadoc.version>2.9.1</javadoc.version>
+ <jetty.version>8.1.8.v20121106</jetty.version>
+ <jetty.stopKey>stopJetty</jetty.stopKey>
+ <jetty.stopPort>9081</jetty.stopPort>
+ <jetty.port>9080</jetty.port>
+ <skipTests>true</skipTests>
+ </properties>
- <!-- JETTY used for embedded testing within intellij -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.25</version>
- </dependency>
- <!-- Wicket, Spring and other Web UI framework tools -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-guice</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-jmx</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-velocity</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-inmethod-grid</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-jwicket-ui-resize</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui</artifactId>
- <version>${wicket.kendo-ui.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.1</version>
- </dependency>
- <!-- ANT DEPENDENCIES FOR RUNNING ANT PLUG-IN FOR FORTRESS LOAD UTILITY -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.8.1</version>
- </dependency>
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <!-- Fortress Realm pulls in Fortress Core for RBAC 'CRUD' & policy enforcement apis. -->
+ <dependency>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-realm-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j.log4j12}</version>
+ </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>2.36.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-common</artifactId>
- <version>2.0b1</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
+ <!-- Servlet API DEPENDENCIES -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
- <build>
- <finalName>${project.artifactId}-${version}</finalName>
- <resources>
- <!-- include all these to be able to view their source -->
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- <include>**/*.css</include>
- <include>**/*.jpg</include>
- <include>**/*.gif</include>
- <include>**/*.png</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- <include>**/*.css</include>
- <include>**/*.jpg</include>
- <include>**/*.gif</include>
- <include>**/*.png</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- <include>**/*.vm</include>
- <include>**/*.tmpl</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/webapp/login</directory>
- <includes>
- <include>**/*.html</include>
- </includes>
- </resource>
- </resources>
- <plugins>
+ <!-- JETTY used for embedded testing within intellij -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.25</version>
+ </dependency>
+
+ <!-- Wicket, Spring and other Web UI framework tools -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-guice</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-jmx</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-datetime</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-velocity</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-inmethod-grid</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jwicket-ui-resize</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-jquery-ui</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-kendo-ui</artifactId>
+ <version>${wicket.kendo-ui.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.uwyn</groupId>
+ <artifactId>jhighlight</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <!-- ANT DEPENDENCIES FOR RUNNING ANT PLUG-IN FOR FORTRESS LOAD UTILITY -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Assemble a commander distro archive -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>user_distribution</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/distsrc.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>2.36.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-common</artifactId>
+ <version>2.0b1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ </dependencies>
- </executions>
- </plugin>
- <!-- Deploy the finished war -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <warFile>target/${project.artifactId}.war</warFile>
- <server>local-tomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <!-- TODO: CHANGE ME ON NEXT RELEASE TO USE 'TEXT' on URL: <url>http://localhost:8080/manager/text</url>-->
- <path>/${project.artifactId}</path>
- <!-- Warning the tomcat manager creds here are for deploying into a demo environment only. -->
- <username>tcmanager</username>
- <password>m@nager123</password>
- </configuration>
- </plugin>
- <!-- Compile the commander source -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <!-- War the commander app -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <!-- this is needed to pickup the context.xml in META-INF: -->
- <configuration>
- <warName>${project.artifactId}</warName>
- <archive>
- <manifest>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>${project.basedir}/src/main/resources
- </directory>
+ <build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <resources>
+ <!-- include all these to be able to view their source -->
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.vm</include>
+ <include>**/*.tmpl</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/webapp/login</directory>
+ <includes>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- project excludes -->
+ <exclude>**/jquery-ui.css</exclude>
+ <exclude>**/kendo.common.min.css</exclude>
+ <exclude>**/kendo.default.min.css</exclude>
+ <exclude>**/jquery-ui-1.10.2.custom.min.css</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/LICENSE.*</exclude>
+ <exclude>**/NOTICE-bin.txt</exclude>
+ <exclude>**/resources/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <!-- Javadoc archive -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <stylesheet>java</stylesheet>
- <bottom><small>Copyright &copy; 2011-2014 Joshua Tree Software, LLC. All Rights Reserved.
- Generated ${maven.build.timestamp}.</small></bottom>
- <overview>src/main/java/org/apache/directory/fortress/web/overview.html</overview>
- <version>true</version>
- <author>true</author>
- <doctitle>${title}</doctitle>
- <windowtitle>${title}</windowtitle>
- </configuration>
- </plugin>
- <!-- Source archive -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Integration Test -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- this works for embedded testing with Jetty -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.version}</version>
- <configuration>
- <scanIntervalSeconds>1</scanIntervalSeconds>
- <stopPort>9999</stopPort>
- <stopKey>foo</stopKey>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8081</port>
- <maxIdleTime>3600000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
- <target name="fortress-load"
- unless="noload"
- description="Loads fortress web rbac policy into ldap">
- <echo message="############### Run Fortress Ant script to load demo policy ###############"/>
- <java
- classname="org.apache.tools.ant.launch.Launcher"
- fork="true"
- failonerror="true"
- dir="${basedir}"
- timeout="4000000"
- taskname="startAnt">
- <classpath>
- <pathelement location="./src/main/resources"/>
- <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
- <pathelement location="${org.apache.ant:ant:jar}"/>
- <pathelement location="${org.apache.directory:fortress-core:jar}"/>
- <pathelement location="${org.openldap:accelerator-api:jar}"/>
- <pathelement location="${org.openldap:accelerator-impl:jar}"/>
- <pathelement location="${log4j:log4j:jar}"/>
- <pathelement location="${org.apache.directory.api:api-all:jar}"/>
- <pathelement location="${org.apache.mina:mina-core:jar}"/>
- <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
- <pathelement location="${org.jasypt:jasypt:jar}"/>
- <pathelement location="${commons-configuration:commons-configuration:jar}"/>
- <pathelement location="${commons-lang:commons-lang:jar}"/>
- <pathelement location="${commons-collections:commons-collections:jar}"/>
- <pathelement location="${commons-logging:commons-logging:jar}"/>
- <pathelement location="${commons-io:commons-io:jar}"/>
- <pathelement location="${commons-pool:commons-pool:jar}"/>
- <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
- <pathelement location="${antlr:antlr:jar}"/>
- </classpath>
- <sysproperty key="version" value="${project.version}"/>
- <sysproperty key="tenant" value="HOME"/>
- <arg value="-buildfile"/>
- <arg file="./src/main/resources/FortressWebDemoUsers.xml"/>
- </java>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <!-- Assemble a commander distro archive -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>user_distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/distsrc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Deploy the finished war -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <warFile>target/${project.artifactId}.war</warFile>
+ <server>local-tomcat</server>
+ <url>http://localhost:8080/manager/text</url>
+ <!-- TODO: CHANGE ME ON NEXT RELEASE TO USE 'TEXT' on URL: <url>http://localhost:8080/manager/text</url>-->
+ <path>/${project.artifactId}</path>
+ <!-- Warning the tomcat manager creds here are for deploying into a demo environment only. -->
+ <username>tcmanager</username>
+ <password>m@nager123</password>
+ </configuration>
+ </plugin>
+
+ <!-- Compile the commander source -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+
+ <!-- War the commander app -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <!-- this is needed to pickup the context.xml in META-INF: -->
+ <configuration>
+ <warName>${project.artifactId}</warName>
+ <archive>
+ <manifest>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.basedir}/src/main/resources
+ </directory>
+
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <!-- Javadoc archive -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <stylesheet>java</stylesheet>
+ <bottom><small>Copyright &copy; 2011-2014 Joshua Tree Software, LLC. All Rights Reserved.
+ Generated ${maven.build.timestamp}.</small></bottom>
+ <overview>src/main/java/org/apache/directory/fortress/web/overview.html</overview>
+ <version>true</version>
+ <author>true</author>
+ <doctitle>${title}</doctitle>
+ <windowtitle>${title}</windowtitle>
+ </configuration>
+ </plugin>
+
+ <!-- Source archive -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Integration Test -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- this works for embedded testing with Jetty -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
+ <configuration>
+ <scanIntervalSeconds>1</scanIntervalSeconds>
+ <stopPort>9999</stopPort>
+ <stopKey>foo</stopKey>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8081</port>
+ <maxIdleTime>3600000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <target name="fortress-load"
+ unless="noload"
+ description="Loads fortress web rbac policy into ldap">
+ <echo message="############### Run Fortress Ant script to load demo policy ###############"/>
+ <java
+ classname="org.apache.tools.ant.launch.Launcher"
+ fork="true"
+ failonerror="true"
+ dir="${basedir}"
+ timeout="4000000"
+ taskname="startAnt">
+ <classpath>
+ <pathelement location="./src/main/resources"/>
+ <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
+ <pathelement location="${org.apache.ant:ant:jar}"/>
+ <pathelement location="${org.apache.directory:fortress-core:jar}"/>
+ <pathelement location="${org.openldap:accelerator-api:jar}"/>
+ <pathelement location="${org.openldap:accelerator-impl:jar}"/>
+ <pathelement location="${log4j:log4j:jar}"/>
+ <pathelement location="${org.apache.directory.api:api-all:jar}"/>
+ <pathelement location="${org.apache.mina:mina-core:jar}"/>
+ <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
+ <pathelement location="${org.jasypt:jasypt:jar}"/>
+ <pathelement location="${commons-configuration:commons-configuration:jar}"/>
+ <pathelement location="${commons-lang:commons-lang:jar}"/>
+ <pathelement location="${commons-collections:commons-collections:jar}"/>
+ <pathelement location="${commons-logging:commons-logging:jar}"/>
+ <pathelement location="${commons-io:commons-io:jar}"/>
+ <pathelement location="${commons-pool:commons-pool:jar}"/>
+ <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
+ <pathelement location="${antlr:antlr:jar}"/>
+ </classpath>
+ <sysproperty key="version" value="${project.version}"/>
+ <sysproperty key="tenant" value="HOME"/>
+ <arg value="-buildfile"/>
+ <arg file="./src/main/resources/FortressWebDemoUsers.xml"/>
+ </java>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <repositories>
- <repository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>maven2</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
index 41a7744..792a45e 100644
--- a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -31,6 +32,7 @@ import org.apache.directory.fortress.core.rbac.Session;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* Base class for Commander Web. This class initializes Fortress RBAC context and so contains a synchronized block.
*
@@ -39,6 +41,8 @@ import java.security.Principal;
*/
public abstract class FortressWebBasePage extends WebPage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AccessMgr accessMgr;
@SpringBean
@@ -46,6 +50,7 @@ public abstract class FortressWebBasePage extends WebPage
private static final String CLS_NM = FortressWebBasePage.class.getName();
private static final Logger LOG = Logger.getLogger( CLS_NM );
+
public FortressWebBasePage()
{
SecureBookmarkablePageLink usersLink = new SecureBookmarkablePageLink( GlobalIds.USERS_PAGE, UserPage.class,
@@ -121,6 +126,10 @@ public abstract class FortressWebBasePage extends WebPage
final Link actionLink = new Link( "logout" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClick()
{
@@ -137,18 +146,18 @@ public abstract class FortressWebBasePage extends WebPage
Principal principal = servletReq.getUserPrincipal();
// Is this a Java EE secured page && has the User successfully authenticated already?
boolean isSecured = principal != null;
- if( isSecured && !isLoggedIn( ) )
+ if ( isSecured && !isLoggedIn() )
{
String szPrincipal = principal.toString();
// Pull the RBAC session from the realm and assert into the Web app's session:
- Session realmSession = GlobalUtils.deserialize(szPrincipal, Session.class);
+ Session realmSession = GlobalUtils.deserialize( szPrincipal, Session.class );
// If this is null, app in container that cannot share rbac session with app, Must now create session manually:
- if(realmSession == null)
+ if ( realmSession == null )
{
realmSession = GlobalUtils.createRbacSession( accessMgr, principal.getName() );
}
- if(realmSession != null)
+ if ( realmSession != null )
{
synchronized ( ( RbacSession ) RbacSession.get() )
{
@@ -163,7 +172,8 @@ public abstract class FortressWebBasePage extends WebPage
}
}
- private boolean isLoggedIn( )
+
+ private boolean isLoggedIn()
{
boolean isLoggedIn = false;
if ( GlobalUtils.getRbacSession( this ) != null )
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/GroupPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/GroupPage.java b/src/main/java/org/apache/directory/fortress/web/GroupPage.java
index 835d7cd..247e14f 100644
--- a/src/main/java/org/apache/directory/fortress/web/GroupPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/GroupPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,46 +31,55 @@ import org.apache.directory.fortress.web.panel.GroupListPanel;
import org.apache.directory.fortress.web.panel.InfoPanel;
import org.apache.directory.fortress.web.panel.NavPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class GroupPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String label = "LDAP Group Page";
- public GroupPage(PageParameters parameters)
+
+
+ public GroupPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.GROUPLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.GROUPLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new GroupListPanel( id );
- }
- });
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
GroupDetailPanel groupDetail = new GroupDetailPanel( GlobalIds.GROUPDETAILPANEL, display );
- container.add(groupDetail);
+ container.add( groupDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 44dc874..bbd50d6 100644
--- a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
@@ -25,20 +25,25 @@ import org.apache.wicket.markup.html.basic.Label;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class LaunchPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public LaunchPage()
{
- HttpServletRequest servletReq = (HttpServletRequest)getRequest().getContainerRequest();
+ HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
Principal principal = servletReq.getUserPrincipal();
- if(principal == null)
+ if ( principal == null )
{
- setResponsePage(LoginPage.class);
+ setResponsePage( LoginPage.class );
}
- add(new Label("label1", "Click on a link above for RBAC administration."));
+ add( new Label( "label1", "Click on a link above for RBAC administration." ) );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/LoginPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/LoginPage.java b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
index d5c98a3..474d0de 100644
--- a/src/main/java/org/apache/directory/fortress/web/LoginPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
@@ -32,14 +33,18 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public final class LoginPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger( LoginPage.class.getName() );
+
public LoginPage()
{
LoginPageForm loginForm = new LoginPageForm( "loginFields" );
@@ -48,9 +53,12 @@ public final class LoginPage extends FortressWebBasePage
public class LoginPageForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String pswdField;
private String userId;
+
public LoginPageForm( String id )
{
super( id );
@@ -69,6 +77,7 @@ public final class LoginPage extends FortressWebBasePage
add( pw );
}
+
@Override
protected void onSubmit()
{
@@ -88,7 +97,7 @@ public final class LoginPage extends FortressWebBasePage
{
String error = "Login form caught ServletException=" + se;
LOG.error( error );
- getRequestCycle().replaceAllRequestHandlers(new RedirectRequestHandler("/login/error.html"));
+ getRequestCycle().replaceAllRequestHandlers( new RedirectRequestHandler( "/login/error.html" ) );
}
}
else
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java b/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
index a8e6bac..bc9c9d8 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,47 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.ObjectDetailPanel;
import org.apache.directory.fortress.web.panel.ObjectListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class ObjectAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Administrative Permission Object Page";
- public ObjectAdminPage(PageParameters parameters)
+
+
+ public ObjectAdminPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel( GlobalIds.OBJECTLISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OBJECTLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new ObjectListPanel( id, isAdmin );
- }
- });
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
ObjectDetailPanel objectDetail = new ObjectDetailPanel( GlobalIds.OBJECTDETAILPANEL, display, isAdmin );
- container.add(objectDetail);
+ container.add( objectDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 63c3dde..8f124a5 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,47 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.ObjectDetailPanel;
import org.apache.directory.fortress.web.panel.ObjectListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class ObjectPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
private String label = "RBAC Permission Object Page";
- public ObjectPage(PageParameters parameters)
+
+
+ public ObjectPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.OBJECTLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OBJECTLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new ObjectListPanel( id, isAdmin );
- }
- });
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
ObjectDetailPanel objectDetail = new ObjectDetailPanel( GlobalIds.OBJECTDETAILPANEL, display, isAdmin );
- container.add(objectDetail);
+ container.add( objectDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
index b825b3b..b38b0eb 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,46 +31,55 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.OUDetailPanel;
import org.apache.directory.fortress.web.panel.OUListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class OuPermPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isUser = false;
private String label = "Permission Organizational Unit Administration";
- public OuPermPage(PageParameters parameters)
+
+
+ public OuPermPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel( GlobalIds.OULISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new OUListPanel(id, isUser);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OULISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new OUListPanel( id, isUser );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
- OUDetailPanel ouDetail = new OUDetailPanel(GlobalIds.OUDETAILPANEL, display, isUser);
- container.add(ouDetail);
- container.add(navPanel);
- this.add(container);
+ OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser );
+ container.add( ouDetail );
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
index 070de62..e374ad1 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,46 +31,55 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.OUDetailPanel;
import org.apache.directory.fortress.web.panel.OUListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class OuUserPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isUser = true;
private String label = "User Organizational Unit Administration";
+
+
public OuUserPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.OULISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new OUListPanel(id, isUser);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OULISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new OUListPanel( id, isUser );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
- OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser);
- container.add(ouDetail);
- container.add(navPanel);
- this.add(container);
+ OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser );
+ container.add( ouDetail );
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
index 7adf213..379ad3e 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,48 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.PermDetailPanel;
import org.apache.directory.fortress.web.panel.PermListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class PermAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Administrative Permission Operation Page";
- public PermAdminPage(PageParameters parameters)
+
+ public PermAdminPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel( GlobalIds.PERMLISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PermListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.PERMLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PermListPanel( id, isAdmin );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
PermDetailPanel permDetail = new PermDetailPanel( GlobalIds.PERMDETAILPANEL, display, isAdmin );
- container.add(permDetail);
+ container.add( permDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 c2e8bce..1a5dcf1 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,48 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.PermDetailPanel;
import org.apache.directory.fortress.web.panel.PermListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class PermPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
private String label = "RBAC Permission Operation Page";
- public PermPage(PageParameters parameters)
+
+ public PermPage( PageParameters parameters )
{
- add(new Label( GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.PERMLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PermListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.PERMLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PermListPanel( id, isAdmin );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
PermDetailPanel permDetail = new PermDetailPanel( GlobalIds.PERMDETAILPANEL, display, isAdmin );
- container.add(permDetail);
+ container.add( permDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
index fe5f243..abc6eeb 100644
--- a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -29,6 +30,7 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.PwPolicyDetailPanel;
import org.apache.directory.fortress.web.panel.PwPolicyListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -36,39 +38,47 @@ import org.apache.directory.fortress.web.panel.PwPolicyListPanel;
*/
public class PwPolicyPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public PwPolicyPage()
{
- add(new Label(GlobalIds.PAGE_HEADER, "Password Policy Administration"));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
- FourWaySplitter splitter = new FourWaySplitter("72", "28");
- splitter.addBorderLayout(container);
+ add( new Label( GlobalIds.PAGE_HEADER, "Password Policy Administration" ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
+ FourWaySplitter splitter = new FourWaySplitter( "72", "28" );
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail.
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel("policylistpanel")
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PwPolicyListPanel(id);
- }
- });
+ container.add( new AjaxLazyLoadPanel( "policylistpanel" )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PwPolicyListPanel( id );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
- PwPolicyDetailPanel policyDetail = new PwPolicyDetailPanel("policydetailpanel", display);
- container.add(policyDetail);
+ PwPolicyDetailPanel policyDetail = new PwPolicyDetailPanel( "policydetailpanel", display );
+ container.add( policyDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/RbacSession.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RbacSession.java b/src/main/java/org/apache/directory/fortress/web/RbacSession.java
index c3db301..ff213bb 100644
--- a/src/main/java/org/apache/directory/fortress/web/RbacSession.java
+++ b/src/main/java/org/apache/directory/fortress/web/RbacSession.java
@@ -36,9 +36,12 @@ import java.util.List;
*/
public class RbacSession extends WebSession
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Session session;
private List<Permission> permissions;
+
/**
* Constructor. Note that {@link org.apache.wicket.request.cycle.RequestCycle} is not available until this
* constructor returns.
@@ -50,21 +53,25 @@ public class RbacSession extends WebSession
super( request );
}
+
public Session getRbacSession()
{
return session;
}
+
public void setSession( Session session )
{
this.session = session;
}
+
public List<Permission> getPermissions()
{
return permissions;
}
+
public void setPermissions( List<Permission> permissions )
{
this.permissions = permissions;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
index e957a63..5de569b 100644
--- a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -31,24 +32,28 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.RoleDetailPanel;
import org.apache.directory.fortress.web.panel.RoleListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class RoleAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Admin Role Administration";
private static final Logger LOG = Logger.getLogger( RoleAdminPage.class.getName() );
+
/**
* @author Shawn McKinney
* @version $Rev$
* @param parameters
*/
- public RoleAdminPage(PageParameters parameters)
+ public RoleAdminPage( PageParameters parameters )
{
- String type = GlobalUtils.getPageType(parameters);
+ String type = GlobalUtils.getPageType( parameters );
add( new Label( GlobalIds.PAGE_HEADER, label ) );
WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
@@ -61,14 +66,18 @@ public class RoleAdminPage extends FortressWebBasePage
NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel( GlobalIds.ROLELISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new RoleListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.ROLELISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new RoleListPanel( id, isAdmin );
+ }
+ } );
// 3. Info Panel:
InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );