From 5c1f5877cdfc17b0d0802924f612a883967047fd Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 7 Feb 2015 19:04:12 +0000
Subject: [PATCH] Adapt to Argeo TP v2.1.6

git-svn-id: https://svn.argeo.org/commons/trunk@7761 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo_node_cms.properties         |  1 -
 demo/argeo_node_rap.properties         |  2 +-
 org.argeo.eclipse.ui.workbench/bnd.bnd |  7 +++---
 org.argeo.security.ui.rap/plugin.xml   | 30 +++-----------------------
 org.argeo.security.ui/plugin.xml       |  8 -------
 pom.xml                                | 17 ++++++++++++---
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/demo/argeo_node_cms.properties b/demo/argeo_node_cms.properties
index d7a9ead01..99558e02d 100644
--- a/demo/argeo_node_cms.properties
+++ b/demo/argeo_node_cms.properties
@@ -19,5 +19,4 @@ org.osgi.service.http.port=7070
 org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
 log4j.configuration=file:../../log4j.properties
-osgi.console.enable.builtin=true
 org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
diff --git a/demo/argeo_node_rap.properties b/demo/argeo_node_rap.properties
index 49c4108c9..768976ec1 100644
--- a/demo/argeo_node_rap.properties
+++ b/demo/argeo_node_rap.properties
@@ -20,5 +20,5 @@ argeo.i18n.availableLocales=en,fr,de,ru,ar
 eclipse.registry.MultiLanguage=true
 
 log4j.configuration=file:../../log4j.properties
-osgi.console.enable.builtin=true
+#osgi.console.enable.builtin=true
 org.eclipse.rap.workbenchAutostart=false
\ No newline at end of file
diff --git a/org.argeo.eclipse.ui.workbench/bnd.bnd b/org.argeo.eclipse.ui.workbench/bnd.bnd
index cc95c7652..e2e226812 100644
--- a/org.argeo.eclipse.ui.workbench/bnd.bnd
+++ b/org.argeo.eclipse.ui.workbench/bnd.bnd
@@ -8,10 +8,11 @@ org.eclipse.rap.ui;resolution:=optional,\
 org.eclipse.rap.ui.workbench;resolution:=optional
 
 Import-Package: org.argeo.eclipse.ui.specific,\
-org.eclipse.swt.widgets;version="[0,1)",\
-org.osgi.framework;version="[1.5,2)",\
+org.eclipse.swt.widgets,\
+org.osgi.framework,\
 org.osgi.service.packageadmin,\
-org.osgi.util.tracker;version="[1.4,2)",\
+org.osgi.util.tracker,\
 org.springframework.beans.factory,\
 org.springframework.core.io.support,\
+!org.eclipse.core.runtime,\
 *
diff --git a/org.argeo.security.ui.rap/plugin.xml b/org.argeo.security.ui.rap/plugin.xml
index 080cd5ca7..a4d007367 100644
--- a/org.argeo.security.ui.rap/plugin.xml
+++ b/org.argeo.security.ui.rap/plugin.xml
@@ -70,30 +70,8 @@
 			file="theme/defaultExt.css" /> 
 	</extension> -->
 
-	<extension
-		point="org.eclipse.equinox.security.callbackHandlerMapping">
-		<callbackHandlerMapping
-            callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
-            configName="SPRING">
-		</callbackHandlerMapping>
-	</extension>
-	<extension
-		point="org.eclipse.equinox.security.callbackHandlerMapping">
-		<callbackHandlerMapping
-			callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
-			configName="NIX">
-		</callbackHandlerMapping>
-	</extension>
-	<extension
-         point="org.eclipse.equinox.security.callbackHandlerMapping">
-      <callbackHandlerMapping
-            callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
-            configName="SPRING_SECURITY_CONTEXT">
-      </callbackHandlerMapping>
-   </extension>
-
   <extension point="org.eclipse.ui.menus">
-    <!--       <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+    <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
         <toolbar id="org.argeo.security.ui.rap.userToolbar">
            <command
                  commandId="org.argeo.security.ui.rap.mainMenuCommand"
@@ -133,10 +111,8 @@
         </separator>-->
         <!--<command commandId="org.eclipse.ui.views.showView"/>-->
         <!--<command commandId="org.eclipse.ui.perspectives.showPerspective"/>-->
-        <!-- <command
-              commandId="org.eclipse.ui.file.exit"
-              icon="icons/exit.png"/>
-     </menuContribution> -->
+        <command commandId="org.eclipse.ui.file.exit" icon="icons/exit.png"/>
+     </menuContribution>
   </extension>
 
 	<!-- COMMANDS --> 
diff --git a/org.argeo.security.ui/plugin.xml b/org.argeo.security.ui/plugin.xml
index cb139d7b6..24fb40a44 100644
--- a/org.argeo.security.ui/plugin.xml
+++ b/org.argeo.security.ui/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <!-- Security -->
-   <extension
-         id="defaultLoginDialog"
-         name="Default Login Dialog"
-         point="org.eclipse.equinox.security.callbackHandler">
-      <callbackHandler
-            class="org.argeo.security.ui.dialogs.DefaultLoginDialog">
-      </callbackHandler>
-   </extension>
    <extension point="org.eclipse.ui.services">
         <sourceProvider
               provider="org.argeo.security.ui.RolesSourceProvider">
diff --git a/pom.xml b/pom.xml
index 041dc35b9..e10581b25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 		<version.argeo-commons>2.1.14-SNAPSHOT</version.argeo-commons>
 		<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
 		<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-		<version.argeo-distribution>2.1.5</version.argeo-distribution>
+		<version.argeo-distribution>2.1.6</version.argeo-distribution>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
 		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -276,7 +276,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.3</version>
+					<version>1.1.4</version>
 				</plugin>
 				<!-- Site -->
 				<plugin>
@@ -451,9 +451,20 @@ limitations under the License.
 	<profiles>
 		<profile>
 			<id>localrepo</id>
+			<repositories>
+				<repository>
+					<id>argeo-tp</id>
+					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
 			<distributionManagement>
 				<repository>
-					<id>localrepo</id>
+					<id>staging</id>
 					<name>Internal Release Repository</name>
 					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</repository>
-- 
2.30.2