Commit 74f3b6c6 authored by Müller, Marco's avatar Müller, Marco
Browse files

Merge branch 'master' into design-decisions

parents d7f1626f c98af9fe

.gitignore

+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
**/.project

**/.settings/

**/backup.*

**/xtend-gen/
 
 No newline at end of file

Build/feature/feature.xml

+67 −18
Changes for Build/feature/feature.xml: 67 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
      [Enter License Description here.]

   </license>



   <includes

         id="org.codeling.lang.ejb.feature"

         version="0.0.0"/>



   <requires>

      <import plugin="org.eclipse.core.runtime"/>

      <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
@@ -42,30 +38,48 @@ 
      <import plugin="de.uka.ipd.sdq.pcm.gmf.seff" version="2.0.0" match="greaterOrEqual"/>

      <import plugin="de.uka.ipd.sdq.pcm.gmf.usage" version="2.0.0" match="greaterOrEqual"/>

      <import plugin="org.palladiosimulator.pcm" version="2.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.henshin.model" version="1.4.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.henshin.trace" version="1.4.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.lang.base.java" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.henshin.interpreter" version="1.4.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.henshintgg.api" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.core.runtime" version="3.11.1" match="greaterOrEqual"/>

      <import plugin="de.tub.tfs.henshin.tgg.editor" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="de.tub.tfs.henshin.tgg.interpreter" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.modelversioning.emfprofile.project" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.ial.mm" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.equinox.registry"/>

      <import plugin="org.eclipse.e4.core.di" version="1.3.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.core.runtime" version="3.9.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.osgi"/>

      <import plugin="org.eclipse.core.commands"/>

      <import plugin="org.eclipse.swt"/>

      <import plugin="org.eclipse.jface"/>

      <import plugin="org.eclipse.core.resources"/>

      <import plugin="javax.inject"/>

      <import plugin="org.eclipse.text"/>

      <import plugin="org.eclipse.core.filebuffers"/>

      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.henshin.model" version="1.4.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.henshintgg.api" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.ltk.core.refactoring"/>

      <import plugin="org.eclipse.jdt.core.manipulation"/>

      <import plugin="org.eclipse.core.filebuffers"/>

      <import plugin="org.eclipse.core.runtime" version="3.9.0" match="greaterOrEqual"/>

      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>

      <import plugin="org.eclipse.core.commands"/>

      <import plugin="org.eclipse.jface"/>

      <import plugin="org.modelversioning.emfprofile.project" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.lang.base.java" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.jdt.launching"/>

      <import plugin="org.codeling.core" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.ecore" version="2.13.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.ui"/>

      <import plugin="org.eclipse.core.expressions"/>

      <import plugin="org.eclipse.jdt"/>

      <import plugin="org.eclipse.core.resources" version="3.10.1" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.common" version="2.11.1" match="greaterOrEqual"/>

      <import plugin="org.eclipse.emf.ecore.xmi" version="2.11.1" match="greaterOrEqual"/>

      <import plugin="org.eclipse.gmf.runtime.notation" version="1.8.0" match="greaterOrEqual"/>

      <import plugin="com.google.guava"/>

      <import plugin="mechanisms"/>

      <import plugin="org.codeling.lang.cocome.metamodel" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.jdt.ui"/>

      <import plugin="org.eclipse.ui.ide" version="3.9.1" match="greaterOrEqual"/>

      <import plugin="org.eclipse.jface.text"/>

      <import plugin="org.eclipse.ui.editors"/>

      <import plugin="de.tub.tfs.muvitor" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="mechanisms" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.uml2.uml" version="5.3.0" match="greaterOrEqual"/>

      <import plugin="org.codeling.lang.jee.metamodel" version="1.0.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>

      <import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>

   </requires>



   <plugin
@@ -110,4 +124,39 @@ 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.codeling.lang.cocome.metamodel"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.codeling.lang.cocome.transformation"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.codeling.lang.jee.metamodel"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.codeling.lang.jee.transformation"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.codeling.lang.uml"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



</feature>

Build/p2updatesite/category.xml

+3 −6
Changes for Build/p2updatesite/category.xml: 3 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
   <feature url="features/org.palladiosimulator.editors.gmf.feature_4.0.0.201511051149.jar" id="org.palladiosimulator.editors.gmf.feature" version="4.0.0.201511051149">

      <category name="org.codeling.dependencies"/>

   </feature>

   <feature url="features/org.modelversioning.emfprofile.feature_1.0.0.qualifier.jar" id="org.modelversioning.emfprofile.feature" version="1.0.0.qualifier">

      <category name="org.codeling.dependencies"/>

   </feature>

   <feature url="features/org.eclipse.emf.henshin.sdk_1.4.0.201611301400.jar" id="org.eclipse.emf.henshin.sdk" version="1.4.0.201611301400">

      <category name="org.codeling.dependencies"/>

   </feature>
