EN-18 - RC37 Release
diff --git a/pom.xml b/pom.xml
index a62ed55..e9242ae 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.openldap</groupId>
<artifactId>enmasse</artifactId>
<packaging>war</packaging>
- <version>1.0-RC36</version>
+ <version>1.0-RC37</version>
<name>Fortress EnMasse</name>
<url>http://www.openldap.org/fortress/</url>
<description>EnMasse is a Web application that provides a RESTful implementation of Fortress' ANSI RBAC INCITS 359 engine.</description>
@@ -71,7 +71,7 @@
<properties>
<!-- leave this hardcoded, else get cyclic version error from maven -->
- <version>1.0-RC36</version>
+ <version>1.0-RC37</version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
<spring.version>3.0.4.RELEASE</spring.version>
<java.version>1.7</java.version>
@@ -92,7 +92,7 @@
<!-- Fortress -->
<dependency>
<groupId>org.openldap</groupId>
- <artifactId>fortress</artifactId>
+ <artifactId>sentry</artifactId>
<version>${version}</version>
</dependency>
<!-- EnMasse Dependencies -->
@@ -199,6 +199,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
+ <!-- this is needed to pickup the context.xml in META-INF: -->
+ <configuration>
+ <warName>${project.artifactId}</warName>
+ <archive>
+ <manifest>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.basedir}/src/main/resources
+ </directory>
+
+ </resource>
+ </webResources>
+ </configuration>
+
</plugin>
<plugin>
@@ -244,6 +262,7 @@
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.0-beta-1</version>
<configuration>
+ <warFile>target/${project.artifactId}.war</warFile>
<server>local-tomcat</server>
<url>http://localhost:8080/manager/html</url>
<path>/enmasse-${version}</path>
diff --git a/src/main/resources/META-INF/context.xml b/src/main/resources/META-INF/context.xml
new file mode 100644
index 0000000..efcb9b4
--- /dev/null
+++ b/src/main/resources/META-INF/context.xml
@@ -0,0 +1,11 @@
+<Context path="/commander" reloadable="true">
+
+ <Realm className="org.openldap.sentry.tomcat.Tc7AccessMgrProxy"
+ debug="0"
+ resourceName="UserDatabase"
+ defaultRoles=""
+ containerType="TomcatContext"
+ realmClasspath=""
+ />
+
+</Context>
\ No newline at end of file
diff --git a/src/main/resources/fortress.properties b/src/main/resources/fortress.properties
index ee88fa1..02e7ea6 100644
--- a/src/main/resources/fortress.properties
+++ b/src/main/resources/fortress.properties
@@ -7,7 +7,7 @@
port=389
# These credentials are used for read/write access to all nodes under suffix:
-admin.user=cn=Manager,dc=jts,dc=us
+admin.user=cn=Manager,dc=openldap,dc=org
# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
admin.pw=W7T0G9hylKZQ4K+DF8gfgA==
@@ -17,7 +17,7 @@
# This node contains fortress properties stored on behalf of connecting LDAP clients:
config.realm=DEFAULT
-config.root=ou=Config,dc=jts,dc=us
+config.root=ou=Config,dc=openldap,dc=org
# enable this to see trace statements when connection pool allocates new connections:
debug.ldap.pool=true
