Return-Path: <commits-return-46944-archive-asf-public=cust-asf.ponee.io@directory.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 5E2FC200BAD
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 11 Oct 2016 04:16:57 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 5CA9F160AEB; Tue, 11 Oct 2016 02:16:57 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id A1299160AE1
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 11 Oct 2016 04:16:56 +0200 (CEST)
Received: (qmail 11823 invoked by uid 500); 11 Oct 2016 02:16:55 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 11814 invoked by uid 99); 11 Oct 2016 02:16:55 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2016 02:16:55 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 986AADFFD8; Tue, 11 Oct 2016 02:16:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: smckinney@apache.org
To: commits@directory.apache.org
Message-Id: <06a0464497c148ffa0f977399fd2f1e4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: directory-fortress-commander git commit: change to version
 2.0.0-RC1-SNAPSHOT
Date: Tue, 11 Oct 2016 02:16:55 +0000 (UTC)
archived-at: Tue, 11 Oct 2016 02:16:57 -0000

Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master b247605a4 -> 8437be33e


change to version 2.0.0-RC1-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/8437be33
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/8437be33
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/8437be33

Branch: refs/heads/master
Commit: 8437be33e6152ac066e27702c121405c132301c1
Parents: b247605
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Oct 10 20:55:32 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Oct 10 20:55:32 2016 -0500

----------------------------------------------------------------------
 pom.xml                                                     | 4 ++--
 src/main/resources/applicationContext.xml                   | 9 ++++++++-
 .../org/apache/directory/fortress/web/StartExamples.java    | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/8437be33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ce3c50e..e0187de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <groupId>org.apache.directory.fortress</groupId>
   <artifactId>fortress-web</artifactId>
   <packaging>war</packaging>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>2.0.0-RC1-SNAPSHOT</version>
   <name>Apache Fortress Web</name>
   <url>http://directory.apache.org/fortress/</url>
   <description>Fortress Web is an administrative UI that drives the APIs</description>
@@ -87,7 +87,7 @@
 
   <properties>
     <title>${project.name} ${project.version}</title>
-    <fortress.realm.version>1.0.2-SNAPSHOT</fortress.realm.version>
+    <fortress.realm.version>2.0.0-RC1-SNAPSHOT</fortress.realm.version>
     <wicket.version>7.4.0</wicket.version>
     <wicket.jquery.version>7.4.0</wicket.jquery.version>
     <wicket.kendo-ui.version>7.4.0</wicket.kendo-ui.version>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/8437be33/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index a36449b..dbe15af 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -76,8 +76,15 @@
     </bean>
     <!-- TODO: after the realm 1.0.2 release pass the contextId here.  -->
     <bean id="j2eePolicyMgr" class="org.apache.directory.fortress.realm.J2eePolicyMgrFactory" scope="prototype"
+          factory-method="createInstance">
+        <constructor-arg value="${contextId:HOME}"/>
+    </bean>
+    <!-- no longer used:
+    <bean id="j2eePolicyMgr" class="org.apache.directory.fortress.realm.J2eePolicyMgrFactory" scope="prototype"
           factory-method="createInstance"/>
+    -->
 
+    <!-- This decl is to build uri for navigating to correct fortress-rest impl (iff rest enabled in fortress.properties)  -->
     <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
         <property name="targetObject">
             <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
@@ -88,7 +95,7 @@
         <property name="targetMethod" value="putAll"/>
         <property name="arguments">
             <util:properties>
-                <prop key="version">1.0.1</prop>
+                <prop key="version">2.0.0-RC1-SNAPSHOT</prop>
             </util:properties>
         </property>
     </bean>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/8437be33/src/test/java/org/apache/directory/fortress/web/StartExamples.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/web/StartExamples.java b/src/test/java/org/apache/directory/fortress/web/StartExamples.java
index bf8e2d3..a805978 100644
--- a/src/test/java/org/apache/directory/fortress/web/StartExamples.java
+++ b/src/test/java/org/apache/directory/fortress/web/StartExamples.java
@@ -51,7 +51,8 @@ public class StartExamples
 		Server server = new Server();
 		SocketConnector connector = new SocketConnector();
 
-        System.setProperty("version", "1.0.1");
+		// fortress-rest navigation (iff enabled in fortress.properties)
+        System.setProperty("version", "2.0.0-RC1-SNAPSHOT");
         System.setProperty( GlobalIds.IS_JETTY_SERVER, "true");
 
 		// Set some timeout options to make debugging easier.