You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2017/05/07 15:04:40 UTC
[1/2] directory-fortress-core git commit: Fix script: pull latest
docker image and remove duplicate line
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 3d77ad537 -> 53605d447
Fix script: pull latest docker image and remove duplicate line
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/d93e956e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/d93e956e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/d93e956e
Branch: refs/heads/master
Commit: d93e956e6dd72bcf20b28db2ef642fa1a222d252
Parents: 3d77ad5
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun May 7 17:01:43 2017 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun May 7 17:01:43 2017 +0200
----------------------------------------------------------------------
src/docker/openldap-for-apache-fortress-tests/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d93e956e/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
----------------------------------------------------------------------
diff --git a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
index 4238dc1..1a5c816 100755
--- a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
+++ b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
@@ -25,6 +25,7 @@ set -e
set -x
# startup docker container
+docker pull apachedirectory/openldap-for-apache-fortress-tests
CONTAINER_ID=$(docker run -d -P apachedirectory/openldap-for-apache-fortress-tests)
CONTAINER_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "389/tcp") 0).HostPort}}' $CONTAINER_ID)
echo $CONTAINER_PORT
@@ -39,7 +40,6 @@ sed -i 's/^suffix\.dc=.*/suffix.dc=com/' build.properties
sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
sed -i 's/^root\.pw=.*/root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU/' build.properties
sed -i 's/^cfg\.root\.pw=.*/cfg.root.pw=secret/' build.properties
-sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
# prepare
mvn clean install
[2/2] directory-fortress-core git commit: Delete outdated docker
stuff, Dockerfile and scripts moved to src/docker long ago
Posted by se...@apache.org.
Delete outdated docker stuff, Dockerfile and scripts moved to src/docker long ago
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/53605d44
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/53605d44
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/53605d44
Branch: refs/heads/master
Commit: 53605d447948247b83222c8504e214612bacbdf2
Parents: d93e956
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun May 7 17:03:59 2017 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun May 7 17:03:59 2017 +0200
----------------------------------------------------------------------
docker/Dockerfile | 52 ----
docker/Dockerfile.centos6 | 46 ----
docker/README.md | 74 ------
docker/fortress.schema | 575 -----------------------------------------
docker/rbac.schema | 261 -------------------
docker/run-tests.sh | 58 -----
6 files changed, 1066 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 50b265c..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,52 +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.
-#
-
-FROM java:8
-
-# Prerequisites: Fortress Quickstart downloaded from https://symas.com/downloads/
-ADD fortressBuilder-Debian-Silver-x86-64-1.0-RC39.zip /root/fortress/
-
-WORKDIR /root/fortress
-
-RUN \
- # Fortress Quickstart README Section I
- unzip fortressBuilder-Debian-Silver-x86-64-1.0-RC39.zip && \
- chmod a+x -Rf * && \
- # Workaround for FC-33: enable rbac.accelerator=true to enable ACLs in slapd.conf
- sed -i 's/#rbac\.accelerator=true/rbac\.accelerator=true/' build.properties && \
- # Fortress Quickstart README Section II
- sed -i 's/export JAVA_HOME=.*/export JAVA_HOME=\/usr\/lib\/jvm\/java-1.8.0-openjdk-amd64\//' b.sh
-
-ADD fortress.schema /root/fortress/ldap/schema/
-ADD rbac.schema /root/fortress/ldap/schema/
-
-RUN \
- ./b.sh dist && \
- # Fortress Quickstart README Section III
- ./b.sh init-slapd && \
- # Cleanup: only the configured OpenLDAP server is required
- rm -rf /root/fortress && \
- rm -rf /root/.ivy2
-
-WORKDIR /root
-
-EXPOSE 389
-
-CMD ["/opt/symas/lib64/slapd", "-d", "32768", "-u", "root", "-g", "root"]
-
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/Dockerfile.centos6
----------------------------------------------------------------------
diff --git a/docker/Dockerfile.centos6 b/docker/Dockerfile.centos6
deleted file mode 100644
index 4c763f1..0000000
--- a/docker/Dockerfile.centos6
+++ /dev/null
@@ -1,46 +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.
-#
-
-FROM centos:6
-
-# Prerequisites: Fortress Quickstart downloaded from https://symas.com/downloads/
-ADD fortressBuilder-Redhat-Silver-x86-64-1.0-RC39.zip /root/fortress/
-
-WORKDIR /root/fortress
-
-RUN \
- yum -y -q install java-1.7.0-openjdk-devel unzip && \
- # Fortress Quickstart README Section I
- unzip fortressBuilder-Redhat-Silver-x86-64-1.0-RC39.zip && \
- chmod a+x -Rf * && \
- # Fortress Quickstart README Section II
- sed -i 's/export JAVA_HOME=.*/export JAVA_HOME=\/usr\/lib\/jvm\/java-1.7.0/' b.sh && \
- ./b.sh dist && \
- # Fortress Quickstart README Section III
- ./b.sh init-slapd && \
- # Cleanup: only the configured OpenLDAP server is required
- rm -rf /root/fortress && \
- rm -rf /root/.ivy2
-
-WORKDIR /root
-
-EXPOSE 389
-
-CMD ["/opt/symas/lib64/slapd", "-d", "32768", "-u", "root", "-g", "root"]
-
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index e94fba4..0000000
--- a/docker/README.md
+++ /dev/null
@@ -1,74 +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.
-
-
-# About
-
-A docker image with preconfigured OpenLDAP to be used for running Apache Fortress integration tests.
-
-
-## Prerequisites
-
-* Docker installation
-
-
-## Build image
-
-Download Fortress Quickstart from https://symas.com/downloads/ (fortressBuilder-Debian-Silver-x86-64-1.0-RC39.zip).
-
- docker build -t apachedirectory/openldap-for-apache-fortress-tests .
-
-Or just to be sure don't use cached layers:
-
- docker build --no-cache=true -t apachedirectory/openldap-for-apache-fortress-tests .
-
-
-## Publish image to Docker Hub
-
-You need an account at <https://hub.docker.com> and join the `apachedirectory` team (ask Stefan).
-
- docker push apachedirectory/openldap-for-apache-fortress-tests:latest
-
-
-## Run container
-
- CONTAINER_ID=$(docker run -d -P apachedirectory/openldap-for-apache-fortress-tests)
- CONTAINER_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "389/tcp") 0).HostPort}}' $CONTAINER_ID)
- echo $CONTAINER_PORT
-
-
-## Go into the container
-
- docker exec -it $CONTAINER_ID bash
-
-
-## Restart container
-
- docker restart $CONTAINER_ID
-
-
-## Stop and delete container
-
- docker stop $CONTAINER_ID
- docker rm $CONTAINER_ID
-
-
-## Run fortress-core tests
-
-Run script `run-tests.sh` in FORTRESS_HOME.
-
-
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/fortress.schema
----------------------------------------------------------------------
diff --git a/docker/fortress.schema b/docker/fortress.schema
deleted file mode 100644
index 24ee8b2..0000000
--- a/docker/fortress.schema
+++ /dev/null
@@ -1,575 +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.
-#
-#
-### Fortress Schema version 2.0.0-RC2
-### This schema is required for all Apache Fortress Core deployments
-### IANA PRIVATE ENTERPRISE NUMBER: 1.3.6.1.4.1.18060.17
-### 1. Fortress Attributes: 1.3.6.1.4.1.18060.17.1.*
-### 2. Fortress Object Classes: 1.3.6.1.4.1.18060.17.2.*
-### 3. Fortress AUX Object Classes: 1.3.6.1.4.1.18060.17.3.*
-######################################################################
-
-# Use this as basis for OID's to follow:
-objectidentifier ftBase 1.3.6.1.4.1.18060.17
-# Attributes:
-objectidentifier ftAtId ftBase:1
-# Object Classes:
-objectidentifier ftObId ftBase:2
-# Aux Object Classes:
-objectidentifier ftAxId ftBase:3
-
-######################################################################
-## 1. OpenLDAP Fortress attribute definitions
-######################################################################
-
-# A1: Permission Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:1
- NAME 'ftPermName'
- DESC 'Fortress Permission Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A2: Permission Operation Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:2
- NAME 'ftOpNm'
- DESC 'Fortress Permission Operation Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A3: Permission Object Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:3
- NAME 'ftObjNm'
- DESC 'Fortress Permission Object Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A4: Permission Object ID, type STRING, SINGLE VALUE
-attributetype ( ftAtId:4
- NAME 'ftObjId'
- DESC 'Fortress Permission Object ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A5: Role Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:5
- NAME 'ftRoleName'
- DESC 'Fortress Role Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A6: TimeOut, type INTEGER, SINGLE VALUE
-attributetype ( ftAtId:6
- NAME 'ftTimeOut'
- DESC 'Fortress TimeOut'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-# A7: Group Names, type STRING, MULTI VALUE
-attributetype ( ftAtId:7
- NAME 'ftGroups'
- DESC 'Fortress Group Names'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A8: Role Names, type STRING, MULTI VALUE
-attributetype ( ftAtId:8
- NAME 'ftRoles'
- DESC 'Fortress Role Names'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A9: User IDs, type STRING, MULTI VALUE
-attributetype ( ftAtId:9
- NAME 'ftUsers'
- DESC 'Fortress User IDs'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A10: Properties, type STRING, MULTI VALUE
-attributetype ( ftAtId:10
- NAME 'ftProps'
- DESC 'Fortress Properties'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A11: Type Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:11
- NAME 'ftType'
- DESC 'Fortress Type Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A12: Unique ID, type STRING, SINGLE VALUE
-attributetype ( ftAtId:12
- NAME 'ftId'
- DESC 'Fortress Entity Unique ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A13: User Temporal Constraint, type STRING, SINGLE VALUE
-attributetype ( ftAtId:13
- NAME 'ftCstr'
- DESC 'Fortress User Temporal Constraint'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A14: User Role Assignments, type STRING, MULTI VALUE
-attributetype ( ftAtId:14
- NAME 'ftRA'
- DESC 'Fortress User Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A15: User Role Constraints, type STRING, MULTI VALUE
-attributetype ( ftAtId:15
- NAME 'ftRC'
- DESC 'Fortress User Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A16: Separation of Duties Set Name, type STRING, SINGLE VALUE
-attributetype ( ftAtId:16
- NAME 'ftSetName'
- DESC 'Fortress Separation of Duties Set Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A17: Separation of Duties Set Cardinality, type INTEGER, SINGLE VALUE
-attributetype ( ftAtId:17
- NAME 'ftSetCardinality'
- DESC 'Fortress Separation of Duties Set Cardinality'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-# A18: Child to Parent Relationships, type STRING, MULTI VALUE
-attributetype ( ftAtId:18
- NAME 'ftRels'
- DESC 'Fortress Child to Parent Relationships'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A19: User Organizational Unit Pool, type STRING, MULTI VALUE
-attributetype ( ftAtId:19
- NAME 'ftOSU'
- DESC 'Fortress User Organizational Unit Pool'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A20: Permission Organizational Unit Pool, type STRING, MULTI VALUE
-attributetype ( ftAtId:20
- NAME 'ftOSP'
- DESC 'Fortress Permission Organizational Unit Pool'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A21: Admin Role Constraints, type STRING, MULTI VALUE
-attributetype ( ftAtId:21
- NAME 'ftARC'
- DESC 'Fortress Admin Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A22: Admin Role Assignments, type STRING, MULTI VALUE
-attributetype ( ftAtId:22
- NAME 'ftARA'
- DESC 'Fortress Admin Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A23: Role Hierarchy Range, type STRING
-attributetype ( ftAtId:23
- NAME 'ftRange'
- DESC 'Fortress Role Hierarchy Range'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A24: Audit Modifier Internal UserID, type STRING, SINGLE VALUE
-attributetype ( ftAtId:24
- NAME 'ftModifier'
- DESC 'Fortress Audit Modifier Internal UserID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A25: Audit Modifier Operation Code, type STRING, SINGLE VALUE
-attributetype ( ftAtId:25
- NAME 'ftModCode'
- DESC 'Fortress Audit Modifier Operation Code'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A26: Audit Modifier Unique ID, type STRING, SINGLE VALUE
-attributetype ( ftAtId:26
- NAME 'ftModId'
- DESC 'Fortress Audit Modifier Unique ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A27: System User Flag, type BOOLEAN
-attributetype ( ftAtId:27
- NAME 'ftSystem'
- DESC 'Fortress System User'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-
-# A28: Parent Nodes, type STRING, MULTI VALUE
-attributetype ( ftAtId:28
- NAME 'ftParents'
- DESC 'Fortress Parent Nodes'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A29: Protocol, type STRING, MULTI VALUE
-attributetype ( ftAtId:29
- NAME 'configProtocol'
- DESC 'LDAP Group protocol attribute'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A30: Config params, type STRING, MULTI VALUE
-attributetype ( ftAtId:30
- NAME 'configParameter'
- DESC 'LDAP Group config properties'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A31: User Role Constraints, type STRING, MULTI VALUE
-attributetype ( ftAtId:31
- NAME 'ftPA'
- DESC 'Fortress Permission Attribute Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A32: User Role Constraints, type STRING, MULTI VALUE
-attributetype ( ftAtId:32
- NAME 'ftPASet'
- DESC 'Fortress Permission Attribute Set'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# A33: User Role Constraints, type STRING, SINGLE VALUE
-attributetype ( ftAtId:33
- NAME 'ftPADefaultOperator'
- DESC 'Fortress Permission Attribute Set Default Operator'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A34: User Role Constraints, type STRING, SINGLE VALUE
-attributetype ( ftAtId:34
- NAME 'ftPASetType'
- DESC 'Fortress Permission Attribute Set Type'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A35: Permission Attribute Data Type, type STRING, SINGLE VALUE
-attributetype ( ftAtId:35
- NAME 'ftPADataType'
- DESC 'Fortress Permission Attribute Data Type'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A36: Permission Attribute Default Value, type STRING, SINGLE VALUE
-attributetype ( ftAtId:36
- NAME 'ftPADefaultValue'
- DESC 'Fortress Permission Attribute Set Default Value'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A37: Permission Attribute Default Strategy, type STRING, SINGLE VALUE
-attributetype ( ftAtId:37
- NAME 'ftPADefaultStrategy'
- DESC 'Fortress Permission Attribute Default Strategy'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-# A38: Permission Attribute Valid Values, type STRING, MULTI VALUE
-attributetype ( ftAtId:38
- NAME 'ftPAValidVals'
- DESC 'Fortress Permission Attribute Valid Values'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-######################################################################
-## 2. OpenLDAP Fortress Structural object class definitions
-######################################################################
-
-## OC1: Fortress Roles Structural Object Class
-objectclass ( ftObId:1
- NAME 'ftRls'
- DESC 'Fortress Role Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- ftId $
- ftRoleName
- )
- MAY (
- description $
- ftCstr $
- ftParents
- )
- )
-
-## OC2: Fortress Permission Structural Object Class
-objectclass ( ftObId:2
- NAME 'ftObject'
- DESC 'Fortress Permission Object Class'
- SUP organizationalunit
- STRUCTURAL
- MUST (
- ftId $
- ftObjNm
- )
- MAY (
- ftType
- )
- )
-
-## OC3: Fortress Operation Structural Object Class
-objectclass ( ftObId:3
- NAME 'ftOperation'
- DESC 'Fortress Permission Operation Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- ftId $
- ftPermName $
- ftObjNm $
- ftOpNm
- )
- MAY (
- ftObjId $
- ftRoles $
- ftUsers $
- ftType $
- ftPASet
- )
- )
-
-## OC4: Fortress Static Separation of Duties Structural Object Class
-objectclass ( ftObId:4
- NAME 'ftSSDSet'
- DESC 'Fortress Role Static Separation of Duty Set Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- ftId $
- ftSetName $
- ftSetCardinality
- )
- MAY (
- ftRoles $
- description
- )
- )
-
-## OC5: Fortress Dynamic Separation of Duties Structural Object Class
-objectclass ( ftObId:5
- NAME 'ftDSDSet'
- DESC 'Fortress Role Dynamic Separation of Duty Set Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- ftId $
- ftSetName $
- ftSetCardinality
- )
- MAY (
- ftRoles $
- description
- )
- )
-
-## OC6: Fortress Organizational Structural Object Class
-objectclass ( ftObId:6
- NAME 'ftOrgUnit'
- DESC 'Fortress OrgUnit Structural Object Class'
- SUP organizationalunit
- STRUCTURAL
- MUST (
- ftId
- )
- MAY (
- ftParents
- )
- )
-
-## OC7: Fortress Hierarchies Structural Object Class
-objectclass ( ftObId:7
- NAME 'ftHier'
- DESC 'Fortress Hierarchy Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- cn
- )
- MAY (
- ftRels $
- description
- )
- )
-
-## OC8: LDAP Configuration Group Structural Object Class
-objectClass ( ftObId:8
- NAME 'configGroup'
- DESC 'LDAP Configuration Group'
- SUP groupOfNames
- MUST (
- configProtocol $
- ftType
- )
- MAY (
- configParameter $
- ftProps
- )
- )
-
-## OC9: Fortress Permission Attribute Set Structural Object Class
-objectclass ( ftObId:9
- NAME 'ftAttributeSet'
- DESC 'Fortress Attribute Set Structural Object Class'
- SUP organizationalunit
- STRUCTURAL
- MUST (
- ftId $
- ftPASet $
- cn
- )
- MAY (
- ftPA $
- ftPASetType $
- description
- )
- )
-
-## OC10: Fortress Permission Attribute Structural Object Class
-objectclass ( ftObId:10
- NAME 'ftAttribute'
- DESC 'Fortress Attribute Structural Object Class'
- SUP organizationalrole
- STRUCTURAL
- MUST (
- ftId $
- ftPASet $
- ftPA $
- cn
- )
- MAY (
- ftPADataType $
- ftPADefaultValue $
- ftPADefaultStrategy $
- ftPADefaultOperator $
- ftPAValidVals $
- description
- )
- )
-
-######################################################################
-## 3. OpenLDAP Fortress Auxiliary object class definitions
-######################################################################
-
-## AC1: Fortress User Attributes Auxiliary Object Class
-objectclass ( ftAxId:1
- NAME 'ftUserAttrs'
- DESC 'Fortress User Attribute AUX Object Class'
- AUXILIARY
- MUST (
- ftId
- )
- MAY (
- ftRC $
- ftRA $
- ftARC $
- ftARA $
- ftCstr $
- ftSystem
- )
- )
-
-## AC2: Fortress Properties Auxiliary Object Class
-objectclass ( ftAxId:2
- NAME 'ftProperties'
- DESC 'Fortress Properties AUX Object Class'
- AUXILIARY
- MAY (
- ftProps
- )
- )
-
-## AC3: Fortress Organizational Pools Auxiliary Object Class
-objectclass ( ftAxId:3
- NAME 'ftPools'
- DESC 'Fortress Pools AUX Object Class'
- AUXILIARY
- MAY (
- ftOSU $
- ftOSP $
- ftRange
- )
- )
-
-## AC4: Fortress Audit Modification Auxiliary Object Class
-objectclass ( ftAxId:4
- NAME 'ftMods'
- DESC 'Fortress Modifiers AUX Object Class'
- AUXILIARY
- MAY (
- ftModifier $
- ftModCode $
- ftModId
- )
- )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/rbac.schema
----------------------------------------------------------------------
diff --git a/docker/rbac.schema b/docker/rbac.schema
deleted file mode 100644
index f77179d..0000000
--- a/docker/rbac.schema
+++ /dev/null
@@ -1,261 +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.
-#
-######################################################################
-### RBAC Accelerator Schema version 1.0.0.RC34
-### This schema is required for OoenLDAP slapo-rbac (accelerator) overlay
-### Not required for fortress-core (only) deployments.
-######################################################################
-
-objectIdentifier RBAC OpenLDAProot:1000
-objectIdentifier RBACattributeType RBAC:3
-objectIdentifier RBACobjectClass RBAC:4
-
-######################################################################
-## 1. RBAC attribute definitions
-######################################################################
-#
-## A1: rbacSessid, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:1
- NAME 'rbacSessid'
- DESC 'RBAC Session ID'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-## A2: rbacRoles, type STRING, MULTI VALUE
-attributetype ( RBACattributeType:2
- NAME 'rbacRoles'
- DESC 'RBAC User Role Assignments'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-
-## A3: User Role Constraints, type STRING, MULTI VALUE
-attributetype ( RBACattributeType:3
- NAME 'rbacRoleConstraints'
- DESC 'RBAC User Role Constraints'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A4: rbacUserdn, type STRING, SINGLE VALUE
-## A4: should be DN syntax
-attributetype ( RBACattributeType:4
- NAME 'rbacUserDN'
- DESC 'RBAC User DN'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-#
-## A5: Permission Operation Name, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:5
- NAME 'rbacOpName'
- DESC 'RBAC Permission Operation Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-##
-## A6: Permission Object Name, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:6
- NAME 'rbacObjName'
- DESC 'RBAC Permission Object Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-#
-## A4: Permission Object ID, type STRING, SINGLE VALUE
-#attributetype ( 1.3.6.1.4.1.1.38088.1.4
-# NAME 'ftObjId'
-# DESC 'Fortress Permission Object ID'
-# EQUALITY caseIgnoreMatch
-# SUBSTR caseIgnoreSubstringsMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-#
-#
-## A5: Role Name, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:7
- NAME 'rbacRoleName'
- DESC 'RBAC Role Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-
-## A6: tenant id, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:8
- NAME 'tenantid'
- DESC 'RBAC tenant id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-
-## A7: Audit operation id, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:9
- NAME 'rbacAuditOp'
- DESC 'RBAC operation id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-## A8: Audit roles, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:10
- NAME 'rbacAuditRoles'
- DESC 'RBAC Roles in a session '
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A9: Audit requested roles, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:11
- NAME 'rbacAuditRequestedRoles'
- DESC 'RBAC Roles in a request'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A10: Audit resources, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:12
- NAME 'rbacAuditResources'
- DESC 'RBAC audit resources'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A11: Audit result, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:13
- NAME 'rbacAuditResult'
- DESC 'RBAC operation result'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-## A12: Audit properties, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:14
- NAME 'rbacAuditProperties'
- DESC 'RBAC operation result'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A13: Audit properties, type STRING, SINGLE VALUE
-attributetype ( RBACattributeType:15
- NAME 'rbacAuditTimestamp'
- DESC 'RBAC audit timestamp'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-## A14: Audit messages, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:16
- NAME 'rbacAuditMessages'
- DESC 'RBAC audit messages'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A15: Audit Objects, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:17
- NAME 'rbacAuditObjects'
- DESC 'RBAC audit objects'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-## A16: Audit Operations, type STRING, MULTIPLE VALUES
-attributetype ( RBACattributeType:18
- NAME 'rbacAuditOperations'
- DESC 'RBAC audit operations'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( RBACattributeType:19
- NAME 'rbacAuditId'
- DESC 'RBAC audit id'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-
-
-#
-#######################################################################
-### 2. ObjectClasses
-#######################################################################
-#
-
-objectclass ( RBACobjectClass:1
- NAME 'rbacSession'
- DESC 'RBAC Session Object Class'
- STRUCTURAL
- MUST (
- rbacSessid $
- uid $
- tenantid
- )
- MAY (
- rbacUserdn $
- rbacRoles $
- rbacRoleConstraints
- )
- )
-
-objectclass ( RBACobjectClass:2
- NAME 'rbacPermission'
- DESC 'RBAC Permission Object Class'
- STRUCTURAL
- MAY (
- rbacRoles $
- rbacObjName $
- rbacOpName $
- uid
- )
- )
-
-objectclass ( RBACobjectClass:3
- NAME 'rbacAudit'
- DESC 'RBAC Audit Object Class'
- STRUCTURAL
- MAY (
- uid $
- rbacAuditId $
- rbacSessid $
- rbacAuditOp $
- rbacAuditRoles $
- rbacAuditRequestedRoles $
- rbacAuditObjects $
- rbacAuditOperations $
- rbacAuditResult $
- rbacAuditResources $
- rbacAuditProperties $
- rbacAuditTimestamp $
- rbacAuditMessages
- )
- )
-
-objectclass ( RBACobjectClass:4
- NAME 'rbacContainer'
- DESC 'RBAC Container Object Class'
- STRUCTURAL
- MAY (
- cn
- )
- )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53605d44/docker/run-tests.sh
----------------------------------------------------------------------
diff --git a/docker/run-tests.sh b/docker/run-tests.sh
deleted file mode 100755
index 4ad5497..0000000
--- a/docker/run-tests.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-# stop execution if any command fails (i.e. exits with status code > 0)
-set -e
-
-# trace commands
-set -x
-
-# startup docker container
-CONTAINER_ID=$(docker run -d -P apachedirectory/openldap-for-apache-fortress-tests)
-CONTAINER_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "389/tcp") 0).HostPort}}' $CONTAINER_ID)
-echo $CONTAINER_PORT
-
-# configure build.properties
-cp build.properties.example build.properties
-sed -i 's/^ldap\.server\.type=.*/ldap.server.type=openldap/' build.properties
-sed -i 's/^ldap\.host=.*/ldap.host=localhost/' build.properties
-sed -i 's/^ldap\.port=.*/ldap.port='${CONTAINER_PORT}'/' build.properties
-sed -i 's/^suffix\.name=.*/suffix.name=openldap/' build.properties
-sed -i 's/^suffix\.dc=.*/suffix.dc=org/' build.properties
-sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
-sed -i 's/^root\.pw=.*/root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU/' build.properties
-sed -i 's/^cfg\.root\.pw=.*/cfg.root.pw=secret/' build.properties
-sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
-
-# prepare
-mvn clean install
-mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml
-mvn install -Dload.file=./ldap/setup/DelegatedAdminManagerLoad.xml
-
-# run tests
-mvn test -Dtest=FortressJUnitTest
-
-# rerun tests to verify teardown APIs work
-mvn test -Dtest=FortressJUnitTest
-
-# stop and delete docker container
-docker stop $CONTAINER_ID
-docker rm $CONTAINER_ID
-