COM-111 - RC39 Release
diff --git a/pom.xml b/pom.xml
index 3f35950..ac4b177 100755
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.openldap</groupId>
<artifactId>commander</artifactId>
<packaging>war</packaging>
- <version>1.0-RC38</version>
+ <version>1.0-RC39</version>
<name>Fortress Commander</name>
<url>http://www.openldap.org/fortress/</url>
<description>Commander is an ANSI RBAC INCITS 359 compliant administrative Web UI</description>
@@ -73,13 +73,13 @@
<roles>
<role>Developer</role>
</roles>
- <organization>jts.us</organization>
+ <organization>symas.com</organization>
<timezone>-5</timezone>
</developer>
</developers>
<properties>
- <version>1.0-RC38</version>
+ <version>1.0-RC39</version>
<title>${name} ${version}</title>
<wicket.version>6.16.0</wicket.version>
<wicket.jquery.version>6.16.0</wicket.jquery.version>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.openldap</groupId>
<artifactId>sentry</artifactId>
- <version>${version}</version>
+ <version>1.0-RC39a</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -540,4 +540,12 @@
</build>
</profile>
</profiles>
+
+ <repositories>
+ <repository>
+ <id>maven2</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ </repositories>
+
</project>
\ No newline at end of file
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 1b824a0..cd30c72 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -88,7 +88,7 @@
<property name="targetMethod" value="putAll"/>
<property name="arguments">
<util:properties>
- <prop key="version">1.0-RC38</prop>
+ <prop key="version">1.0-RC39</prop>
</util:properties>
</property>
</bean>
diff --git a/src/main/resources/fortress.properties b/src/main/resources/fortress.properties
index e16102f..c8e858d 100644
--- a/src/main/resources/fortress.properties
+++ b/src/main/resources/fortress.properties
@@ -19,13 +19,19 @@
# These credentials are used for read/write access to all nodes under suffix:
admin.user=cn=Manager,dc=openldap,dc=org
-# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
-admin.pw=W7T0G9hylKZQ4K+DF8gfgA==
+admin.pw=secret
# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
min.admin.conn=1
max.admin.conn=10
+# Used for SSL Connection to LDAP Server:
+#enable.ldap.ssl=true
+#enable.ldap.ssl.debug=true
+#trust.store=/fully/qualified/path/and/file/name/to/java/truststore
+#trust.store.password=changeit
+#trust.store.set.prop=true
+
# This node contains fortress properties stored on behalf of connecting LDAP clients:
config.realm=DEFAULT
config.root=ou=Config,dc=openldap,dc=org
@@ -36,8 +42,6 @@
# Default for pool reconnect flag is false:
enable.pool.reconnect=true
-crypto.prop=abcd12345
-
ehcache.config.file=ehcache.xml
perms.cached=true
diff --git a/src/test/java/org/openldap/commander/StartExamples.java b/src/test/java/org/openldap/commander/StartExamples.java
index e6be46d..64eb96d 100644
--- a/src/test/java/org/openldap/commander/StartExamples.java
+++ b/src/test/java/org/openldap/commander/StartExamples.java
@@ -44,7 +44,7 @@
Server server = new Server();
SocketConnector connector = new SocketConnector();
- System.setProperty("version", "1.0-RC38");
+ System.setProperty("version", "1.0-RC39");
// Set some timeout options to make debugging easier.
connector.setMaxIdleTime(1000 * 60 * 60);
diff --git a/src/test/java/org/openldap/commander/integration/CommanderSeleniumITCase.java b/src/test/java/org/openldap/commander/integration/CommanderSeleniumITCase.java
index adfb5b3..8def3b2 100644
--- a/src/test/java/org/openldap/commander/integration/CommanderSeleniumITCase.java
+++ b/src/test/java/org/openldap/commander/integration/CommanderSeleniumITCase.java
@@ -54,8 +54,10 @@
// tomcat default:
baseUrl = "http://localhost:8080";
+ //baseUrl = "http://fortressdemo2.com:8080";
// tomcat SSL:
- //baseUrl = "https://localhost:8444";
+ //baseUrl = "https://localhost:8443";
+ //baseUrl = "https://fortressdemo2.com:8443";
driver.manage().timeouts().implicitlyWait( 5, TimeUnit.SECONDS );
}
