[DEECo] [d3scomp/JDEECo] 09e437: Policy files polishing and minor other changes.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 09e43739d327ec5601eea083a2bc7d25b07f71d3
      https://github.com/d3scomp/JDEECo/commit/09e43739d327ec5601eea083a2bc7d25b07f71d3
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M .classpath
    M apache-river-config/jrmp-mahalo-group.config
    M apache-river-config/jrmp-outrigger-group.config
    M apache-river-config/jrmp-reggie.config
    M apache-river-config/mahalo.policy
    M apache-river-config/outrigger.policy
    M apache-river-config/reggie.policy
    M build.xml
    R demo/cz/cuni/mff/d3s/deeco/demo/Launcher.java
    A demo/cz/cuni/mff/d3s/deeco/demo/convoy/Launcher.java
    A lib/testng-6.5.1.jar
    M src/cz/cuni/mff/d3s/deeco/knowledge/Lookup.java
    M src/cz/cuni/mff/d3s/deeco/knowledge/TSUtils.java
    M src/cz/cuni/mff/d3s/deeco/knowledge/TransactionUtils.java
    M test/cz/cuni/mff/d3s/deeco/test/Test.java

  Log Message:
  -----------
  Policy files polishing and minor other changes.

Signed-off-by: Michal Kit <kit at d3s.mff.cuni.cz>


  Commit: 7126858eeec79ff7edb6d56db2fe7a54a6ef7f95
      https://github.com/d3scomp/JDEECo/commit/7126858eeec79ff7edb6d56db2fe7a54a6ef7f95
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M .gitignore
    M README.md
    A demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/BookingEnsemble.java
    M demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarPlanner.java
    A demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Launcher.java
    M demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingLot.java
    R demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ProcessOutHolder.java
    A demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/RequestResponseEnsemble.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:d3scomp/JDEECo

Conflicts:
	build.xml


Compare: https://github.com/d3scomp/JDEECo/compare/df9f16a...7126858