@@ -24,10 +21,10 @@ 
   <feature url="features/org.codeling.feature_1.0.0.qualifier.jar" id="org.codeling.feature" version="1.0.0.qualifier">

      <category name="org.codeling"/>

   </feature>

   <feature url="features/org.codeling.lang.ejb.feature_1.0.0.qualifier.jar" id="org.codeling.lang.ejb.feature" version="1.0.0.qualifier" os="linux,macosx,win32" ws="cocoa,gtk,win32" arch="x86,x86_64">

      <category name="org.codeling"/>

   <feature url="features/org.modelversioning.emfprofile.feature_1.0.0.201612051406.jar" id="org.modelversioning.emfprofile.feature" version="1.0.0.201612051406">

      <category name="org.codeling.dependencies"/>

   </feature>

   <category-def name="org.codeling" label="Codeling"/>

   <category-def name="org.codeling.dependencies" label="Codeling Dependencies"/>

   <repository-reference location="http://downloads.eclipse.org/releases/mars" enabled="true" />

   <repository-reference location="http://downloads.eclipse.org/releases/oxygen" enabled="true" />

</site>

Build/p2updatesite/org.codeling.product

+14 −3
Changes for Build/p2updatesite/org.codeling.product: 14 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -99,15 +99,18 @@ 
      <plugin id="org.apache.log4j"/>

      <plugin id="org.codeling.core"/>

      <plugin id="org.codeling.core.test" fragment="true"/>

      <plugin id="org.codeling.examples.case_studies" fragment="true"/>

      <plugin id="org.codeling.henshintgg.api"/>

      <plugin id="org.codeling.henshintgg.api.test" fragment="true"/>

      <plugin id="org.codeling.ial.mm"/>

      <plugin id="org.codeling.lang.base.java"/>

      <plugin id="org.codeling.lang.base.java.tests" fragment="true"/>

      <plugin id="org.codeling.lang.ejb.embed"/>

      <plugin id="org.codeling.lang.ejb.embed.test" fragment="true"/>

      <plugin id="org.codeling.lang.ejb.metamodel"/>

      <plugin id="org.codeling.lang.cocome.metamodel"/>

      <plugin id="org.codeling.lang.cocome.transformation"/>

      <plugin id="org.codeling.lang.jee.metamodel"/>

      <plugin id="org.codeling.lang.jee.transformation"/>

      <plugin id="org.codeling.lang.pcm"/>

      <plugin id="org.codeling.lang.uml"/>

      <plugin id="org.codeling.test.common"/>

      <plugin id="org.codeling.utils"/>

      <plugin id="org.eclipse.ant.core"/>
@@ -169,6 +172,7 @@ 
      <plugin id="org.eclipse.emf.henshin.interpreter"/>

      <plugin id="org.eclipse.emf.henshin.model"/>

      <plugin id="org.eclipse.emf.henshin.trace"/>

      <plugin id="org.eclipse.emf.mapping.ecore2xml"/>

      <plugin id="org.eclipse.emf.mwe.core"/>

      <plugin id="org.eclipse.emf.mwe.utils"/>

      <plugin id="org.eclipse.emf.mwe2.lib"/>
@@ -199,6 +203,7 @@ 
      <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>

      <plugin id="org.eclipse.equinox.security.ui"/>

      <plugin id="org.eclipse.equinox.simpleconfigurator"/>

      <plugin id="org.eclipse.equinox.supplement"/>

      <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>

      <plugin id="org.eclipse.equinox.util"/>

      <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
@@ -237,6 +242,7 @@ 
      <plugin id="org.eclipse.gmf.runtime.notation.providers"/>

      <plugin id="org.eclipse.gmf.tooling.runtime"/>

      <plugin id="org.eclipse.help"/>

      <plugin id="org.eclipse.jdt"/>

      <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>

      <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>

      <plugin id="org.eclipse.jdt.core"/>
