FC-68 - RC30 Release
diff --git a/build.properties b/build.properties
index 7c78882..edd26f0 100644
--- a/build.properties
+++ b/build.properties
@@ -17,7 +17,7 @@
########################################################################
# Use this Fortress Core version:
-version=1.0-RC29
+version=1.0-RC30
# Enable local.mode property if your machine does not have connection to Internet and runtime dependencies have already downloaded to FORTRESS_HOME/lib folder on this machine:
#local.mode=true
@@ -125,7 +125,6 @@
dflt.bdb.cache.idle.size=
log.bdb.cache.size=
-
#base.load.script=FortressDemoUsers.xml
# Do not change any params below this line unless you know what you are doing:
diff --git a/ivy.xml b/ivy.xml
index 22442f7..2052d1f 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -46,6 +46,7 @@
<dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M15" conf="default->master"/>
<!-- Fortress core source is NOT dependent on Sentry, EnMasse or Commander artifacts rather they're required for its QUICKSTART demo apps: -->
+<!--
<dependency org="us.joshuatreesoftware" name="sentry" rev="1.0-RC29" conf="default->master">
<artifact name="sentry" type="jar"/>
</dependency>
@@ -55,6 +56,7 @@
<dependency org="us.joshuatreesoftware" name="commander" rev="1.0-RC29" conf="default->master">
<artifact name="commander" type="jar"/>
</dependency>
+-->
</dependencies>
</ivy-module>
diff --git a/ldap/setup/demo-fortressproject-users.xml b/ldap/setup/demo-fortressproject-users.xml
index 9231f9d..99171d8 100644
--- a/ldap/setup/demo-fortressproject-users.xml
+++ b/ldap/setup/demo-fortressproject-users.xml
@@ -80,71 +80,71 @@
</addrole>
<delpermobj>
- <permobj objectName="Page1"/>
- <permobj objectName="Page2"/>
- <permobj objectName="Page3"/>
+ <permobj objectName="com.mycompany.Page1"/>
+ <permobj objectName="com.mycompany.Page2"/>
+ <permobj objectName="com.mycompany.Page3"/>
<permobj objectName="us.jts.fortress.rbac.AccessMgrImpl"/>
</delpermobj>
<addpermobj>
- <permobj objectName="Page1" description="Wicket Test Page 1" ou="WicketPerms" type="Page"/>
- <permobj objectName="Page2" description="Wicket Test Page 2" ou="WicketPerms" type="Page"/>
- <permobj objectName="Page3" description="Wicket Test Page 3" ou="WicketPerms" type="Page"/>
+ <permobj objectName="com.mycompany.Page1" description="Wicket Test Page 1" ou="WicketPerms" type="Page"/>
+ <permobj objectName="com.mycompany.Page2" description="Wicket Test Page 2" ou="WicketPerms" type="Page"/>
+ <permobj objectName="com.mycompany.Page3" description="Wicket Test Page 3" ou="WicketPerms" type="Page"/>
<permobj objectName="us.jts.fortress.rbac.AccessMgrImpl" description="Used to perform role activation functions" ou="WicketPerms" type="Page"/>
</addpermobj>
<delpermop>
- <permop objectName="Page1" opName="Button1"/>
- <permop objectName="Page1" opName="Button2"/>
- <permop objectName="Page1" opName="Button3"/>
- <permop objectName="Page2" opName="Button1"/>
- <permop objectName="Page2" opName="Button2"/>
- <permop objectName="Page2" opName="Button3"/>
- <permop objectName="Page3" opName="Button1"/>
- <permop objectName="Page3" opName="Button2"/>
- <permop objectName="Page3" opName="Button3"/>
+ <permop objectName="com.mycompany.Page1" opName="Button1"/>
+ <permop objectName="com.mycompany.Page1" opName="Button2"/>
+ <permop objectName="com.mycompany.Page1" opName="Button3"/>
+ <permop objectName="com.mycompany.Page2" opName="Button1"/>
+ <permop objectName="com.mycompany.Page2" opName="Button2"/>
+ <permop objectName="com.mycompany.Page2" opName="Button3"/>
+ <permop objectName="com.mycompany.Page3" opName="Button1"/>
+ <permop objectName="com.mycompany.Page3" opName="Button2"/>
+ <permop objectName="com.mycompany.Page3" opName="Button3"/>
<permop objectName="us.jts.fortress.rbac.AccessMgrImpl" opName="addActiveRole"/>
<permop objectName="us.jts.fortress.rbac.AccessMgrImpl" opName="dropActiveRole"/>
</delpermop>
<addpermop>
- <permop objectName="Page1" opName="Button1" type="Button"/>
- <permop objectName="Page1" opName="Button2" type="Button"/>
- <permop objectName="Page1" opName="Button3" type="Button"/>
- <permop objectName="Page2" opName="Button1" type="Button"/>
- <permop objectName="Page2" opName="Button2" type="Button"/>
- <permop objectName="Page2" opName="Button3" type="Button"/>
- <permop objectName="Page3" opName="Button1" type="Button"/>
- <permop objectName="Page3" opName="Button2" type="Button"/>
- <permop objectName="Page3" opName="Button3" type="Button"/>
+ <permop objectName="com.mycompany.Page1" opName="Button1" type="Button"/>
+ <permop objectName="com.mycompany.Page1" opName="Button2" type="Button"/>
+ <permop objectName="com.mycompany.Page1" opName="Button3" type="Button"/>
+ <permop objectName="com.mycompany.Page2" opName="Button1" type="Button"/>
+ <permop objectName="com.mycompany.Page2" opName="Button2" type="Button"/>
+ <permop objectName="com.mycompany.Page2" opName="Button3" type="Button"/>
+ <permop objectName="com.mycompany.Page3" opName="Button1" type="Button"/>
+ <permop objectName="com.mycompany.Page3" opName="Button2" type="Button"/>
+ <permop objectName="com.mycompany.Page3" opName="Button3" type="Button"/>
<permop objectName="us.jts.fortress.rbac.AccessMgrImpl" opName="addActiveRole" type="Button"/>
<permop objectName="us.jts.fortress.rbac.AccessMgrImpl" opName="dropActiveRole" type="Button"/>
</addpermop>
<delpermgrant>
- <permgrant objName="Page1" opName="Button1" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page1" opName="Button2" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page1" opName="Button3" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page2" opName="Button1" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page2" opName="Button2" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page2" opName="Button3" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page3" opName="Button1" roleNm="ROLE_TEST3"/>
- <permgrant objName="Page3" opName="Button2" roleNm="ROLE_TEST3"/>
- <permgrant objName="Page3" opName="Button3" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button1" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button2" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button3" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button1" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button2" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button3" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button1" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button2" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button3" roleNm="ROLE_TEST3"/>
<permgrant objName="us.jts.fortress.rbac.AccessMgrImpl" opName="addActiveRole" roleNm="ROLE_TEST1"/>
<permgrant objName="us.jts.fortress.rbac.AccessMgrImpl" opName="dropActiveRole" roleNm="ROLE_TEST1"/>
</delpermgrant>
<addpermgrant>
- <permgrant objName="Page1" opName="Button1" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page1" opName="Button2" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page1" opName="Button3" roleNm="ROLE_TEST1"/>
- <permgrant objName="Page2" opName="Button1" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page2" opName="Button2" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page2" opName="Button3" roleNm="ROLE_TEST2"/>
- <permgrant objName="Page3" opName="Button1" roleNm="ROLE_TEST3"/>
- <permgrant objName="Page3" opName="Button2" roleNm="ROLE_TEST3"/>
- <permgrant objName="Page3" opName="Button3" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button1" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button2" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page1" opName="Button3" roleNm="ROLE_TEST1"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button1" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button2" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page2" opName="Button3" roleNm="ROLE_TEST2"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button1" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button2" roleNm="ROLE_TEST3"/>
+ <permgrant objName="com.mycompany.Page3" opName="Button3" roleNm="ROLE_TEST3"/>
<permgrant objName="us.jts.fortress.rbac.AccessMgrImpl" opName="addActiveRole" roleNm="ROLE_TEST1"/>
<permgrant objName="us.jts.fortress.rbac.AccessMgrImpl" opName="dropActiveRole" roleNm="ROLE_TEST1"/>
</addpermgrant>
diff --git a/pom.xml b/pom.xml
index acd6f18..a726c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<artifactId>fortress</artifactId>
<packaging>jar</packaging>
<name>Fortress Core</name>
- <version>1.0-RC29</version>
+ <version>1.0-RC30</version>
<description>Fortress is a standards-based Identity and Access Management SDK.</description>
<url>http://jts.us</url>
