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 2016/01/24 14:17:03 UTC
[1/3] isis git commit: ISIS-1287: more bad links in the security docs.
Repository: isis
Updated Branches:
refs/heads/master 0c17f546a -> 3fc1eb219
ISIS-1287: more bad links in the security docs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3887fb2e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3887fb2e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3887fb2e
Branch: refs/heads/master
Commit: 3887fb2eb80f86a5d05c50829b4f2ad18b6587bd
Parents: 0c17f54
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 24 12:18:58 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 24 12:18:58 2016 +0000
----------------------------------------------------------------------
.../src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 2 +-
.../src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc | 2 +-
.../guides/_ugsec_shiro-isisaddons-security-module-realm.adoc | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3887fb2e/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
index 9397bfd..ec14f68 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
@@ -11,7 +11,7 @@ This is suitable for prototyping, but isn't intended for production use, if only
The diagram below shows the Isis and components involved:
-image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-ini-realm.png[width="600px"]
+image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG[width="600px"]
The realm is responsible for validating the user credentials, and then creates a Shiro link:http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/subject/Subject.html[`Subject`] which represents the user (for the current request). Apache Isis `Authenticator` component then interacts with the `Subject` in order to check permissions.
http://git-wip-us.apache.org/repos/asf/isis/blob/3887fb2e/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc
index 0210fa7..20ac868 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc
@@ -7,7 +7,7 @@
Isis ships with an implementation of http://shiro.apache.org[Apache Shiro]'s `Realm` class that allows user authentication and authorization to be performed against an LDAP server.
-image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.png[width="600px"]
+image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG[width="600px"]
The LDAP database stores the user/passwords and user groups, while the `shiro.ini` file is used to map the LDAP groups to roles, and to map the roles to permissions.
http://git-wip-us.apache.org/repos/asf/isis/blob/3887fb2e/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc
index b57bb5f..5406b97 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc
@@ -16,7 +16,7 @@ In order to play along, the module includes a Shiro realm, which fits in as foll
The general configuration is as follows:
-image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.png[width="600px"]
+image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG[width="600px"]
where the `IsisModuleSecurityRealm` realm is the implementation provided by the module.
@@ -27,7 +27,7 @@ In the configuration above user passwords are stored in the database. The modul
The security module also supports a slightly more sophisticated configuration. Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal. The `IsisModuleSecurityRealm` can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically.
In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:
-image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.png[width="600px"]
+image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG[width="600px"]
The security module has many more features than are described here, all of which are described in the module's link:https://github.com/isisaddons/isis-module-security[README]. The README also explains in detail how to configure an existing app to use this module.
[2/3] isis git commit: ISIS-1287: fixing bad link to cgcom in all
guides
Posted by da...@apache.org.
ISIS-1287: fixing bad link to cgcom in all guides
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c229efea
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c229efea
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c229efea
Branch: refs/heads/master
Commit: c229efeaee3f5c6a46a9d235ad22955fdcd5da53
Parents: 3887fb2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 24 13:10:44 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 24 13:10:44 2016 +0000
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/guides/cgcom.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/cgcon.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/rgant.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/rgcms.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ug.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ugfun.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ugsec.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ugtst.adoc | 2 +-
adocs/documentation/src/main/asciidoc/guides/ugvro.adoc | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc
index c48343e..8620a7e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc
@@ -36,7 +36,7 @@ The reference guides are:
The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (this guide)
+* xref:cgcom.adoc#[Committers' Guide] (this guide)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/cgcon.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcon.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcon.adoc
index 7de978f..7517146 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcon.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcon.adoc
@@ -44,7 +44,7 @@ The reference guides are:
The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (this guide)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
index 5454e12..08c5178 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
@@ -37,7 +37,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
=== Examples
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
index f10e6be..00610b8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
@@ -47,7 +47,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
index 41c9875..da2d5c1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
@@ -40,7 +40,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
index 3918f7b..8f54369 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
@@ -37,7 +37,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
include::_rgsvc_api.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ug.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ug.adoc b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
index 6b07136..c988cfa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ug.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
@@ -28,4 +28,4 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
index bb1ba14..fd3781e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
@@ -38,7 +38,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
include::_ugbtb_view-models.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
index bae562f..22daff9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
@@ -40,7 +40,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
index 0baf9ee..117b52b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
@@ -36,7 +36,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
=== Terminology
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc b/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
index 76cfbec..0ae1e82 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
@@ -41,7 +41,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
http://git-wip-us.apache.org/repos/asf/isis/blob/c229efea/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
index 5a648d9..e41ea0f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
@@ -46,7 +46,7 @@ The "supporting procedures" guides are:
* xref:cgcon.adoc#[Contributors' Guide] (how to set up a development environment
for Apache Isis and contribute back to the project)
-* xref:cgcon.adoc#[Committers' Guide] (release procedures and related practices)
+* xref:cgcom.adoc#[Committers' Guide] (release procedures and related practices)
[3/3] isis git commit: ISIS-1298: change @Hidden to @Programmatic for
ViewModel.Cloneable#clone() method
Posted by da...@apache.org.
ISIS-1298: change @Hidden to @Programmatic for ViewModel.Cloneable#clone() method
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3fc1eb21
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3fc1eb21
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3fc1eb21
Branch: refs/heads/master
Commit: 3fc1eb219e6c2878ca5c6e6def7754054e723d3f
Parents: c229efe
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 24 13:13:04 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 24 13:13:04 2016 +0000
----------------------------------------------------------------------
core/applib/src/main/java/org/apache/isis/applib/ViewModel.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3fc1eb21/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java b/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java
index c25fcbd..a61ff1e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/ViewModel.java
@@ -19,10 +19,8 @@
package org.apache.isis.applib;
-import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Programmatic;
-
/**
* Indicates that an object belongs to the UI/application layer, and is intended to be used as a view model.
*
@@ -57,7 +55,7 @@ public interface ViewModel {
* view model whose state has been edited.
*/
public interface Cloneable extends java.lang.Cloneable {
- @Hidden
+ @Programmatic
public Object clone();
}
}