@@ -264,11 +270,13 @@ 
      <plugin id="org.eclipse.team.ui"/>

      <plugin id="org.eclipse.text"/>

      <plugin id="org.eclipse.ui"/>

      <plugin id="org.eclipse.ui.cheatsheets"/>

      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>

      <plugin id="org.eclipse.ui.console"/>

      <plugin id="org.eclipse.ui.editors"/>

      <plugin id="org.eclipse.ui.forms"/>

      <plugin id="org.eclipse.ui.ide"/>

      <plugin id="org.eclipse.ui.intro"/>

      <plugin id="org.eclipse.ui.navigator"/>

      <plugin id="org.eclipse.ui.navigator.resources"/>

      <plugin id="org.eclipse.ui.views"/>
@@ -278,6 +286,7 @@ 
      <plugin id="org.eclipse.uml2.common"/>

      <plugin id="org.eclipse.uml2.common.edit"/>

      <plugin id="org.eclipse.uml2.types"/>

      <plugin id="org.eclipse.uml2.uml"/>

      <plugin id="org.eclipse.xsd"/>

      <plugin id="org.eclipse.xtend"/>

      <plugin id="org.eclipse.xtend.lib"/>
@@ -285,6 +294,8 @@ 
      <plugin id="org.eclipse.xtend.typesystem.emf"/>

      <plugin id="org.eclipse.xtext"/>

      <plugin id="org.eclipse.xtext.common.types"/>

      <plugin id="org.eclipse.xtext.logging" fragment="true"/>

      <plugin id="org.eclipse.xtext.smap"/>

      <plugin id="org.eclipse.xtext.util"/>

      <plugin id="org.eclipse.xtext.xbase.lib"/>

      <plugin id="org.hamcrest.core"/>

Build/targetdefinition/org.codeling.target.target

+27 −28
Changes for Build/targetdefinition/org.codeling.target.target: 27 added lines, 28 removed lines.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?pde version="3.8"?><target name="org.codeling.target" sequenceNumber="39">

<?pde version="3.8"?><target name="org.codeling.target" sequenceNumber="44">

<locations>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.palladiosimulator.editors.gmf.feature.feature.group" version="4.0.0.201511051149"/>

<unit id="org.palladiosimulator.pcm.feature.feature.group" version="4.0.0.201511051136"/>

<repository location="https://sdqweb.ipd.kit.edu/eclipse/palladiosimulator/releases/1.0.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.4.0.201611301400"/>

<repository location="http://download.eclipse.org/modeling/emft/henshin/updates/1.4.0"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>

<unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>

<unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>

<unit id="org.apache.batik.util.gui" version="1.6.0.v201011041432"/>

<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>

<unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>

<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>

<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.1.v20170928-1405"/>

<unit id="org.eclipse.gmf.feature.group" version="1.11.0.201706061437"/>

<unit id="org.eclipse.m2e.feature.feature.group" version="1.8.2.20171007-0217"/>

<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.3.3.20170823-1905"/>

<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.1.0.201709130748"/>

<unit id="org.eclipse.pde.feature.group" version="3.13.1.v20171009-0537"/>

<repository location="http://download.eclipse.org/releases/oxygen"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="de.tub.tfs.henshin.editor.feature.feature.group" version="1.0.0"/>
@@ -25,21 +20,25 @@ 
<repository location="http://www.s3.uni-due.de/pub/p2/codeling/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>

<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>

<unit id="org.palladiosimulator.editors.gmf.feature.feature.group" version="4.0.0.201511051149"/>

<unit id="org.palladiosimulator.pcm.feature.feature.group" version="4.0.0.201511051136"/>

<repository location="https://sdqweb.ipd.kit.edu/eclipse/palladiosimulator/releases/1.0.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>

<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>

<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>

<unit id="org.eclipse.gmf.feature.group" version="1.11.0.201706061437"/>

<unit id="org.eclipse.m2e.feature.feature.group" version="1.8.0.20170516-2043"/>

<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.3.2.20170517-2015"/>

<unit id="org.eclipse.pde.feature.group" version="3.13.0.v20170612-0950"/>

<unit id="org.eclipse.platform.sdk" version="4.7.0.I20170612-0950"/>

<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>

<unit id="org.eclipse.uml2.uml.feature.group" version="5.3.0.v20170605-1616"/>

<repository location="http://download.eclipse.org/releases/oxygen"/>

<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.4.0.201611301400"/>

<repository location="http://download.eclipse.org/modeling/emft/henshin/updates/1.4.0"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>

<unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>

<unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>

<unit id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>

<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>

<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

<unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171013-1050"/>

<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>

</location>

</locations>

<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>