diff --git a/docs/api/tg-authApi.rst b/docs/api/tg-authApi.rst
index 8159d9ab45be5cb0ff14a8a3eb18da43492f5609..6d6fa7cde85586523379a5ef7faa85982a08411e 100644
--- a/docs/api/tg-authApi.rst
+++ b/docs/api/tg-authApi.rst
@@ -9,17 +9,17 @@ Checks whether this UserID (eduPersonPrincipalName) exists in RBAC.
* Input Parameters userExistsRequest, with elements
- * auth - String, SessionID of application or user asking
- * log - String for log information, optional
+ * auth - String, SessionID of application or user asking
+ * log - String for log information, optional
+ * username - String containing the ID (ePPN) of the user
-* username - String containing the ID (ePPN) of the user
+* Output Parameters booleanResponse, with element
- * Output Parameters booleanResponse, with element
- * result - boolean, true if user exists, false otherwise
+ * result - boolean, true if user exists, false otherwise
-* Faults:
+* Faults
- * authenticationFault
+ * authenticationFault
getNames
@@ -56,7 +56,9 @@ Returns user records for a name or mail address.
* agreesearch - Boolean, whether user wants his ID to be found be a search for name or mail address
* usersupplieddata - Boolean, whether user himself or his organisation supplied these data
-* Faults none
+* Faults
+
+ * none
getObjects
@@ -68,12 +70,11 @@ Returns URIs of all resources in project. Caller must have some role in the proj
* auth - String, SessionID of user
* log - String for log information, optional
+ * project - String with projectID
- * project - String with projectID
-
- * Output Parameters resourcesetResponse, with element
-
- * resource - String with URI of resource in project. Can occur multiple times
+* Output Parameters resourcesetResponse, with element
+
+ * resource - String with URI of resource in project. Can occur multiple times
tgCheckAccess
@@ -88,13 +89,14 @@ Returns access decision for given operation on given resource for session.
* sid - String, SessionID of user for whom the check is to be done. Leave empty if check is to be done for user's own session given under auth
* operation - String, such as "read", "write"
* resource - String, name of project or role, or URI of TgObject resource
- * Output Parameters booleanResponse, with element
- * result - boolean, true if operation was successful, false otherwise
-
- * Faults
-
- * unknownResourceFault
+* Output Parameters booleanResponse, with element
+
+ * result - boolean, true if operation was successful, false otherwise
+
+* Faults
+
+ * unknownResourceFault
tgAssignedRoles
diff --git a/docs/conf.py b/docs/conf.py
index a193632f88d868012cb23d4c7e7e186510b8b14f..73bb02472a4cf109e548f0641113af6e434e4941 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,7 +49,7 @@ master_doc = 'index'
# General information about the project.
project = u'tgauth*'
-copyright = u'2015, TextGrid'
+copyright = u'2019, TextGrid'
author = u'TextGrid'
# The version info for the project you're documenting, acts as replacement for
@@ -139,7 +139,7 @@ html_theme = 'classic'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
diff --git a/docs/index.rst b/docs/index.rst
index 0cf2567c68ee2033fb66ade88c5533fc2e8aef19..30824655972eed2a7678b2232c7a5bbab49ae4cf 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -30,8 +30,8 @@ Response
* openRBAC Web Service layer: for accessing openRBAC functions via SOAP
* tgextra (also a SOAP Web Service): additional functions implemented for TextGrid needs, either aggregating basic RBAC functions or introducing unrelated functions that leverage the underlying LDAP server as storage
* Storage: an OpenLDAP server
-
-* two additional schemas: for RBAC core and for TextGrid-specific attributes
+
+* two additional schemas: for RBAC core and for TextGrid-specific attributes
* Branches:
@@ -46,7 +46,7 @@ WebAuthN
* Implementation: PHP
* Dual Login on the first page:
-
+
* direct authentication in the community LDAP server or via
* Shibboleth Login with DFN-AAI-Basic
@@ -58,7 +58,7 @@ WebAuthN
2. registration of a user session with activation of all available roles in RBAC
3. check if user has filled out all required personal information and accepted the Terms of use
4. exposure of the newly assigned Session ID for use in further activities with the TextGridLab and the TG-Utilities
-
+
* In User Details mode (no authentication, just see and modify user's attributes), only 3. happens.
* One WebAuthN installation with one community LDAP server can interact with multiple RBAC instances.
* HTTP GET or POST arguments for TextGrid-WebAuth.php:
@@ -99,7 +99,7 @@ WSDL
OpenRBAC SOAP WSDL locations on the productive TextGridRep TG-auth* server:
* Most relevant for Lab/User interaction: https://textgridlab.org/1.0/tgauth/wsdl/tgextra.wsdl >> Documentation of TGextra WSDL Methods
-* Relevant for Server access: https://textgridlab.org/1.0/tgauth/wsdl/tgextra-crud.wsdl >> Documentation of TGextra-crud Methods (TODO)
+* Relevant for Server access: https://textgridlab.org/1.0/tgauth/wsdl/tgextra-crud.wsdl >> Documentation of TGextra-crud Methods
* Administrative functions:
* https://textgridlab.org/1.0/tgauth/wsdl/tgadministration.wsdl
@@ -114,6 +114,7 @@ API Documentation
:maxdepth: 1
api/tg-authApi.rst
+ api/tg-authCrudApi.rst
Sources
diff --git a/info.textgrid.middleware.tgauth.tgextra-client-crud/pom.xml b/info.textgrid.middleware.tgauth.tgextra-client-crud/pom.xml
index d693d461913c175b4a546a21cb8cdca139310a1b..40cb68c9de4de789b9eb190684cf955609155237 100644
--- a/info.textgrid.middleware.tgauth.tgextra-client-crud/pom.xml
+++ b/info.textgrid.middleware.tgauth.tgextra-client-crud/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>tgauth</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.9.10</version>
+ <version>1.9.12</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgauth-client-crud</artifactId>
diff --git a/info.textgrid.middleware.tgauth.tgextra-client-test/pom.xml b/info.textgrid.middleware.tgauth.tgextra-client-test/pom.xml
index a2dcc70dbc72518366b72948c8faf538fdca832f..386d36c7315f83ba495d7ae19dea224ba1a96aa8 100644
--- a/info.textgrid.middleware.tgauth.tgextra-client-test/pom.xml
+++ b/info.textgrid.middleware.tgauth.tgextra-client-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>tgauth</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.9.10</version>
+ <version>1.9.12</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgauth-client-test</artifactId>
diff --git a/info.textgrid.middleware.tgauth.tgextra-client-test/src/test/java/info/textgrid/middleware/tgauth/tgauthclient/TestTGAuthServiceOnline.java b/info.textgrid.middleware.tgauth.tgextra-client-test/src/test/java/info/textgrid/middleware/tgauth/tgauthclient/TestTGAuthServiceOnline.java
index 245c1aca773bc401f0a7eb44c2dd394e2be2ad33..ea77f8aaff8ea34ee2b369bbb20b440db48c6f44 100644
--- a/info.textgrid.middleware.tgauth.tgextra-client-test/src/test/java/info/textgrid/middleware/tgauth/tgauthclient/TestTGAuthServiceOnline.java
+++ b/info.textgrid.middleware.tgauth.tgextra-client-test/src/test/java/info/textgrid/middleware/tgauth/tgauthclient/TestTGAuthServiceOnline.java
@@ -104,8 +104,8 @@ public class TestTGAuthServiceOnline {
// STATIC FINALS
// **
- // private static final String PROPERTIES_FILE = "tgauth.test.textgridlab-org.properties";
- private static final String PROPERTIES_FILE = "tgauth.test.dev-textgridlab-org.properties";
+ private static final String PROPERTIES_FILE = "tgauth.test.textgridlab-org.properties";
+ // private static final String PROPERTIES_FILE = "tgauth.test.dev-textgridlab-org.properties";
private static final String NOT_YET_IMPLEMENTED = "test not yet implemented!";
private static final int TGEXTRA_CLIENT_TIMEOUT = 0;
private static final String ERROR = "\t??ERROR: ";
diff --git a/info.textgrid.middleware.tgauth.tgextra-client/pom.xml b/info.textgrid.middleware.tgauth.tgextra-client/pom.xml
index d51dc7e2607bd9b46222a733d39450e90fe7b6c3..d564eac3a7c669d00f355b209ce1e8df377ef4a8 100644
--- a/info.textgrid.middleware.tgauth.tgextra-client/pom.xml
+++ b/info.textgrid.middleware.tgauth.tgextra-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>tgauth</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.9.10</version>
+ <version>1.9.12</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgauth-client</artifactId>
diff --git a/info.textgrid.middleware.tgauth.vomrs2gridmap/00Readme.txt b/info.textgrid.middleware.tgauth.vomrs2gridmap/00Readme.txt
deleted file mode 100644
index 0ca6b9765d7757bb757259b072ca24fb5e7f34f5..0000000000000000000000000000000000000000
--- a/info.textgrid.middleware.tgauth.vomrs2gridmap/00Readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# vomrs2gridmap - fetches Member DNs from a VOMRS server and adds them
-# to the system's Globus Toolkit Grid-mapfile, creating
-# the system accounts being mapped to on the fly.
-
-See file 00Install.txt for installation procedure.
-
-BUGS
-surely many.
-
-* one known caveat: when a member will be deleted from VOMRS, it won't
- be from the gridmapfile. This is intended as the program by now
- cannot tell which entries other processes or admins added to the
- file and which ones it added itself.
-
diff --git a/pom.xml b/pom.xml
index 18b905c2455c9e095693a9c90ca74d9841f99fef..691de8c9f45783dd9f2885703ef6798c75d9a638 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgauth</artifactId>
- <version>1.9.10</version>
+ <version>1.9.12</version>
<name>TextGrid :: TGAuth</name>
<packaging>pom</packaging>
<properties>