You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/03/28 11:35:44 UTC

[20/20] git commit: ISIS-381: mothballing HTML viewer, SQL security, LDAP security

ISIS-381: mothballing HTML viewer, SQL security, LDAP security


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/91a8000b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/91a8000b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/91a8000b

Branch: refs/heads/master
Commit: 91a8000ba06e3622f75a86a94293e827f05179d4
Parents: 39500cd
Author: Dan Haywood <da...@apache.org>
Authored: Thu Mar 28 10:34:42 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Mar 28 10:34:42 2013 +0000

----------------------------------------------------------------------
 component/security/ldap/NOTICE                     |    7 -
 component/security/ldap/ldap-conf/example.ldif     |   46 -
 component/security/ldap/ldap-conf/readme.txt       |   12 -
 component/security/ldap/ldap-conf/slapd.conf       |   80 --
 component/security/ldap/pom.xml                    |  119 --
 .../appended-resources/supplemental-models.xml     |  106 --
 .../LdapAuthenticationConstants.java               |   39 -
 .../LdapAuthenticationManagerInstaller.java        |   42 -
 .../ldap/authentication/LdapAuthenticator.java     |  116 --
 .../authorization/LdapAuthorizationConstants.java  |   44 -
 .../LdapAuthorizationManagerInstaller.java         |   39 -
 .../ldap/authorization/LdapAuthorizor.java         |  274 -----
 component/security/ldap/src/site/apt/index.apt     |   44 -
 component/security/ldap/src/site/apt/jottings.apt  |   24 -
 component/security/ldap/src/site/site.xml          |   41 -
 .../authentication/LdapAuthenticatorTester.java    |   53 -
 component/security/sql/NOTICE                      |    7 -
 .../sql/hsql-db/authenticator-tests.script         |   51 -
 component/security/sql/pom.xml                     |  125 --
 .../appended-resources/supplemental-models.xml     |  106 --
 .../authentication/SqlAuthenticationConstants.java |   27 -
 .../SqlAuthenticationManagerInstaller.java         |   70 --
 .../sql/authentication/SqlAuthenticator.java       |  325 -----
 .../SqlAuthorizationManagerInstaller.java          |   39 -
 .../security/sql/authorization/SqlAuthorizor.java  |   73 --
 component/security/sql/src/site.xml                |   41 -
 component/security/sql/src/site/apt/index.apt      |  124 --
 component/security/sql/src/site/apt/jottings.apt   |   24 -
 component/security/sql/src/site/site.xml           |   41 -
 .../sql/authentication/SqlAuthenticatorTest.java   |  114 --
 component/viewer/html/NOTICE                       |    7 -
 component/viewer/html/impl/pom.xml                 |  110 --
 .../impl/src/docbkx/guide/isis-html-viewer.xml     |  226 ----
 .../isis/viewer/html/HtmlViewerConstants.java      |   46 -
 .../isis/viewer/html/HtmlViewerInstaller.java      |   92 --
 .../org/apache/isis/viewer/html/PathBuilder.java   |   30 -
 .../isis/viewer/html/PathBuilderDefault.java       |   60 -
 .../org/apache/isis/viewer/html/action/Action.java |   32 -
 .../isis/viewer/html/action/ActionException.java   |   43 -
 .../isis/viewer/html/action/ChangeContext.java     |   39 -
 .../org/apache/isis/viewer/html/action/LogOut.java |   47 -
 .../apache/isis/viewer/html/action/Welcome.java    |   52 -
 .../html/action/edit/AddItemToCollection.java      |   56 -
 .../isis/viewer/html/action/edit/EditObject.java   |   52 -
 .../html/action/edit/RemoveItemFromCollection.java |   53 -
 .../apache/isis/viewer/html/action/edit/Save.java  |   65 -
 .../apache/isis/viewer/html/action/misc/About.java |   50 -
 .../isis/viewer/html/action/misc/SetUser.java      |   47 -
 .../isis/viewer/html/action/misc/SwapUser.java     |   80 --
 .../viewer/html/action/view/CollectionView.java    |   80 --
 .../html/action/view/FieldCollectionView.java      |   60 -
 .../isis/viewer/html/action/view/ObjectView.java   |  129 --
 .../html/action/view/ObjectViewAbstract.java       |   89 --
 .../isis/viewer/html/action/view/ServiceView.java  |   38 -
 .../viewer/html/action/view/util/MenuUtil.java     |  110 --
 .../viewer/html/action/view/util/TableUtil.java    |  133 --
 .../apache/isis/viewer/html/component/Block.java   |   26 -
 .../isis/viewer/html/component/Component.java      |   27 -
 .../viewer/html/component/ComponentAbstract.java   |   64 -
 .../viewer/html/component/ComponentComposite.java  |   66 -
 .../viewer/html/component/ComponentFactory.java    |   82 --
 .../isis/viewer/html/component/DebugPane.java      |   32 -
 .../apache/isis/viewer/html/component/Form.java    |   44 -
 .../apache/isis/viewer/html/component/Page.java    |   40 -
 .../apache/isis/viewer/html/component/Table.java   |   36 -
 .../isis/viewer/html/component/ViewPane.java       |   35 -
 .../html/component/html/AbstractHtmlPage.java      |  129 --
 .../html/component/html/ActionComponent.java       |   74 --
 .../viewer/html/component/html/BreadCrumbs.java    |   66 -
 .../isis/viewer/html/component/html/Checkbox.java  |   50 -
 .../viewer/html/component/html/CollectionIcon.java |   80 --
 .../viewer/html/component/html/CollectionLink.java |   77 --
 .../isis/viewer/html/component/html/Div.java       |   86 --
 .../html/component/html/DynamicHtmlPage.java       |   81 --
 .../viewer/html/component/html/ErrorMessage.java   |   48 -
 .../isis/viewer/html/component/html/Heading.java   |   50 -
 .../isis/viewer/html/component/html/Html.java      |   40 -
 .../html/component/html/HtmlComponentFactory.java  |  309 -----
 .../isis/viewer/html/component/html/HtmlDebug.java |   69 --
 .../viewer/html/component/html/HtmlException.java  |   42 -
 .../isis/viewer/html/component/html/HtmlForm.java  |  183 ---
 .../isis/viewer/html/component/html/HtmlTable.java |  115 --
 .../isis/viewer/html/component/html/Link.java      |   50 -
 .../viewer/html/component/html/LogonFormPage.java  |   91 --
 .../isis/viewer/html/component/html/MenuItem.java  |  101 --
 .../viewer/html/component/html/ObjectIcon.java     |   78 --
 .../html/component/html/RegisterFormPage.java      |   87 --
 .../isis/viewer/html/component/html/Row.java       |   60 -
 .../html/component/html/ServiceComponent.java      |   62 -
 .../isis/viewer/html/component/html/Span.java      |   55 -
 .../isis/viewer/html/component/html/Submenu.java   |   46 -
 .../viewer/html/component/html/TableHeader.java    |   44 -
 .../isis/viewer/html/component/html/TextBlock.java |   56 -
 .../viewer/html/component/html/UserSwapLink.java   |   52 -
 .../isis/viewer/html/component/html/ViewDiv.java   |  145 ---
 .../html/component/html/WebViewerException.java    |   43 -
 .../viewer/html/context/CollectionMapping.java     |  154 ---
 .../apache/isis/viewer/html/context/Context.java   |  654 ----------
 .../isis/viewer/html/context/HistoryEntry.java     |   49 -
 .../isis/viewer/html/context/ObjectHistory.java    |  109 --
 .../viewer/html/context/ObjectLookupException.java |   42 -
 .../html/context/PersistentRootAdapterMapping.java |  119 --
 .../viewer/html/context/RootAdapterMapping.java    |   41 -
 .../html/context/RootAdapterMappingAbstract.java   |  114 --
 .../html/context/TransientRootAdapterMapping.java  |   95 --
 .../isis/viewer/html/crumb/CollectionCrumb.java    |   58 -
 .../org/apache/isis/viewer/html/crumb/Crumb.java   |   33 -
 .../apache/isis/viewer/html/crumb/ObjectCrumb.java |   66 -
 .../isis/viewer/html/crumb/ObjectFieldCrumb.java   |   54 -
 .../apache/isis/viewer/html/crumb/TaskCrumb.java   |   62 -
 .../apache/isis/viewer/html/image/ImageLookup.java |   66 -
 .../isis/viewer/html/image/ImageProvider.java      |   47 -
 .../viewer/html/image/ImageProviderAbstract.java   |  123 --
 .../html/image/ImageProviderDirectoryBased.java    |  160 ---
 .../image/ImageProviderDirectoryBasedReworked.java |   60 -
 .../html/image/ImageProviderResourceBased.java     |   72 --
 .../isis/viewer/html/request/ForwardRequest.java   |  138 ---
 .../apache/isis/viewer/html/request/Request.java   |   72 --
 .../isis/viewer/html/request/ServletRequest.java   |   98 --
 .../html/servlet/AbstractHtmlViewerServlet.java    |   82 --
 .../viewer/html/servlet/ControllerServlet.java     |  154 ---
 .../viewer/html/servlet/HtmlServletConstants.java  |   48 -
 .../isis/viewer/html/servlet/LogonServlet.java     |  124 --
 .../isis/viewer/html/servlet/RegisterServlet.java  |   98 --
 .../html/servlet/internal/WebController.java       |  460 -------
 .../viewer/html/task/AddItemToCollectionTask.java  |   95 --
 .../org/apache/isis/viewer/html/task/EditTask.java |  231 ----
 .../apache/isis/viewer/html/task/InvokeMethod.java |  129 --
 .../apache/isis/viewer/html/task/MethodTask.java   |  135 ---
 .../org/apache/isis/viewer/html/task/Task.java     |  394 ------
 .../isis/viewer/html/task/TaskLookupException.java |   42 -
 .../org/apache/isis/viewer/html/task/TaskStep.java |  238 ----
 .../src/main/resources/default-images/arrow.gif    |  Bin 160 -> 0 bytes
 .../main/resources/default-images/bg-button.gif    |  Bin 106 -> 0 bytes
 .../src/main/resources/default-images/branch.gif   |  Bin 74 -> 0 bytes
 .../resources/default-images/breadcrumbs-bg.gif    |  Bin 183 -> 0 bytes
 .../main/resources/default-images/button-bg1.gif   |  Bin 305 -> 0 bytes
 .../main/resources/default-images/button-bg2.gif   |  Bin 305 -> 0 bytes
 .../src/main/resources/default-images/help.gif     |  Bin 741 -> 0 bytes
 .../src/main/resources/default-images/logo-bg.gif  |  Bin 79 -> 0 bytes
 .../src/main/resources/default-images/logo-bg2.gif |  Bin 391 -> 0 bytes
 .../src/main/resources/default-images/menu-bg.gif  |  Bin 453 -> 0 bytes
 .../src/main/resources/default-images/menu-bg2.gif |  Bin 69 -> 0 bytes
 .../resources/default-images/object-header-bg.gif  |  Bin 362 -> 0 bytes
 .../resources/default-images/page-header-bg.jpg    |  Bin 413 -> 0 bytes
 .../resources/default-images/page-header-bg1.gif   |  Bin 165 -> 0 bytes
 .../resources/default-images/page-header-bg2.jpg   |  Bin 436 -> 0 bytes
 .../resources/default-images/poweredby-logo.png    |  Bin 8461 -> 0 bytes
 .../resources/default-images/shadow-bottom.gif     |  Bin 111 -> 0 bytes
 .../main/resources/default-images/sign-info.png    |  Bin 418 -> 0 bytes
 .../main/resources/default-images/sign-warning.png |  Bin 531 -> 0 bytes
 .../resources/default-images/site-header-bg.jpg    |  Bin 9975 -> 0 bytes
 .../resources/default-images/submenu-bullet.gif    |  Bin 51 -> 0 bytes
 .../main/resources/default-images/tab-bar-bg.gif   |  Bin 221 -> 0 bytes
 .../main/resources/default-images/tab-off-bg.gif   |  Bin 1150 -> 0 bytes
 .../main/resources/default-images/tab-on-bg.gif    |  Bin 1119 -> 0 bytes
 .../html/impl/src/main/resources/default.css       |  939 ---------------
 .../html/impl/src/main/resources/htmlviewer.js     |   22 -
 .../impl/src/main/resources/images/Default.png     |  Bin 3016 -> 0 bytes
 .../html/impl/src/main/resources/images/banner.png |  Bin 30394 -> 0 bytes
 .../impl/src/main/src-archived/MonitorServlet.java |  101 --
 .../impl/src/main/src-archived/SessionAccess.java  |  183 ---
 .../impl/src/main/src-archived/SessionList.java    |   53 -
 component/viewer/html/impl/src/site/apt/index.apt  |   47 -
 .../viewer/html/impl/src/site/apt/jottings.apt     |   71 --
 component/viewer/html/impl/src/site/site.xml       |   50 -
 .../viewer/html/context/ContextTest_mapAction.java |   98 --
 .../html/context/ContextTest_mapCollection.java    |  159 ---
 .../viewer/html/context/ContextTest_mapObject.java |  266 ----
 .../html/context/ContextTest_serialization.java    |   97 --
 .../isis/viewer/html/context/ObjectActionNoop.java |  312 -----
 .../request/ImageProviderResourceBasedTest.java    |   65 -
 .../impl/src/test/resources/images/Customer.gif    |  Bin 1475 -> 0 bytes
 .../impl/src/test/resources/images/Service.png     |  Bin 2129 -> 0 bytes
 component/viewer/html/monitoring/pom.xml           |   51 -
 .../viewer/html/monitoring/MonitorServlet.java     |   87 --
 .../html/monitoring/WebServerMonitorInstaller.java |   45 -
 .../servermonitor/AbstractServerMonitor.java       |   99 --
 .../servermonitor/HttpServerMonitor.java           |  104 --
 .../html/monitoring/servermonitor/Monitor.java     |   56 -
 .../monitoring/servermonitor/MonitorEvent.java     |   70 --
 .../monitoring/servermonitor/MonitorListener.java  |   24 -
 .../servermonitor/MonitorListenerImpl.java         |  150 ---
 .../servermonitor/SocketServerMonitor.java         |   71 --
 .../html/monitoring/systemconsole/AWTConsole.java  |  201 ---
 .../html/monitoring/systemconsole/FileConsole.java |   57 -
 .../monitoring/systemconsole/QuitListener.java     |   32 -
 .../html/monitoring/systemconsole/Server.java      |   26 -
 .../monitoring/systemconsole/ServerConsole.java    |   31 -
 .../monitoring/systemconsole/ServerResponse.java   |   26 -
 .../monitoring/systemconsole/TerminalConsole.java  |  126 --
 .../viewer/html/monitoring/src/site/apt/index.apt  |   31 -
 .../html/monitoring/src/site/apt/jottings.apt      |   43 -
 component/viewer/html/monitoring/src/site/site.xml |   45 -
 component/viewer/html/pom.xml                      |  111 --
 .../appended-resources/supplemental-models.xml     |  106 --
 .../tck/ide/eclipse/launch/viewer-html-tck.launch  |   19 -
 component/viewer/html/tck/pom.xml                  |  140 ---
 .../html/tck/src/main/resources/images/Default.png |  Bin 3016 -> 0 bytes
 .../tck/src/main/webapp/WEB-INF/isis.properties    |   57 -
 .../tck/src/main/webapp/WEB-INF/logging.properties |   30 -
 .../src/main/webapp/WEB-INF/security_file.allow    |   16 -
 .../main/webapp/WEB-INF/security_file.passwords    |   20 -
 .../src/main/webapp/WEB-INF/viewer_html.properties |   19 -
 .../html/tck/src/main/webapp/WEB-INF/web.xml       |  130 --
 .../viewer/html/tck/src/main/webapp/default.css    |  933 --------------
 .../html/tck/src/main/webapp/images/banner-bg.png  |  Bin 936 -> 0 bytes
 .../html/tck/src/main/webapp/images/banner.png     |  Bin 30394 -> 0 bytes
 .../quickstart_html_sql/dom/log4j.properties       |   24 -
 .../application/quickstart_html_sql/dom/pom.xml    |   39 -
 .../dom/src/main/java/dom/todo/ToDoItem.java       |  225 ----
 .../dom/src/main/java/dom/todo/ToDoItems.java      |  139 ---
 .../dom/src/main/resources/images/AuditEntry.png   |  Bin 2215 -> 0 bytes
 .../dom/src/main/resources/images/ToDoItem.gif     |  Bin 1592 -> 0 bytes
 .../quickstart_html_sql/fixture/pom.xml            |   40 -
 .../src/main/java/fixture/LogonAsSvenFixture.java  |   30 -
 .../main/java/fixture/todo/ToDoItemsFixture.java   |   74 --
 .../fixture/todo/ToDoItemsFixturesService.java     |   46 -
 example/application/quickstart_html_sql/pom.xml    |  261 ----
 .../viewer-html/hsql-db/tests.lck                  |  Bin 16 -> 0 bytes
 .../viewer-html/hsql-db/tests.log                  |    2 -
 .../viewer-html/hsql-db/tests.properties           |    4 -
 .../viewer-html/hsql-db/tests.script               |   46 -
 .../eclipse/launch/quickstart-viewer-html.launch   |   20 -
 .../quickstart_html_sql/viewer-html/lib/.gitignore |    5 -
 .../quickstart_html_sql/viewer-html/pom.xml        |  186 ---
 .../src/main/jettyconsole/isis-banner.pdn          |  Bin 64679 -> 0 bytes
 .../src/main/jettyconsole/isis-banner.png          |  Bin 24486 -> 0 bytes
 .../src/main/resources/images/Default.png          |  Bin 3016 -> 0 bytes
 .../webapp/WEB-INF/authentication_file.passwords   |   28 -
 .../webapp/WEB-INF/authentication_file.properties  |   25 -
 .../main/webapp/WEB-INF/authorization_file.allow   |   28 -
 .../webapp/WEB-INF/authorization_file.properties   |   47 -
 .../src/main/webapp/WEB-INF/isis.properties        |  180 ---
 .../src/main/webapp/WEB-INF/logging.properties     |   89 --
 .../main/webapp/WEB-INF/persistor_sql.properties   |   72 --
 .../src/main/webapp/WEB-INF/viewer_html.properties |   31 -
 .../viewer-html/src/main/webapp/WEB-INF/web.xml    |  233 ----
 .../main/webapp/htmlviewer/images/banner-bg.png    |  Bin 936 -> 0 bytes
 .../src/main/webapp/htmlviewer/images/banner.png   |  Bin 30394 -> 0 bytes
 .../src/main/webapp/htmlviewer/style/default.css   |  928 --------------
 mothballed/README.md                               |   11 +
 mothballed/component/security/ldap/NOTICE          |    7 +
 .../component/security/ldap/ldap-conf/example.ldif |   46 +
 .../component/security/ldap/ldap-conf/readme.txt   |   12 +
 .../component/security/ldap/ldap-conf/slapd.conf   |   80 ++
 mothballed/component/security/ldap/pom.xml         |  119 ++
 .../appended-resources/supplemental-models.xml     |  106 ++
 .../LdapAuthenticationConstants.java               |   39 +
 .../LdapAuthenticationManagerInstaller.java        |   42 +
 .../ldap/authentication/LdapAuthenticator.java     |  116 ++
 .../authorization/LdapAuthorizationConstants.java  |   44 +
 .../LdapAuthorizationManagerInstaller.java         |   39 +
 .../ldap/authorization/LdapAuthorizor.java         |  274 +++++
 .../component/security/ldap/src/site/apt/index.apt |   44 +
 .../security/ldap/src/site/apt/jottings.apt        |   24 +
 .../component/security/ldap/src/site/site.xml      |   41 +
 .../authentication/LdapAuthenticatorTester.java    |   53 +
 mothballed/component/security/sql/NOTICE           |    7 +
 .../sql/hsql-db/authenticator-tests.script         |   51 +
 mothballed/component/security/sql/pom.xml          |  125 ++
 .../appended-resources/supplemental-models.xml     |  106 ++
 .../authentication/SqlAuthenticationConstants.java |   27 +
 .../SqlAuthenticationManagerInstaller.java         |   70 ++
 .../sql/authentication/SqlAuthenticator.java       |  325 +++++
 .../SqlAuthorizationManagerInstaller.java          |   39 +
 .../security/sql/authorization/SqlAuthorizor.java  |   73 ++
 mothballed/component/security/sql/src/site.xml     |   41 +
 .../component/security/sql/src/site/apt/index.apt  |  124 ++
 .../security/sql/src/site/apt/jottings.apt         |   24 +
 .../component/security/sql/src/site/site.xml       |   41 +
 .../sql/authentication/SqlAuthenticatorTest.java   |  114 ++
 mothballed/component/viewer/html/NOTICE            |    7 +
 mothballed/component/viewer/html/impl/pom.xml      |  110 ++
 .../impl/src/docbkx/guide/isis-html-viewer.xml     |  226 ++++
 .../isis/viewer/html/HtmlViewerConstants.java      |   46 +
 .../isis/viewer/html/HtmlViewerInstaller.java      |   92 ++
 .../org/apache/isis/viewer/html/PathBuilder.java   |   30 +
 .../isis/viewer/html/PathBuilderDefault.java       |   60 +
 .../org/apache/isis/viewer/html/action/Action.java |   32 +
 .../isis/viewer/html/action/ActionException.java   |   43 +
 .../isis/viewer/html/action/ChangeContext.java     |   39 +
 .../org/apache/isis/viewer/html/action/LogOut.java |   47 +
 .../apache/isis/viewer/html/action/Welcome.java    |   52 +
 .../html/action/edit/AddItemToCollection.java      |   56 +
 .../isis/viewer/html/action/edit/EditObject.java   |   52 +
 .../html/action/edit/RemoveItemFromCollection.java |   53 +
 .../apache/isis/viewer/html/action/edit/Save.java  |   65 +
 .../apache/isis/viewer/html/action/misc/About.java |   50 +
 .../isis/viewer/html/action/misc/SetUser.java      |   47 +
 .../isis/viewer/html/action/misc/SwapUser.java     |   80 ++
 .../viewer/html/action/view/CollectionView.java    |   80 ++
 .../html/action/view/FieldCollectionView.java      |   60 +
 .../isis/viewer/html/action/view/ObjectView.java   |  129 ++
 .../html/action/view/ObjectViewAbstract.java       |   89 ++
 .../isis/viewer/html/action/view/ServiceView.java  |   38 +
 .../viewer/html/action/view/util/MenuUtil.java     |  110 ++
 .../viewer/html/action/view/util/TableUtil.java    |  133 ++
 .../apache/isis/viewer/html/component/Block.java   |   26 +
 .../isis/viewer/html/component/Component.java      |   27 +
 .../viewer/html/component/ComponentAbstract.java   |   64 +
 .../viewer/html/component/ComponentComposite.java  |   66 +
 .../viewer/html/component/ComponentFactory.java    |   82 ++
 .../isis/viewer/html/component/DebugPane.java      |   32 +
 .../apache/isis/viewer/html/component/Form.java    |   44 +
 .../apache/isis/viewer/html/component/Page.java    |   40 +
 .../apache/isis/viewer/html/component/Table.java   |   36 +
 .../isis/viewer/html/component/ViewPane.java       |   35 +
 .../html/component/html/AbstractHtmlPage.java      |  129 ++
 .../html/component/html/ActionComponent.java       |   74 ++
 .../viewer/html/component/html/BreadCrumbs.java    |   66 +
 .../isis/viewer/html/component/html/Checkbox.java  |   50 +
 .../viewer/html/component/html/CollectionIcon.java |   80 ++
 .../viewer/html/component/html/CollectionLink.java |   77 ++
 .../isis/viewer/html/component/html/Div.java       |   86 ++
 .../html/component/html/DynamicHtmlPage.java       |   81 ++
 .../viewer/html/component/html/ErrorMessage.java   |   48 +
 .../isis/viewer/html/component/html/Heading.java   |   50 +
 .../isis/viewer/html/component/html/Html.java      |   40 +
 .../html/component/html/HtmlComponentFactory.java  |  309 +++++
 .../isis/viewer/html/component/html/HtmlDebug.java |   69 ++
 .../viewer/html/component/html/HtmlException.java  |   42 +
 .../isis/viewer/html/component/html/HtmlForm.java  |  183 +++
 .../isis/viewer/html/component/html/HtmlTable.java |  115 ++
 .../isis/viewer/html/component/html/Link.java      |   50 +
 .../viewer/html/component/html/LogonFormPage.java  |   91 ++
 .../isis/viewer/html/component/html/MenuItem.java  |  101 ++
 .../viewer/html/component/html/ObjectIcon.java     |   78 ++
 .../html/component/html/RegisterFormPage.java      |   87 ++
 .../isis/viewer/html/component/html/Row.java       |   60 +
 .../html/component/html/ServiceComponent.java      |   62 +
 .../isis/viewer/html/component/html/Span.java      |   55 +
 .../isis/viewer/html/component/html/Submenu.java   |   46 +
 .../viewer/html/component/html/TableHeader.java    |   44 +
 .../isis/viewer/html/component/html/TextBlock.java |   56 +
 .../viewer/html/component/html/UserSwapLink.java   |   52 +
 .../isis/viewer/html/component/html/ViewDiv.java   |  145 +++
 .../html/component/html/WebViewerException.java    |   43 +
 .../viewer/html/context/CollectionMapping.java     |  154 +++
 .../apache/isis/viewer/html/context/Context.java   |  654 ++++++++++
 .../isis/viewer/html/context/HistoryEntry.java     |   49 +
 .../isis/viewer/html/context/ObjectHistory.java    |  109 ++
 .../viewer/html/context/ObjectLookupException.java |   42 +
 .../html/context/PersistentRootAdapterMapping.java |  119 ++
 .../viewer/html/context/RootAdapterMapping.java    |   41 +
 .../html/context/RootAdapterMappingAbstract.java   |  114 ++
 .../html/context/TransientRootAdapterMapping.java  |   95 ++
 .../isis/viewer/html/crumb/CollectionCrumb.java    |   58 +
 .../org/apache/isis/viewer/html/crumb/Crumb.java   |   33 +
 .../apache/isis/viewer/html/crumb/ObjectCrumb.java |   66 +
 .../isis/viewer/html/crumb/ObjectFieldCrumb.java   |   54 +
 .../apache/isis/viewer/html/crumb/TaskCrumb.java   |   62 +
 .../apache/isis/viewer/html/image/ImageLookup.java |   66 +
 .../isis/viewer/html/image/ImageProvider.java      |   47 +
 .../viewer/html/image/ImageProviderAbstract.java   |  123 ++
 .../html/image/ImageProviderDirectoryBased.java    |  160 +++
 .../image/ImageProviderDirectoryBasedReworked.java |   60 +
 .../html/image/ImageProviderResourceBased.java     |   72 ++
 .../isis/viewer/html/request/ForwardRequest.java   |  138 +++
 .../apache/isis/viewer/html/request/Request.java   |   72 ++
 .../isis/viewer/html/request/ServletRequest.java   |   98 ++
 .../html/servlet/AbstractHtmlViewerServlet.java    |   82 ++
 .../viewer/html/servlet/ControllerServlet.java     |  154 +++
 .../viewer/html/servlet/HtmlServletConstants.java  |   48 +
 .../isis/viewer/html/servlet/LogonServlet.java     |  124 ++
 .../isis/viewer/html/servlet/RegisterServlet.java  |   98 ++
 .../html/servlet/internal/WebController.java       |  460 +++++++
 .../viewer/html/task/AddItemToCollectionTask.java  |   95 ++
 .../org/apache/isis/viewer/html/task/EditTask.java |  231 ++++
 .../apache/isis/viewer/html/task/InvokeMethod.java |  129 ++
 .../apache/isis/viewer/html/task/MethodTask.java   |  135 +++
 .../org/apache/isis/viewer/html/task/Task.java     |  394 ++++++
 .../isis/viewer/html/task/TaskLookupException.java |   42 +
 .../org/apache/isis/viewer/html/task/TaskStep.java |  238 ++++
 .../src/main/resources/default-images/arrow.gif    |  Bin 0 -> 160 bytes
 .../main/resources/default-images/bg-button.gif    |  Bin 0 -> 106 bytes
 .../src/main/resources/default-images/branch.gif   |  Bin 0 -> 74 bytes
 .../resources/default-images/breadcrumbs-bg.gif    |  Bin 0 -> 183 bytes
 .../main/resources/default-images/button-bg1.gif   |  Bin 0 -> 305 bytes
 .../main/resources/default-images/button-bg2.gif   |  Bin 0 -> 305 bytes
 .../src/main/resources/default-images/help.gif     |  Bin 0 -> 741 bytes
 .../src/main/resources/default-images/logo-bg.gif  |  Bin 0 -> 79 bytes
 .../src/main/resources/default-images/logo-bg2.gif |  Bin 0 -> 391 bytes
 .../src/main/resources/default-images/menu-bg.gif  |  Bin 0 -> 453 bytes
 .../src/main/resources/default-images/menu-bg2.gif |  Bin 0 -> 69 bytes
 .../resources/default-images/object-header-bg.gif  |  Bin 0 -> 362 bytes
 .../resources/default-images/page-header-bg.jpg    |  Bin 0 -> 413 bytes
 .../resources/default-images/page-header-bg1.gif   |  Bin 0 -> 165 bytes
 .../resources/default-images/page-header-bg2.jpg   |  Bin 0 -> 436 bytes
 .../resources/default-images/poweredby-logo.png    |  Bin 0 -> 8461 bytes
 .../resources/default-images/shadow-bottom.gif     |  Bin 0 -> 111 bytes
 .../main/resources/default-images/sign-info.png    |  Bin 0 -> 418 bytes
 .../main/resources/default-images/sign-warning.png |  Bin 0 -> 531 bytes
 .../resources/default-images/site-header-bg.jpg    |  Bin 0 -> 9975 bytes
 .../resources/default-images/submenu-bullet.gif    |  Bin 0 -> 51 bytes
 .../main/resources/default-images/tab-bar-bg.gif   |  Bin 0 -> 221 bytes
 .../main/resources/default-images/tab-off-bg.gif   |  Bin 0 -> 1150 bytes
 .../main/resources/default-images/tab-on-bg.gif    |  Bin 0 -> 1119 bytes
 .../html/impl/src/main/resources/default.css       |  939 +++++++++++++++
 .../html/impl/src/main/resources/htmlviewer.js     |   22 +
 .../impl/src/main/resources/images/Default.png     |  Bin 0 -> 3016 bytes
 .../html/impl/src/main/resources/images/banner.png |  Bin 0 -> 30394 bytes
 .../impl/src/main/src-archived/MonitorServlet.java |  101 ++
 .../impl/src/main/src-archived/SessionAccess.java  |  183 +++
 .../impl/src/main/src-archived/SessionList.java    |   53 +
 .../viewer/html/impl/src/site/apt/index.apt        |   47 +
 .../viewer/html/impl/src/site/apt/jottings.apt     |   71 ++
 .../component/viewer/html/impl/src/site/site.xml   |   50 +
 .../viewer/html/context/ContextTest_mapAction.java |   98 ++
 .../html/context/ContextTest_mapCollection.java    |  159 +++
 .../viewer/html/context/ContextTest_mapObject.java |  266 ++++
 .../html/context/ContextTest_serialization.java    |   97 ++
 .../isis/viewer/html/context/ObjectActionNoop.java |  312 +++++
 .../request/ImageProviderResourceBasedTest.java    |   65 +
 .../impl/src/test/resources/images/Customer.gif    |  Bin 0 -> 1475 bytes
 .../impl/src/test/resources/images/Service.png     |  Bin 0 -> 2129 bytes
 .../component/viewer/html/monitoring/pom.xml       |   51 +
 .../viewer/html/monitoring/MonitorServlet.java     |   87 ++
 .../html/monitoring/WebServerMonitorInstaller.java |   45 +
 .../servermonitor/AbstractServerMonitor.java       |   99 ++
 .../servermonitor/HttpServerMonitor.java           |  104 ++
 .../html/monitoring/servermonitor/Monitor.java     |   56 +
 .../monitoring/servermonitor/MonitorEvent.java     |   70 ++
 .../monitoring/servermonitor/MonitorListener.java  |   24 +
 .../servermonitor/MonitorListenerImpl.java         |  150 +++
 .../servermonitor/SocketServerMonitor.java         |   71 ++
 .../html/monitoring/systemconsole/AWTConsole.java  |  201 +++
 .../html/monitoring/systemconsole/FileConsole.java |   57 +
 .../monitoring/systemconsole/QuitListener.java     |   32 +
 .../html/monitoring/systemconsole/Server.java      |   26 +
 .../monitoring/systemconsole/ServerConsole.java    |   31 +
 .../monitoring/systemconsole/ServerResponse.java   |   26 +
 .../monitoring/systemconsole/TerminalConsole.java  |  126 ++
 .../viewer/html/monitoring/src/site/apt/index.apt  |   31 +
 .../html/monitoring/src/site/apt/jottings.apt      |   43 +
 .../viewer/html/monitoring/src/site/site.xml       |   45 +
 mothballed/component/viewer/html/pom.xml           |  111 ++
 .../appended-resources/supplemental-models.xml     |  106 ++
 .../tck/ide/eclipse/launch/viewer-html-tck.launch  |   19 +
 mothballed/component/viewer/html/tck/pom.xml       |  140 +++
 .../html/tck/src/main/resources/images/Default.png |  Bin 0 -> 3016 bytes
 .../tck/src/main/webapp/WEB-INF/isis.properties    |   57 +
 .../tck/src/main/webapp/WEB-INF/logging.properties |   30 +
 .../src/main/webapp/WEB-INF/security_file.allow    |   16 +
 .../main/webapp/WEB-INF/security_file.passwords    |   20 +
 .../src/main/webapp/WEB-INF/viewer_html.properties |   19 +
 .../html/tck/src/main/webapp/WEB-INF/web.xml       |  130 ++
 .../viewer/html/tck/src/main/webapp/default.css    |  933 ++++++++++++++
 .../html/tck/src/main/webapp/images/banner-bg.png  |  Bin 0 -> 936 bytes
 .../html/tck/src/main/webapp/images/banner.png     |  Bin 0 -> 30394 bytes
 .../quickstart_html_sql/dom/log4j.properties       |   24 +
 .../application/quickstart_html_sql/dom/pom.xml    |   39 +
 .../dom/src/main/java/dom/todo/ToDoItem.java       |  225 ++++
 .../dom/src/main/java/dom/todo/ToDoItems.java      |  139 +++
 .../dom/src/main/resources/images/AuditEntry.png   |  Bin 0 -> 2215 bytes
 .../dom/src/main/resources/images/ToDoItem.gif     |  Bin 0 -> 1592 bytes
 .../quickstart_html_sql/fixture/pom.xml            |   40 +
 .../src/main/java/fixture/LogonAsSvenFixture.java  |   30 +
 .../main/java/fixture/todo/ToDoItemsFixture.java   |   74 ++
 .../fixture/todo/ToDoItemsFixturesService.java     |   46 +
 .../application/quickstart_html_sql/pom.xml        |  261 ++++
 .../viewer-html/hsql-db/tests.lck                  |  Bin 0 -> 16 bytes
 .../viewer-html/hsql-db/tests.log                  |    2 +
 .../viewer-html/hsql-db/tests.properties           |    4 +
 .../viewer-html/hsql-db/tests.script               |   46 +
 .../eclipse/launch/quickstart-viewer-html.launch   |   20 +
 .../quickstart_html_sql/viewer-html/lib/.gitignore |    5 +
 .../quickstart_html_sql/viewer-html/pom.xml        |  186 +++
 .../src/main/jettyconsole/isis-banner.pdn          |  Bin 0 -> 64679 bytes
 .../src/main/jettyconsole/isis-banner.png          |  Bin 0 -> 24486 bytes
 .../src/main/resources/images/Default.png          |  Bin 0 -> 3016 bytes
 .../webapp/WEB-INF/authentication_file.passwords   |   28 +
 .../webapp/WEB-INF/authentication_file.properties  |   25 +
 .../main/webapp/WEB-INF/authorization_file.allow   |   28 +
 .../webapp/WEB-INF/authorization_file.properties   |   47 +
 .../src/main/webapp/WEB-INF/isis.properties        |  180 +++
 .../src/main/webapp/WEB-INF/logging.properties     |   89 ++
 .../main/webapp/WEB-INF/persistor_sql.properties   |   72 ++
 .../src/main/webapp/WEB-INF/viewer_html.properties |   31 +
 .../viewer-html/src/main/webapp/WEB-INF/web.xml    |  233 ++++
 .../main/webapp/htmlviewer/images/banner-bg.png    |  Bin 0 -> 936 bytes
 .../src/main/webapp/htmlviewer/images/banner.png   |  Bin 0 -> 30394 bytes
 .../src/main/webapp/htmlviewer/style/default.css   |  928 ++++++++++++++
 pom.xml                                            |    4 -
 484 files changed, 19948 insertions(+), 19941 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/NOTICE
