[Docker]Massive update to be compliant with neon.3, designer now display correctly. see issue #209 and issue #210

Author: Christophe Gourdin

clouddesigner/org.occiware.clouddesigner.occi.docker.design/.classpath

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry excluding="resources/|resources/" kind="src" path="src"/>
-	<classpathentry kind="src" path="src/resources"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

clouddesigner/org.occiware.clouddesigner.occi.docker.design/.gitignore

@@ -1,34 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.occiware.clouddesigner.occi.docker.design</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
+  <name>org.occiware.clouddesigner.occi.docker.design</name>
+  <comment></comment>
+  <projects></projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+      <arguments></arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.ManifestBuilder</name>
+      <arguments></arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.SchemaBuilder</name>
+      <arguments></arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.pde.PluginNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
 </projectDescription>

clouddesigner/org.occiware.clouddesigner.occi.docker.design/.project

@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

clouddesigner/org.occiware.clouddesigner.occi.docker.design/.settings/org.eclipse.jdt.core.prefs

@@ -1,25 +1,21 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.occiware.clouddesigner.occi.docker.design
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.occiware.clouddesigner.occi.docker.design;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-ClassPath: .
 Bundle-Activator: org.occiware.clouddesigner.occi.docker.design.Activator
+Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
+ org.occiware.clouddesigner.occi,
+ org.occiware.clouddesigner.occi.design,
+ org.occiware.clouddesigner.occi.docker,
+ org.occiware.clouddesigner.occi.docker.connector,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.sirius,
- org.eclipse.sirius.common.acceleo.mtl,
- org.occiware.clouddesigner.occi.docker,
- org.eclipse.xtend.lib,
+ org.eclipse.sirius.common.acceleo.aql,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.compare;bundle-version="3.1.1",
- org.occiware.clouddesigner.occi.docker.connector,
- org.occiware.clouddesigner.occi.docker.edit;bundle-version="0.1.0",
- org.occiware.clouddesigner.occi.design;bundle-version="0.1.0",
- org.occiware.clouddesigner.occi.emfgen.ui;bundle-version="0.1.0",
  org.slf4j.api;bundle-version="1.7.2"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: %providerName

clouddesigner/org.occiware.clouddesigner.occi.docker.design/META-INF/MANIFEST.MF

@@ -1,12 +1,11 @@
-source.. = src/,\
-           xtend-gen/,\
-           src/resources/
+source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               xtend-gen/,\
                description/,\
+               plugin.properties,\
                plugin.xml,\
                src/,\
                src/resources/,\
                images/
+               

clouddesigner/org.occiware.clouddesigner.occi.docker.design/build.properties

@@ -0,0 +1,3 @@
+pluginName = org.occiware.clouddesigner.occi.docker.design
+providerName = Eclipse Modeling Project
+viewpointName = MyViewpoint

clouddesigner/org.occiware.clouddesigner.occi.docker.design/description/docker.odesign

@@ -1,63 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<!--
-Copyright (c) 2015-2016 Inria
- 
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-- Fawaz Paraiso <[email protected]>
-- Philippe Merle <[email protected]>
--->
 <plugin>
-
-   <!-- Register Sirius viewpoint. -->
-   <extension point="org.eclipse.sirius.componentization">
-      <component
-            class="org.occiware.clouddesigner.occi.docker.design.Activator"
-            id="org.occiware.clouddesigner.occi.docker.design"
-	        name="docker"/>
-   </extension>
- 
-   <!-- New wizard for creating a Docker configuration file. -->
+  <extension point="org.eclipse.sirius.componentization">
+    <component class="org.occiware.clouddesigner.occi.docker.design.Activator"
+               id="org.occiware.clouddesigner.occi.docker.design"
+	       name="docker">
+    </component>
+  </extension>
+   <!-- Popup menu for creating a docker configuration file. -->
    <extension point="org.eclipse.ui.newWizards">
       <category
             id="org.occiware.clouddesigner.category.ID"
-            name="Cloud Designer">
-      </category>
+            name="Cloud Designer"/>
       <wizard
             category="org.occiware.clouddesigner.category.ID"
             class="org.occiware.clouddesigner.occi.docker.design.wizard.NewConfigurationWizard"
             icon="platform:/plugin/org.occiware.clouddesigner.occi.edit/icons/full/obj16/Configuration.gif"
             id="org.occiware.clouddesigner.occi.docker.design.wizard.NewConfigurationWizard"
-            name="Docker Configuration File">
-      </wizard>
-
-   </extension>
- 
-   <!-- Popup menu for converting to an OCCI Configuration file. -->
-   <extension point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            id="org.occiware.clouddesigner.occi.docker.design.contribution"
-            nameFilter="*.docker"
-            objectClass="org.eclipse.core.resources.IFile">
-         <menu
-               id="org.occiware.clouddesigner.menu"
-               label="Cloud Designer"
-               path="additionsCloudDesigner">
-            <separator
-                  name="group"/>
-         </menu>
-         <action
-               class="org.occiware.clouddesigner.occi.emfgen.ui.popup.actions.Ecore2OCCIAction"
-               enablesFor="1"
-               id="org.occiware.clouddesigner.occi.docker.ecore2occi"
-               label="Convert to an OCCI Configuration file"
-               menubarPath="org.occiware.clouddesigner.menu/group">
-         </action>
-      </objectContribution>
+            name="docker Configuration File"/>
    </extension>
 </plugin>