[DEECo] [d3scomp/JDEECo] a5914f: SDE Integration

GitHub noreply at github.com
Tue Sep 4 14:34:34 CEST 2012 

  Branch: refs/heads/master
  Home:   https://github.com/d3scomp/JDEECo
  Commit: a5914f8e4ebbcd84cd4b0e12a50368f5c4ae5b60
      https://github.com/d3scomp/JDEECo/commit/a5914f8e4ebbcd84cd4b0e12a50368f5c4ae5b60
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M .project
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/.classpath
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/.project
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/.settings/org.eclipse.jdt.core.prefs
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/.settings/org.eclipse.pde.core.prefs
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/META-INF/MANIFEST.MF
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/OSGI-INF/MigrationEnsembleOSGI.xml
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/bin/cz/cuni/mff/d3s/deeco/demo/cloud/MigrationEnsemble.class
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/build.properties
    A EXAMPLE-OSGi/MigrationEnsembleOSGI/src/cz/cuni/mff/d3s/deeco/demo/cloud/MigrationEnsemble.java
    A EXAMPLE-OSGi/NodeAOSGI/.classpath
    A EXAMPLE-OSGi/NodeAOSGI/.project
    A EXAMPLE-OSGi/NodeAOSGI/.settings/org.eclipse.jdt.core.prefs
    A EXAMPLE-OSGi/NodeAOSGI/.settings/org.eclipse.pde.core.prefs
    A EXAMPLE-OSGi/NodeAOSGI/META-INF/MANIFEST.MF
    A EXAMPLE-OSGi/NodeAOSGI/OSGI-INF/NodeAOSGI.xml
    A EXAMPLE-OSGi/NodeAOSGI/bin/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.class
    A EXAMPLE-OSGi/NodeAOSGI/build.properties
    A EXAMPLE-OSGi/NodeAOSGI/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.java
    A EXAMPLE-OSGi/NodeBOSGI/.classpath
    A EXAMPLE-OSGi/NodeBOSGI/.project
    A EXAMPLE-OSGi/NodeBOSGI/.settings/org.eclipse.jdt.core.prefs
    A EXAMPLE-OSGi/NodeBOSGI/.settings/org.eclipse.pde.core.prefs
    A EXAMPLE-OSGi/NodeBOSGI/META-INF/MANIFEST.MF
    A EXAMPLE-OSGi/NodeBOSGI/OSGI-INF/NodeBOSGI.xml
    A EXAMPLE-OSGi/NodeBOSGI/bin/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.class
    A EXAMPLE-OSGi/NodeBOSGI/build.properties
    A EXAMPLE-OSGi/NodeBOSGI/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.java
    A META-INF/MANIFEST.MF
    A OSGI-INF/JDEECoOSGILocalKnowledgeRepository.xml
    A OSGI-INF/JDEECoOSGIMultithreadedScheduler.xml
    A OSGI-INF/JDEECoOSGIRepositoryKnowledgeManager.xml
    A OSGI-INF/JDEECoRuntimeOSGI.xml
    A SDE/.classpath
    A SDE/.project
    A SDE/.settings/org.eclipse.jdt.core.prefs
    A SDE/.settings/org.eclipse.pde.core.prefs
    A SDE/META-INF/MANIFEST.MF
    A SDE/OSGI-INF/JDEECoManagerSDETool.xml
    A SDE/bin/cz/cuni/mff/d3s/deeco/manager/ConsolePrinter.class
    A SDE/bin/cz/cuni/mff/d3s/deeco/manager/DEECoManagerService.class
    A SDE/bin/cz/cuni/mff/d3s/deeco/manager/IJDEECoSDETool.class
    A SDE/bin/cz/cuni/mff/d3s/deeco/manager/JDEECoSDETool.class
    A SDE/bin/cz/cuni/mff/d3s/deeco/provider/sde/OSGiBundleDEECoObjectProvider.class
    A SDE/build.properties
    A SDE/plugin.xml
    A SDE/src/cz/cuni/mff/d3s/deeco/manager/ConsolePrinter.java
    A SDE/src/cz/cuni/mff/d3s/deeco/manager/DEECoManagerService.java
    A SDE/src/cz/cuni/mff/d3s/deeco/manager/IJDEECoSDETool.java
    A SDE/src/cz/cuni/mff/d3s/deeco/manager/JDEECoSDETool.java
    A SDE/src/cz/cuni/mff/d3s/deeco/provider/sde/OSGiBundleDEECoObjectProvider.java
    M build.xml
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableComponentProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableEnsembleProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
    A src/cz/cuni/mff/d3s/deeco/processor/ClassFinder.java
    M src/cz/cuni/mff/d3s/deeco/processor/ClassProcessor.java
    M src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectWriter.java
    A src/cz/cuni/mff/d3s/deeco/processor/ProcessedHolder.java
    A src/cz/cuni/mff/d3s/deeco/processor/SchedulableProcessUtils.java
    A src/cz/cuni/mff/d3s/deeco/processor/UnwrappedProcessedHolder.java
    A src/cz/cuni/mff/d3s/deeco/processor/WrappedPrecessedHolder.java
    M src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java
    R src/cz/cuni/mff/d3s/deeco/provider/IDEECoObjectProvider.java
    A src/cz/cuni/mff/d3s/deeco/provider/PreLauncherDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/runtime/Launcher.java
    A src/cz/cuni/mff/d3s/deeco/runtime/PreLauncher.java
    M src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java

  Log Message:
  -----------
  SDE Integration

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


  Commit: a1779d0ee209bfa68ed9f47f6523133ea9d5dde7
      https://github.com/d3scomp/JDEECo/commit/a1779d0ee209bfa68ed9f47f6523133ea9d5dde7
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.jpf
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    M src/cz/cuni/mff/d3s/deeco/invokable/Membership.java
    M src/cz/cuni/mff/d3s/deeco/invokable/Parameter.java
    M src/cz/cuni/mff/d3s/deeco/invokable/ParameterizedMethod.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableComponentProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableEnsembleProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/BooleanMembershipCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/FuzzyMembershipCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/IScheduleableProcessCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/MembershipCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/ParametrizedMethodCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableComponentProcessCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableEnsembleProcessCreator.java
    A src/cz/cuni/mff/d3s/deeco/invokable/creators/SchedulableProcessCreator.java
    A src/cz/cuni/mff/d3s/deeco/knowledge/LoggingKnowledgeManager.java
    M src/cz/cuni/mff/d3s/deeco/knowledge/RepositoryKnowledgeManager.java
    M src/cz/cuni/mff/d3s/deeco/knowledge/local/LocalKnowledgeRepository.java
    M src/cz/cuni/mff/d3s/deeco/knowledge/local/LocalSession.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/JDEECoParser.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/JDEECoParser.jj
    M src/cz/cuni/mff/d3s/deeco/path/grammar/KnowledgePath.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/PNode.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/ParseException.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/SimpleCharStream.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/Token.java
    M src/cz/cuni/mff/d3s/deeco/path/grammar/TokenMgrError.java
    M src/cz/cuni/mff/d3s/deeco/processor/ClassProcessor.java
    M src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/MethodDescription.java
    M src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectReader.java
    M src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectWriter.java
    M src/cz/cuni/mff/d3s/deeco/processor/ParserHelper.java
    R src/cz/cuni/mff/d3s/deeco/processor/SchedulableComponentProcessWrapper.java
    R src/cz/cuni/mff/d3s/deeco/processor/SchedulableEnsembleProcessWrapper.java
    R src/cz/cuni/mff/d3s/deeco/processor/SchedulableProcessWrapper.java
    M src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java
    A src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
    M src/cz/cuni/mff/d3s/deeco/scheduling/Scheduler.java

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

