[all] Version 2.6

Author: m.gond

workspace/fr.cnes.sitools.core/audit/sonar/sonar.properties

@@ -1,7 +1,7 @@
 #Project parameters
 sonar.projectKey=fr.cnes.sitools.2.0
 sonar.projectName=SITOOLS 2 BRANCHE 2.0
-sonar.projectVersion=2.5
+sonar.projectVersion=2.6
 #Source parameters
 sonar.sources=src
 sonar.binaries=build/classes

workspace/fr.cnes.sitools.core/conf/build/struct.xml

@@ -41,7 +41,7 @@
 	<property name="project.name"            value="fr.cnes.sitools.core"/>
 	<property name="project.test.name"		 value="fr.cnes.sitools.test"/>
 	<property name="project.fullname"        value="SITools2"/>
-	<property name="project.version"         value="2.5"/>
+	<property name="project.version"         value="2.6"/>
 
 	<!-- Nom de l'application WEB -->
 	<property name="webapps.name"            value="SITools2"/>

workspace/fr.cnes.sitools.core/conf/reference/sitools-reference.properties

@@ -1,5 +1,5 @@
 Starter.appName=SITools2
-Starter.VERSION=2.5
+Starter.VERSION=2.6
 Starter.BUILD_DATE=
 Starter.COPYRIGHT=Copyright 2010-2014 CNES
 

workspace/fr.cnes.sitools.ext.test/build/struct.xml

@@ -39,7 +39,7 @@
 	<!-- Informations generales sur le projet -->
 	<property name="project.name" 	value="fr.cnes.sitools.ext.test" />
 	<property name="project.fullname" value="Sitools2 fr.cnes.sitools.ext.test" />
-	<property name="project.version"         value="2.5"/>
+	<property name="project.version"         value="2.6"/>
 
 	<!-- Nom de l'application WEB -->
 	<property name="webapps.name" value="sitools" />

workspace/fr.cnes.sitools.extensions/build/struct.xml

@@ -35,7 +35,7 @@
 	<!-- Informations generales sur le projet -->
 	<property name="project.name" value="fr.cnes.sitools.extensions" />
 	<property name="project.fullname" value="Sitools2" />
-	<property name="project.version"         value="2.5"/>
+	<property name="project.version"         value="2.6"/>
 
 	<!-- Nom de l'application WEB -->
 	<property name="webapps.name" value="sitools" />

workspace/sitools-build/build.properties

@@ -11,12 +11,12 @@ ROOT_DIRECTORY=D\:/Projets/SITools2/core-v2
 
 project.title=SITools2
 #Nom de la version du projet
-project.tag=2.5
+project.tag=2.6
 project.name=fr.cnes.sitools.core
 fr.cnes.sitools.core.dir=../fr.cnes.sitools.core/
 
 project.fullname=SITools2
-project.version=2.5
+project.version=2.6
 author=AKKA Technologies
 owner=CNES
 year=2010-2014
@@ -28,19 +28,19 @@ Svn.tags.url=https://svn-06.akka.eu/svn/ULISSE_SAD/tags
 Svn.trunk.url=https://svn-06.akka.eu/svn/ULISSE_SAD/trunk
 
 # Tag a comparer
-Version.tag=v2.5
+Version.tag=v2.6
 
 # Tag de reference
-Version.reference=v2.4
+Version.reference=v2.5
 
 # Revisions are set to HEAD by default
 Revision.current=HEAD
 Revision.reference=HEAD
 
-project.tag.old=2.4.2
+project.tag.old=2.5
 
 git.repository.username=m.gond
-git.repository.password=mobi1986%
+git.repository.password=*********
 git.repository.url=http://${git.repository.username}:${git.repository.password}@odysseus1.akka.eu/git/SITools2_v2/SITools2.git
 git.repository.astro.url=http://${git.repository.username}:${git.repository.password}@odysseus1.akka.eu/git/SITools2_v2/SITools2_ext_astro.git
 git.repository.earthObservation.url=http://${git.repository.username}:${git.repository.password}@odysseus1.akka.eu/git/SITools2_v2/SITools2_ext_mapshup.git

workspace/sitools-build/files/README.txt

@@ -16,6 +16,28 @@ Reference tag                        : (2.5)
 
 2/ Changes
 
+_________________
+-2.6 (2015-10-22)
+
+    This version fixes some bugs from the 2.6 version.
+
+    * New features :
+        - Delete all authorizations associated to a role when deleting a role
+
+	* Enhancements :
+	    - Use real column name (alias or table name and column name) for sorting
+	    - Cart order creates a folder for each record in the generated archive
+
+	* Bug Fixed :
+	    - Problem with MODE_SERVER_OUTBOUND mode in ProxyApp.java #36
+        - Sort by alias dataset #23
+        - Tri colonne requête multiples jointures #18
+        - Reconnexion source de données MySQL #17
+        - Suppression d'un rôle #16
+        - Creation Dataset avec Criteria #6
+        - Scroll bar graph projet #5
+        - La mise en forme des forms de type desktop n'est pas respectée en 2.4.1 #3
+        - Authorizations are not removed when a role is deleted
 _________________
 -2.5 (2015-01-12)
 	* New features :

workspace/sitools-install-izpack/install.xml

@@ -27,7 +27,7 @@
 	<jar src="lib/hsqldb.jar" />
 	<info>
 		<appname>Sitools2</appname>
-		<appversion>2.5</appversion>
+		<appversion>2.6</appversion>
 		<authors>
 			<author email="" name="CNES" />
 			<author email="" name="Akka Technologies" />

workspace/sitools-test-izpack/install.xml

@@ -30,7 +30,7 @@
 	<jar src="install_res/libraries/mysql-connector-java-5.1.7-bin.jar" />
 	<info>
 		<appname>Sitools2 - Databases for tests</appname>
-		<appversion>2.5</appversion>
+		<appversion>2.6</appversion>
 		<authors>
 			<author email="" name="CNES" />
 			<author email="" name="Akka Technologies" />