[DEECo] [d3scomp/JDEECo] d9b406: Adopted files in model/runtime/custom and the rela...

[GitHub]

  Branch: refs/heads/newgen-kit
  Home:   https://github.com/d3scomp/JDEECo
  Commit: d9b4063665afb74da1c309aa7f5a600ddea44e2f
      https://github.com/d3scomp/JDEECo/commit/d9b4063665afb74da1c309aa7f5a600ddea44e2f
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java

  Log Message:
  -----------
  Adopted files in model/runtime/custom and the related test from Michal.


  Commit: e5ef68687bb170eea4e838ea5c3c90d388e73de6
      https://github.com/d3scomp/JDEECo/commit/e5ef68687bb170eea4e838ea5c3c90d388e73de6
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java

  Log Message:
  -----------
  Extensions to the meta-model classes - to implement equals and hashCode.


  Commit: baee85e468b6d10d6b34f7c48c9e0d49db7eaf91
      https://github.com/d3scomp/JDEECo/commit/baee85e468b6d10d6b34f7c48c9e0d49db7eaf91
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java

  Log Message:
  -----------
  Merge pull request #91 from d3scomp/newgen-bures

Tomas merge


  Commit: c5276d959bf66f0c5eb0999fd7f22f567e2e8be7
      https://github.com/d3scomp/JDEECo/commit/c5276d959bf66f0c5eb0999fd7f22f567e2e8be7
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgePathUtils.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgePathUtils.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Merge branch 'newgen' of https://github.com/d3scomp/JDEECo.git into
newgen

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java


  Commit: ad175fdce8056a68fdd769b85f53c0e1caa0bfbd
      https://github.com/d3scomp/JDEECo/commit/ad175fdce8056a68fdd769b85f53c0e1caa0bfbd
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgePathUtils.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java

  Log Message:
  -----------
  Renaming KnowledgePathUtils


Compare: https://github.com/d3scomp/JDEECo/compare/c8462de6aef4...ad175fdce805