Conflicts:
	demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
	demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
	src/cz/cuni/mff/d3s/deeco/invokable/SchedulableComponentProcess.java
	src/cz/cuni/mff/d3s/deeco/invokable/SchedulableEnsembleProcess.java
	src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
	src/cz/cuni/mff/d3s/deeco/processor/ClassProcessor.java
	src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
	src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java
	src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectWriter.java
	src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
	src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
	src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java


  Commit: a99704a6afc5d53c104d461a86b8b0fc007cea64
      https://github.com/d3scomp/JDEECo/commit/a99704a6afc5d53c104d461a86b8b0fc007cea64
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M .project
    M OSGI-INF/JDEECoOSGIMultithreadedScheduler.xml
    M SDE/bin/cz/cuni/mff/d3s/deeco/manager/DEECoManagerService.class
    M SDE/bin/cz/cuni/mff/d3s/deeco/manager/JDEECoSDETool.class
    M SDE/src/cz/cuni/mff/d3s/deeco/manager/DEECoManagerService.java
    M SDE/src/cz/cuni/mff/d3s/deeco/manager/JDEECoSDETool.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    M demo/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableComponentProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableEnsembleProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/TriggeredSchedulableProcess.java
    M src/cz/cuni/mff/d3s/deeco/invokable/creators/ParametrizedMethodCreator.java
    M src/cz/cuni/mff/d3s/deeco/processor/ClassProcessor.java
    M src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java
    M src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectWriter.java
    R src/cz/cuni/mff/d3s/deeco/processor/ProcessedHolder.java
    R src/cz/cuni/mff/d3s/deeco/processor/UnwrappedProcessedHolder.java
    R src/cz/cuni/mff/d3s/deeco/processor/WrappedPrecessedHolder.java
    M src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/provider/PreLauncherDEECoObjectProvider.java
    M src/cz/cuni/mff/d3s/deeco/runtime/Launcher.java
    M src/cz/cuni/mff/d3s/deeco/runtime/PreLauncher.java
    M src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java
    M src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedScheduler.java
    M src/cz/cuni/mff/d3s/deeco/scheduling/MultithreadedSchedulerJPF.java
    M src/cz/cuni/mff/d3s/deeco/scheduling/Scheduler.java

  Log Message:
  -----------
  After merging and refactoring

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


Compare: https://github.com/d3scomp/JDEECo/compare/7728c9968130...a99704a6afc5

More information about the DEECo mailing list