Skip to content

Commit

Permalink
Prepare 1.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
debbabi committed Jul 10, 2015
1 parent 1f2c567 commit b0c7a71
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 46 deletions.
8 changes: 3 additions & 5 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
Changes form the 1.0.0 to 1.1.0.pre1
------------------------------------

Note: if you upgrade from 1.0.0 you should read REAME.md file to update your already created Cohorte Nodes (run configurations).
Changes form the 1.0.0 to 1.1.0
-------------------------------

** New Feature
* New "proxy" HTTP Service interface for each Node Composer [#34]
* New "debug" REST API [#33]
* New "debug" REST API [#33] (Java is not yet supported)
* New "cohorte-update" shell command [#29]
* New "Activity log" tab on Webadmin that tracks Cohorte's isolates activity [#21]
* New "Composition" tab on Webadmin that shows the application's composition specification [#21]
Expand Down
10 changes: 5 additions & 5 deletions DEPENDENCIES.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1.1.0.pre1
1.1.0

PYTHON DEPENDENCIES

- Cohorte-Python==1.0.1.dev
- Cohorte-Herald==0.0.4.dev
- Cohorte-Python==1.0.1
- Cohorte-Herald==0.0.4
- iPOPO==0.6.2
- jsonrpclib-pelix==0.2.5
- sleekxmpp>=1.3.1
Expand All @@ -14,6 +14,6 @@ JAVA DEPENDENCIES
- org.cohorte.utilities:org.cohorte.utilities:1.0.3
- org.cohorte.jabsorb:org.cohorte.jabsorb:1.1.0
- org.cohorte.remote:cohorte-remote-services:1.2.0
- org.cohorte.herald:cohorte-herald:0.0.4-SNAPSHOT
- org.cohorte.runtime:cohorte-runtime:1.0.1-SNAPSHOT
- org.cohorte.herald:cohorte-herald:0.0.4
- org.cohorte.runtime:cohorte-runtime:1.0.1
- ipojo 1.12.1
31 changes: 3 additions & 28 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,31 +1,6 @@
What are the changes to consider when you upgrade from 1.0.x to 1.1.x ?
=======================================================================
Cohorte Platform Distributions
==============================

When upgrading from Cohorte 1.0.x you should take in consideration these changes :
This repository contains scripts allowing the generation of the different Cohorte distributions (runtime).


Node Creation script (cohorte-create-node)
------------------------------------------

* ``--app-name`` => ``--composition-name`` (``-a`` => ``-c``) : Application's composition name
* new ``--app-id`` (``-a``) : application's ID


Startup script (cohorte-start-node)
-----------------------------------

From Cohorte 1.1, the following arguments where changed (and also their corresponding run.js entries):

* ``--web-admin`` => ``--http-port``
* ``--shell-admin`` => ``--shell-port``

By default the node starts without the console activated. To activate it on startup, you should add this argument:

* ``--console``

Run configuration files (e.g., run.js) also updates its content :

* ``application-id`` => ``app-id``
* ``web-admin`` => ``http-port``
* ``shell-admin`` => ``shell-port``

2 changes: 1 addition & 1 deletion bin/cohorte-version.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if "%COHORTE_HOME%" == "" (

echo --------------------------------------------------------------------
echo COHORTE
echo version : 1.0.1-dev
echo version : 1.0.1
echo home : %COHORTE_HOME%
echo --------------------------------------------------------------------
4 changes: 2 additions & 2 deletions build/scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Cohorte-Python==1.0.1.dev
Cohorte-Herald==0.0.4.dev
Cohorte-Python==1.0.1
Cohorte-Herald==0.0.4
iPOPO==0.6.2
jsonrpclib-pelix==0.2.5
sleekxmpp>=1.3.1
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cohorte.platforms</groupId>
<artifactId>cohorte</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
<packaging>pom</packaging>

<name>COHORTE Project ::: Platforms :: HOME </name>
Expand Down Expand Up @@ -53,15 +53,15 @@
<dependency>
<groupId>org.cohorte.runtime</groupId>
<artifactId>cohorte-runtime-package</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.1</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- cohorte-herald -->
<dependency>
<groupId>org.cohorte.herald</groupId>
<artifactId>cohorte-herald-package</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>0.0.4</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion repo/admin/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
ADMIN_REST_API_PATH = "admin/api/v2"

# VERSION
COHORTE_VERSION = "1.0.1.dev"
COHORTE_VERSION = "1.0.1"

"""
TODO: should have a local cache of all information.
Expand Down
2 changes: 1 addition & 1 deletion repo/debug/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
DEBUG_REST_API_VERSION = "v1"

# VERSION
COHORTE_VERSION = "1.0.1.dev"
COHORTE_VERSION = "1.0.1"


@ComponentFactory("cohorte-debug-api-factory")
Expand Down

0 comments on commit b0c7a71

Please sign in to comment.