----------------------------------------------------------------------
diff --git a/component/security/ldap/NOTICE b/component/security/ldap/NOTICE
deleted file mode 100644
index ba21d0c..0000000
--- a/component/security/ldap/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/ldap-conf/example.ldif
----------------------------------------------------------------------
diff --git a/component/security/ldap/ldap-conf/example.ldif b/component/security/ldap/ldap-conf/example.ldif
deleted file mode 100644
index 1ede7b0..0000000
--- a/component/security/ldap/ldap-conf/example.ldif
+++ /dev/null
@@ -1,46 +0,0 @@
-dn: dc=isis,dc=org
-objectClass: top
-objectclass: dcObject
-objectclass: organization
-o: [[NAME]] Group
-dc: isis
-
-dn: cn=Manager,dc=isis,dc=org
-objectclass: organizationalRole
-cn: Manager
-
-
-dn: ou=people,dc=isis,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: people
-
-dn: uid=joe,ou=people,dc=isis,dc=org
-objectClass: person
-objectClass: inetOrgPerson
-cn: Joe Bloggs
-displayName: Joe Bloggs
-givenName: Joe
-sn: Bloggs
-uid: joe
-userPassword: pass
-
-dn: uid=john,ou=people,dc=isis,dc=org
-objectClass: person
-objectClass: inetOrgPerson
-cn: John Bloggs
-displayName: John
-givenName: John
-sn: Bloggs
-uid: john
-userPassword: pass
-
-dn: uid=jack,ou=people,dc=isis,dc=org
-objectClass: person
-objectClass: inetOrgPerson
-cn: Jack Bloggs
-displayName: Jack Bloggs
-givenName: Jack
-sn: Bloggs
-uid: jack
-userPassword: pass
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/ldap-conf/readme.txt
----------------------------------------------------------------------
diff --git a/component/security/ldap/ldap-conf/readme.txt b/component/security/ldap/ldap-conf/readme.txt
deleted file mode 100644
index 8f0dbfb..0000000
--- a/component/security/ldap/ldap-conf/readme.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-An LDAP browser can be downloaded from http://jxplorer.org/
-Windows port of OpenLDAP is at http://lucas.bergmans.us/hacks/openldap/
-
-Files:
-
-example.ldif - sample file for loading into ldap (using ldapadd)
-  usage
-  ldapadd -x -D "cn=Manager,dc=<MY-DOMAIN>,dc=<COM>" -W -f example.ldif
-  e.g.
-  ldapadd -x -D "cn=Manager,dc=isis,dc=org" -W -f example.ldif
-
-slapd.conf - sample configuration for the OpenLDAP server (Windows port)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/ldap-conf/slapd.conf
----------------------------------------------------------------------
diff --git a/component/security/ldap/ldap-conf/slapd.conf b/component/security/ldap/ldap-conf/slapd.conf
deleted file mode 100644
index a5f32b7..0000000
--- a/component/security/ldap/ldap-conf/slapd.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# Setup for Windows port of OpenLDAP
-#
-# See slapd.conf(5) for details on configuration options.
-# This file should NOT be world readable.
-#
-ucdata-path	./ucdata
-include		./schema/core.schema
-# DGS - add JNDI support, inetorgperson has additional attributes for network users
-include		./schema/java.schema
-include		./schema/cosine.schema
-include		./schema/inetorgperson.schema
-
-# Define global ACLs to disable default read access.
-
-# Do not enable referrals until AFTER you have a working directory
-# service AND an understanding of referrals.
-#referral	ldap:/root.openldap.org
-
-pidfile		./run/slapd.pid
-argsfile	./run/slapd.args
-
-# Load dynamic backend modules:
-# modulepath	./libexec/openldap
-# moduleload	back_bdb.la
-# moduleload	back_ldap.la
-# moduleload	back_ldbm.la
-# moduleload	back_passwd.la
-# moduleload	back_shell.la
-
-# Sample security restrictions
-#	Require integrity protection (prevent hijacking)
-#	Require 112-bit (3DES or better) encryption for updates
-#	Require 63-bit encryption for simple bind
-# security ssf=1 update_ssf=112 simple_bind=64
-
-# Sample access control policy:
-#	Root DSE: allow anyone to read it
-#	Subschema (sub)entry DSE: allow anyone to read it
-#	Other DSEs:
-#		Allow self write access
-#		Allow authenticated users read access
-#		Allow anonymous users to authenticate
-#	Directives needed to implement policy:
-# access to dn.base="" by * read
-# access to dn.base="cn=Subschema" by * read
-# access to *
-#	by self write
-#	by users read
-#	by anonymous auth
-#
-# if no access controls are present, the default policy
-# allows anyone and everyone to read anything but restricts
-# updates to rootdn.  (e.g., "access to * by * read")
-#
-# rootdn can always read and write EVERYTHING!
-
-#######################################################################
-# BDB database definitions
-#######################################################################
-
-database	bdb
-# DGS - set suffix to isis
-#suffix		"dc=my-domain,dc=com"
-#rootdn		"cn=Manager,dc=my-domain,dc=com"
-suffix		"dc=isis,dc=org"
-rootdn		"cn=Manager,dc=isis,dc=org"
-
-# Cleartext passwords, especially for the rootdn, should
-# be avoid.  See slappasswd(8) and slapd.conf(5) for details.
-# Use of strong authentication encouraged.
-rootpw		secret
-# The database directory MUST exist prior to running slapd AND 
-# should only be accessible by the slapd and slap tools.
-# Mode 700 recommended.
-directory	./data
-# Indices to maintain
-index	objectClass	eq
-
-# DGS - improve index?
-index   cn,sn,st                   pres,eq,sub

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/ldap/pom.xml b/component/security/ldap/pom.xml
deleted file mode 100644
index 8487518..0000000
--- a/component/security/ldap/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
--->
-<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>
-
-	<parent>
-		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
-		<relativePath>../../../core/pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.apache.isis.security</groupId>
-	<artifactId>isis-security-ldap</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-
-	<name>Isis LDAP Security</name>
-
-	<properties>
-        <siteBaseDir>.</siteBaseDir>
-		<relativeUrl/>
-	</properties>
-
-    <!-- used in Site generation for relative references. -->
-    <url>http://isis.apache.org/${relativeUrl}</url>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-                <!-- Apache Release Audit Tool -->
-                <plugin>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.8</version>
-	                <configuration>
-	                    <excludes>
-	                    	<!-- 
-	                    	overriding inherited excludes from oia.core:isis 
-	                    	with a more specific set for this component
-	                    	 -->
-	                        <exclude>**/target/**</exclude>
-	                        <exclude>**/target-ide/**</exclude>
-
-	                        <exclude>**/*.project</exclude>
-	                        <exclude>**/.classpath</exclude>
-	                        <exclude>**/.settings/**</exclude>
-	                    </excludes>
-                    </configuration>
-	            </plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>${maven-project-info-reports-plugin}</version>
-                <inherited>false</inherited>
-                <configuration>
-                	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                </configuration>
-                <reportSets>
-                    <reportSet>
-                        <inherited>false</inherited>
-                        <reports>
-                            <report>dependencies</report>
-                            <report>dependency-convergence</report>
-                            <report>plugins</report>
-                            <report>summary</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <dependencyManagement>
-    	<!-- for benefit of application developers, using scope=import -->
-    	<dependencies>
-			<dependency>
-			    <groupId>org.apache.isis.security</groupId>
-			    <artifactId>isis-security-ldap</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
-    	</dependencies>
-    </dependencyManagement>
-
-	<dependencies>
-		<dependency>
-		    <groupId>org.apache.isis.core</groupId>
-		    <artifactId>isis-core-runtime</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.isis.core</groupId>
-		    <artifactId>isis-core-runtime</artifactId>
-		    <type>test-jar</type>
-		    <scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/appended-resources/supplemental-models.xml b/component/security/ldap/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index ecd3906..0000000
--- a/component/security/ldap/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-    license agreements. See the NOTICE file distributed with this work for additional 
-    information regarding copyright ownership. The ASF licenses this file to 
-    you 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. -->
-<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-
-  <supplement>
-    <project>
-      <groupId>aopalliance</groupId>
-      <artifactId>aopalliance</artifactId>
-      <version>1.0</version>
-      <licenses>
-          <license>
-              <name>Public Domain</name>
-          </license>
-      </licenses>
-    </project>
-  </supplement>
-
-  <supplement>
-   	<!-- not quite sure why licenses:download-license flags this, since license info seems to be in its POM -->
-    <project>
-		<groupId>org.datanucleus</groupId>
-	    <artifactId>datanucleus-jodatime</artifactId>
-	    <version>3.1.1</version>
-          <licenses>
-			<license>
-	            <name>The Apache Software License, Version 2.0</name>
-	            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	        </license>
-	    </licenses>
-    </project>
-  </supplement>
-
-  <supplement>
-    <project>
-      <groupId>org.scannotation</groupId>
-      <artifactId>scannotation</artifactId>
-      <version>1.0.3</version>
-      <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-    
-  <supplement>
-    <project>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>1.6.1</version>
-      <licenses>
-        <license>
-            <name>BSD License</name>
-            <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-
-  <supplement>
-    <project>
-      <groupId>net.jcip</groupId>
-      <artifactId>jcip-annotations</artifactId>
-      <version>1.0</version>
-      <licenses>
-        <license>
-            <name>Creative Commons Attribution 2.5 License</name>
-            <url>http://creativecommons.org/licenses/by/2.5/</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-
-  <supplement>
-    <project>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-      <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-
- 
-</supplementalDataModels>

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java
deleted file mode 100644
index 4997151..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authentication;
-
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
-
-public final class LdapAuthenticationConstants {
-
-    public static final String ROOT = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE + "." + LdapAuthenticationManagerInstaller.NAME + ".";
-
-    public static final String SERVER_KEY = ROOT + "server";
-    public static final String SERVER_DEFAULT = "com.sun.jndi.ldap.LdapCtxFactory";
-
-    public static final String LDAPDN_KEY = ROOT + "dn";
-
-    public static String FILTER = "(objectclass=organizationalRole)";
-
-    private LdapAuthenticationConstants() {
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
deleted file mode 100644
index 4f8abd3..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authentication;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
-import org.apache.isis.core.runtime.authentication.standard.Authenticator;
-
-public class LdapAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
-    public static String NAME = "ldap";
-
-    public LdapAuthenticationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected List<Authenticator> createAuthenticators(final IsisConfiguration configuration) {
-        return Lists.<Authenticator> newArrayList(new LdapAuthenticator(configuration));
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
deleted file mode 100644
index 19f5ec1..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authentication;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.AuthenticationException;
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import org.apache.log4j.Logger;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
-
-public class LdapAuthenticator extends AuthenticatorAbstract {
-
-    private static final Logger LOG = Logger.getLogger(LdapAuthenticator.class);
-
-    private final String ldapProvider;
-    private final String ldapDn;
-
-    public LdapAuthenticator(final IsisConfiguration configuration) {
-        super(configuration);
-        ldapProvider = getConfiguration().getString(LdapAuthenticationConstants.SERVER_KEY);
-        ldapDn = getConfiguration().getString(LdapAuthenticationConstants.LDAPDN_KEY);
-    }
-
-    @Override
-    public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
-        return AuthenticationRequestPassword.class.isAssignableFrom(authenticationRequestClass);
-    }
-
-    private void setRoles(final DirContext authContext, final AuthenticationRequest request, final String username) throws NamingException {
-        final List<String> roles = new ArrayList<String>();
-        final SearchControls controls = new SearchControls();
-        controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-        controls.setReturningAttributes(new String[] { "cn" });
-        final String name = "uid=" + username + ", " + ldapDn;
-        final NamingEnumeration<SearchResult> answer = authContext.search(name, LdapAuthenticationConstants.FILTER, controls);
-        while (answer.hasMore()) {
-            final SearchResult result = answer.nextElement();
-            final String roleName = (String) result.getAttributes().get("cn").get(0);
-            roles.add(roleName);
-            LOG.debug("Adding role: " + roleName);
-        }
-        request.setRoles(roles);
-    }
-
-    @Override
-    public boolean isValid(final AuthenticationRequest request) {
-        final AuthenticationRequestPassword passwordRequest = (AuthenticationRequestPassword) request;
-        final String username = passwordRequest.getName();
-        Assert.assertNotNull(username);
-        if (username.equals("")) {
-            LOG.debug("empty username");
-            return false; // failed authentication
-        }
-        final String password = passwordRequest.getPassword();
-        Assert.assertNotNull(password);
-
-        final Hashtable<String, String> env = new Hashtable<String, String>(4);
-        env.put(Context.INITIAL_CONTEXT_FACTORY, LdapAuthenticationConstants.SERVER_DEFAULT);
-        env.put(Context.PROVIDER_URL, ldapProvider);
-        env.put(Context.SECURITY_PRINCIPAL, "uid=" + username + ", " + ldapDn);
-        env.put(Context.SECURITY_CREDENTIALS, password);
-
-        DirContext authContext = null;
-        try {
-            authContext = new InitialDirContext(env);
-            setRoles(authContext, request, username);
-            return true;
-        } catch (final AuthenticationException e) {
-            return false;
-        } catch (final NamingException e) {
-            throw new IsisException("Failed to authenticate using LDAP", e);
-        } finally {
-            try {
-                if (authContext != null) {
-                    authContext.close();
-                }
-            } catch (final NamingException e) {
-                throw new IsisException("Failed to authenticate using LDAP", e);
-            }
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java
deleted file mode 100644
index 973e853..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authorization;
-
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
-import org.apache.isis.security.ldap.authentication.LdapAuthenticationConstants;
-
-public final class LdapAuthorizationConstants {
-
-    private static final String ROOT = ConfigurationConstants.ROOT + AuthorizationManagerInstaller.TYPE + "." + LdapAuthorizationManagerInstaller.NAME + ".";
-
-    public static final String SERVER_KEY = ROOT + "server";
-    public static final String SERVER_DEFAULT = LdapAuthenticationConstants.SERVER_DEFAULT;
-
-    public static final String LDAPDN_KEY = ROOT + "dn";
-
-    public static final String APP_DN_KEY = ROOT + "application.dn";
-
-    public static final String LEARN_KEY = AuthorizationConstants.LEARN;
-    public static final boolean LEARN_DEFAULT = AuthorizationConstants.LEARN_DEFAULT;
-
-    private LdapAuthorizationConstants() {
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
deleted file mode 100644
index 7b9d5ad..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authorization;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.core.runtime.authorization.standard.Authorizor;
-
-public class LdapAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
-
-    public static String NAME = "ldap";
-
-    public LdapAuthorizationManagerInstaller() {
-        super(NAME);
-    }
-
-    @Override
-    protected Authorizor createAuthorizor(final IsisConfiguration configuration) {
-        return new LdapAuthorizor(configuration);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java b/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
deleted file mode 100644
index d88255e..0000000
--- a/component/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authorization;
-
-import java.util.Hashtable;
-
-import javax.naming.AuthenticationException;
-import javax.naming.Context;
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import org.apache.log4j.Logger;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
-
-public class LdapAuthorizor extends AuthorizorAbstract {
-
-    private static final Logger LOG = Logger.getLogger(LdapAuthorizor.class);
-
-    private static final String FILTER = "(&(uniquemember={0}) (|(cn={1}) (cn={2}) (cn={3})))";
-    private static final String ACCESS_QUALIFIER_RW = "RW";
-
-    private final String ldapProvider;
-    @SuppressWarnings("unused")
-    private final String ldapDn;
-    private final String appDn;
-    private final boolean learn;
-
-    public LdapAuthorizor(final IsisConfiguration configuration) {
-        super(configuration);
-
-        ldapProvider = getConfiguration().getString(LdapAuthorizationConstants.SERVER_KEY);
-        ldapDn = getConfiguration().getString(LdapAuthorizationConstants.LDAPDN_KEY);
-        appDn = getConfiguration().getString(LdapAuthorizationConstants.APP_DN_KEY);
-        learn = getConfiguration().getBoolean(LdapAuthorizationConstants.LEARN_KEY, LdapAuthorizationConstants.LEARN_DEFAULT);
-    }
-
-    // ////////////////////////////////////////////////////////
-    // init, shutdown
-    // ////////////////////////////////////////////////////////
-
-    @Override
-    public void init() {
-    }
-
-    @Override
-    public void shutdown() {
-        // do nothing
-    }
-
-    // ////////////////////////////////////////////////////////
-    // API
-    // ////////////////////////////////////////////////////////
-
-    @Override
-    public boolean isUsableInRole(final String role, final Identifier member) {
-        if(role == null) {
-            return false;
-        }
-        return isAuthorised(role, member, ACCESS_QUALIFIER_RW);
-    }
-
-    @Override
-    public boolean isVisibleInRole(final String role, final Identifier member) {
-        if(role == null) {
-            return false;
-        }
-        return isAuthorised(role, member, null);
-    }
-
-    private boolean isAuthorised(final String role, final Identifier member, final String flag) {
-
-        final Hashtable<String, String> env = new Hashtable<String, String>(4);
-        env.put(Context.INITIAL_CONTEXT_FACTORY, LdapAuthorizationConstants.SERVER_DEFAULT);
-        env.put(Context.PROVIDER_URL, ldapProvider);
-
-        if (learn) {
-            env.put(Context.SECURITY_PRINCIPAL, "uid=admin, ou=system");
-            env.put(Context.SECURITY_CREDENTIALS, "secret");
-        }
-
-        DirContext authContext = null;
-        try {
-            authContext = new InitialDirContext(env);
-            if (learn) {
-                return bindNames(authContext, role, member);
-            }
-            return isPermitted(authContext, role, member, flag);
-        } catch (final AuthenticationException e) {
-            throw new IsisException("Failed to authorise using LDAP", e);
-        } catch (final NameNotFoundException e) {
-            // missing class in ldap server - treat as authorisation failure
-            LOG.error(e);
-            return false;
-        } catch (final NamingException e) {
-            throw new IsisException("Failed to authorise using LDAP", e);
-        } finally {
-            try {
-                if (authContext != null) {
-                    authContext.close();
-                }
-            } catch (final NamingException e) {
-                throw new IsisException("Failed to authorise using LDAP", e);
-            }
-        }
-    }
-
-    private boolean isPermitted(final DirContext authContext, final String role, final Identifier member, final String flag) throws NamingException {
-        final String cls = member.toIdentityString(Identifier.CLASS);
-        final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
-        final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY);
-
-        final Object[] args = new Object[] { role, cls, name, parms };
-        final SearchControls controls = new SearchControls();
-        controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-        final String searchName = buildSearchName(cls, appDn);
-        final NamingEnumeration<SearchResult> answer = authContext.search(searchName, FILTER, args, controls);
-        while (answer.hasMore()) {
-            // if we have a class match must be OK
-            // if we have a name match must be OK (parent must be class by
-            // definition)
-            // but parm matches need to check that parent = name
-            final SearchResult result = answer.nextElement();
-            final String cn = (String) result.getAttributes().get("cn").get(0);
-            // result.getname gives relative path from class - so if contains
-            // 'name' it is parent of parms
-            // entry
-            if (cn.equals(cls) || cn.equals(name) || ((cn.equals(parms) && result.getName().contains(name)))) {
-                // last check if there is a flag attribute
-                if (flag != null) {
-                    final Attribute flagAttribute = result.getAttributes().get("flag");
-                    if (flagAttribute != null) {
-                        // since there is a flag need to check is match
-                        return flag.equalsIgnoreCase((String) flagAttribute.get(0));
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private String buildSearchName(final String cls, final String appDn) {
-        final StringBuffer search = new StringBuffer();
-        search.append("cn=").append(cls).append(", ").append(appDn);
-        final String searchName = search.toString();
-        return searchName;
-    }
-
-    private Attributes createCommonAttributes(final String cnName, final String role, final boolean isClass) {
-        final Attributes attrs = new BasicAttributes(true); // case-ignore
-        final Attribute objclass = new BasicAttribute("objectclass");
-        objclass.add("top");
-        objclass.add("javaContainer");
-        objclass.add("groupOfUniqueNames");
-        if (isClass) {
-            objclass.add("javaObject");
-        }
-        final Attribute cn = new BasicAttribute("cn");
-        cn.add(cnName);
-        final Attribute uniqueMember = new BasicAttribute("uniquemember");
-        uniqueMember.add(role);
-        if (isClass) {
-            final Attribute javaClass = new BasicAttribute("javaclassname");
-            javaClass.add(cnName);
-            attrs.put(javaClass);
-        }
-        attrs.put(objclass);
-        attrs.put(cn);
-        attrs.put(uniqueMember);
-        return attrs;
-    }
-
-    private String createClassBindname(final String cls) {
-        final StringBuffer bindName = new StringBuffer();
-        bindName.append("cn=").append(cls).append(", ").append(appDn);
-        return bindName.toString();
-    }
-
-    private void bindClass(final DirContext authContext, final String role, final Identifier member) throws NamingException {
-        final String cls = member.toIdentityString(Identifier.CLASS);
-        final Attributes attrs = createCommonAttributes(cls, role, true);
-        try {
-            authContext.createSubcontext(createClassBindname(cls), attrs);
-        } catch (final NameAlreadyBoundException e) {
-            // ignore as this is just debug code
-            // and we don't check if this is already bound first
-            LOG.debug(e);
-        }
-    }
-
-    private String createNameBindname(final String cls, final String name) {
-        final StringBuffer bindName = new StringBuffer();
-        bindName.append("cn=").append(name).append(", ");
-        bindName.append(createClassBindname(cls));
-        return bindName.toString();
-    }
-
-    private void bindName(final DirContext authContext, final String role, final Identifier member) throws NamingException {
-        final String cls = member.toIdentityString(Identifier.CLASS);
-        final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
-        final Attributes attrs = createCommonAttributes(name, role, false);
-        try {
-            authContext.createSubcontext(createNameBindname(cls, name), attrs);
-        } catch (final NameAlreadyBoundException e) {
-            // ignore as this is just debug code
-            // and we don't check if this is already bound first
-            LOG.debug(e);
-        }
-    }
-
-    private String createParmsBindname(final String cls, final String name, final String parms) {
-        final StringBuffer bindName = new StringBuffer();
-        bindName.append("cn=").append(parms).append(", ");
-        bindName.append(createNameBindname(cls, name));
-        return bindName.toString();
-    }
-
-    private void bindParms(final DirContext authContext, final String role, final Identifier member) throws NamingException {
-        final String cls = member.toIdentityString(Identifier.CLASS);
-        final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
-        // have to escape any commas in parms string or ldap parser is not happy
-        final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY).replace(",", "\\,");
-        if (parms.length() == 0) {
-            return;
-        }
-        final Attributes attrs = createCommonAttributes(parms, role, false);
-        try {
-            authContext.createSubcontext(createParmsBindname(cls, name, parms), attrs);
-        } catch (final NameAlreadyBoundException e) {
-            // ignore as this is just debug code
-            // and we don't check if this is already bound first
-            LOG.debug(e);
-        }
-    }
-
-    private boolean bindNames(final DirContext authContext, final String role, final Identifier member) throws NamingException {
-        bindClass(authContext, role, member);
-        bindName(authContext, role, member);
-        bindParms(authContext, role, member);
-        return true;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/site/apt/index.apt b/component/security/ldap/src/site/apt/index.apt
deleted file mode 100644
index 8978117..0000000
--- a/component/security/ldap/src/site/apt/index.apt
+++ /dev/null
@@ -1,44 +0,0 @@
-~~  Licensed to the Apache Software Foundation (ASF) under one
-~~  or more contributor license agreements.  See the NOTICE file
-~~  distributed with this work for additional information
-~~  regarding copyright ownership.  The ASF licenses this file
-~~  to you 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.
-
-
-
-Security LDAP Implementation
-
- The <ldap security> module provides an implementation of Isis' authentication and
- authorization APIs where credentials are stored in a well-known LDAP server.
- 
- This makes the LDAP security implementation suitable for deployment where an
- LDAP exists.  Optionally it may be combined with other implementations (for example
- the authorization might be performed using the file-based implementation).
- 
- See the security 
- {{{../docbkx/html/guide/isis-security.html}HTML}} or 
- {{{../docbkx/pdf/isis-security.pdf}PDF}} documentation for more detail.
- 
-Alternatives
-
-  Alternatives include:
-  
-  * the {{{../dflt/index.html}default}} (no-op) security implementation, for prototyping use only
-
-  * the {{{../file/index.html}file-based}} security (reading from simple flat files)
-
-  * the {{{../sql/index.html}SQL}} security (reading from simple SQL tables)
-
-  []
-  

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/site/apt/jottings.apt b/component/security/ldap/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/component/security/ldap/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~  Licensed to the Apache Software Foundation (ASF) under one
-~~  or more contributor license agreements.  See the NOTICE file
-~~  distributed with this work for additional information
-~~  regarding copyright ownership.  The ASF licenses this file
-~~  to you 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.
-
-
-
-Jottings
- 
-  This page is to capture any random jottings relating to this module prior 
-  to being moved into formal documentation. 
- 

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/site/site.xml
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/site/site.xml b/component/security/ldap/src/site/site.xml
deleted file mode 100644
index 1f465f4..0000000
--- a/component/security/ldap/src/site/site.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
--->
-<project>
-
-	<body>
-		<breadcrumbs>
-			<item name="LDAP" href="index.html"/>
-		</breadcrumbs>
-
-		<menu name="LDAP Security">
-			<item name="About" href="index.html" />
-            <item name="Jottings" href="jottings.html" />
-		</menu>
-
-        <menu name="Security Modules">
-            <item name="Default (No-op)" href="../dflt/index.html" />
-            <item name="File" href="../file/index.html" />
-            <item name="LDAP" href="../ldap/index.html" />
-            <item name="SQL" href="../sql/index.html" />
-        </menu>
-
-        <menu name="Maven Reports" ref="reports" />
-	</body>
-</project>

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java
----------------------------------------------------------------------
diff --git a/component/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java b/component/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java
deleted file mode 100644
index e84ec1c..0000000
--- a/component/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.
- */
-
-package org.apache.isis.security.ldap.authentication;
-
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-
-public class LdapAuthenticatorTester {
-
-    public static void main(final String[] args) {
-        final LdapAuthenticator auth = new LdapAuthenticator(IsisContext.getConfiguration());
-
-        AuthenticationRequestPassword req = new AuthenticationRequestPassword("unauth", "pass");
-        try {
-            System.out.println("unauth auth=" + auth.isValid(req));
-        } catch (final Exception e) {
-            System.out.println("unauth failed authentication!");
-            e.printStackTrace();
-        }
-        req = new AuthenticationRequestPassword("joe", "pass");
-        try {
-            System.out.println("joe auth=" + auth.isValid(req));
-        } catch (final Exception e) {
-            System.out.println("joe auth failed!!");
-            e.printStackTrace();
-        }
-        req = new AuthenticationRequestPassword("joe", "wrongpass");
-        try {
-            System.out.println("joe wrongpass auth=" + auth.isValid(req));
-        } catch (final Exception e) {
-            System.out.println("joe wrongpass auth failed!!");
-            e.printStackTrace();
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/sql/NOTICE
----------------------------------------------------------------------
diff --git a/component/security/sql/NOTICE b/component/security/sql/NOTICE
deleted file mode 100755
index ba21d0c..0000000
--- a/component/security/sql/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/91a8000b/component/security/sql/hsql-db/authenticator-tests.script
----------------------------------------------------------------------
diff --git a/component/security/sql/hsql-db/authenticator-tests.script b/component/security/sql/hsql-db/authenticator-tests.script
deleted file mode 100644
index 18d5aac..0000000
--- a/component/security/sql/hsql-db/authenticator-tests.script
+++ /dev/null
@@ -1,51 +0,0 @@
-SET DATABASE UNIQUE NAME HSQLDB3B5AA06E81
-SET DATABASE GC 0
-SET DATABASE DEFAULT RESULT MEMORY ROWS 0
-SET DATABASE EVENT LOG LEVEL 0
-SET DATABASE SQL NAMES FALSE
-SET DATABASE SQL REGULAR NAMES TRUE
-SET DATABASE SQL REFERENCES FALSE
-SET DATABASE SQL SIZE TRUE
-SET DATABASE SQL TYPES FALSE
-SET DATABASE SQL TDC DELETE TRUE
-SET DATABASE SQL TDC UPDATE TRUE
-SET DATABASE SQL TRANSLATE TTI TYPES TRUE
-SET DATABASE SQL CONCAT NULLS TRUE
-SET DATABASE SQL NULLS FIRST TRUE
-SET DATABASE SQL UNIQUE NULLS TRUE
-SET DATABASE SQL CONVERT TRUNCATE TRUE
-SET DATABASE SQL AVG SCALE 0
-SET DATABASE SQL DOUBLE NAN TRUE
-SET DATABASE SQL LONGVAR IS LOB FALSE
-SET DATABASE TRANSACTION CONTROL LOCKS
-SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED
-SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE
-SET DATABASE TEXT TABLE DEFAULTS ''
-SET FILES WRITE DELAY 500 MILLIS
-SET FILES BACKUP INCREMENT TRUE
-SET FILES CACHE SIZE 10000
-SET FILES CACHE ROWS 50000
-SET FILES SCALE 32
-SET FILES LOB SCALE 32
-SET FILES DEFRAG 0
-SET FILES NIO TRUE
-SET FILES NIO SIZE 256
-SET FILES LOG TRUE
-SET FILES LOG SIZE 50
-CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
-ALTER USER SA SET LOCAL TRUE
-CREATE SCHEMA PUBLIC AUTHORIZATION DBA
-SET SCHEMA PUBLIC
-CREATE MEMORY TABLE PUBLIC.USERS(EMAIL VARCHAR(32),PASSWORD VARCHAR(32))
-ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1
-SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC
-GRANT DBA TO SA
-SET SCHEMA SYSTEM_LOBS
-INSERT INTO BLOCKS VALUES(0,2147483647,0)
-SET SCHEMA PUBLIC
-INSERT INTO USERS VALUES('user1','password1')