[DEECo] [d3scomp/JDEECo] 1ca0cc: Maven migration

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 1ca0cc86dabbae2aa253415341a9169d92116dd2
      https://github.com/d3scomp/JDEECo/commit/1ca0cc86dabbae2aa253415341a9169d92116dd2
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M .gitignore
    M build.xml
    M jdeeco-core/.classpath
    M jdeeco-core/.project
    M jdeeco-core/.settings/org.eclipse.jdt.core.prefs
    M jdeeco-core/META-INF/MANIFEST.MF
    M jdeeco-core/build.xml
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/TupleSpaceStateTest.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.jpf
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/MigrationEnsemble.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/ListComponent.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/Path.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/RobotFollowerComponent.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/RobotLeaderComponent.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/BookingEnsemble.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarId.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarPlanner.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarScheduleItem.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ObjectId.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingLot.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingLotScheduleItem.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingPlaceId.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Position.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Request.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/RequestResponseEnsemble.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Response.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ScheduleItem.java
    R jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/DEECoComponent.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/OutputParametersHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/SchedulableComponentProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/SchedulableEnsembleProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/TriggeredSchedulableProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/creators/IScheduleableProcessCreator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableComponentProcessCreator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableEnsembleProcessCreator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableProcessCreator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/RepositoryKnowledgeManagerHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/StructureHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/local/DeepCopy.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/KnowledgePath.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ParsedComponent.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/PreLauncherDEECoObjectProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ProcessInstantiator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/ProcessPeriodicSchedule.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/ProcessSchedule.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/ProcessTriggeredSchedule.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/ScheduleHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/SchedulerUtils.java
    M jdeeco-example-osgi/MigrationEnsembleOSGI/.classpath
    M jdeeco-example-osgi/NodeAOSGI/.classpath
    M jdeeco-example-osgi/NodeBOSGI/.classpath
    M jdeeco-sde/.classpath
    M jdeeco-sde/.project
    M jdeeco-sde/META-INF/MANIFEST.MF
    M jdeeco-sde/bin/cz/cuni/mff/d3s/deeco/sde/provider/OSGiBundleDEECoObjectProvider.class
    M jdeeco-sde/bin/cz/cuni/mff/d3s/deeco/sde/utils/AbstractProvidersHolder.class
    M jdeeco-sde/bin/cz/cuni/mff/d3s/deeco/sde/utils/Printer.class
    M jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/provider/OSGiBundleDEECoObjectProvider.java
    M jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/utils/AbstractProvidersHolder.java
    M jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/utils/Printer.java

  Log Message:
  -----------
  Maven migration


  Commit: 7e650271a507e78dfb6f696623c54a97aae1fbd6
      https://github.com/d3scomp/JDEECo/commit/7e650271a507e78dfb6f696623c54a97aae1fbd6
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    A .classpath
    M .gitignore
    A .project
    A .settings/org.eclipse.jdt.core.prefs
    A .settings/org.eclipse.m2e.core.prefs
    M build.xml
    A jdeeco-core/.settings/org.eclipse.m2e.core.prefs
    M jdeeco-core/build.xml
    A jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/RepositoryKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/local/TCCLObjectInputStream.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
    A jdeeco-demo/.classpath
    A jdeeco-demo/.project
    A jdeeco-demo/.settings/org.eclipse.jdt.core.prefs
    A jdeeco-demo/.settings/org.eclipse.m2e.core.prefs
    A jdeeco-demo/build.xml
    A jdeeco-demo/pom.xml
    A jdeeco-demo/runConfigurations/LocalCloudNoJPF.launch
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/TupleSpaceStateTest.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.jpf
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/MigrationEnsemble.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/ListComponent.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/Path.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotFollowerComponent.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotLeaderComponent.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/BookingEnsemble.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarId.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarPlanner.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/CarScheduleItem.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ObjectId.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingLot.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingLotScheduleItem.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ParkingPlaceId.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Position.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Request.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/RequestResponseEnsemble.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/Response.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/ScheduleItem.java
    A jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    A jpf/extension/gov/nasa/jpf/listener/CGLocations.java
    M jpf/jpf.properties
    A pom.xml

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

Conflicts:
	jdeeco-core/build.xml
	jdeeco-core/demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.jpf
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java


  Commit: 0fcef80a95247c1393890e3b8f587a0044a3aa8e
      https://github.com/d3scomp/JDEECo/commit/0fcef80a95247c1393890e3b8f587a0044a3aa8e
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M build.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/RepositoryKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
    M jdeeco-demo/build.xml
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.jpf

  Log Message:
  -----------
  Merging


Compare: https://github.com/d3scomp/JDEECo/compare/baae80a7c2dc...0fcef80a9524