Merge branch 'fixes'

Conflicts:
	com.minres.products.setup
	projects/JIT-ISS-CoreDsl.setup
	projects/Mendel.setup
	projects/Structural.setup

projects/SCViewer.setup

@@ -19,110 +19,15 @@
       name="Global Variables">
     <setupTask
         xsi:type="setup:VariableTask"
-        name="github.user.id"
+        name="git.user.id"
         defaultValue="anonymous"
-        label="Github user ID">
-      <description>The user ID of the Github account</description>
+        label="User ID">
+      <description>The user ID of the MINRES account</description>
     </setupTask>
     <setupTask
         xsi:type="setup:VariableTask"
-        name="github.author.name"
-        label="Github author name">
-      <description>The author name used for Github commits</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="github.author.email"
-        label="Github author email">
-      <description>The email address associated with Github commits</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        type="PASSWORD"
-        name="github.user.password"
-        label="Github password for issues">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
-        <detail
-            key="type">
-          <value>form</value>
-        </detail>
-        <detail
-            key="form.url">
-          <value>https://github.com/session</value>
-        </detail>
-        <detail
-            key="form.cookie">
-          <value>PHPSESSID</value>
-        </detail>
-        <detail
-            key="form.parameters">
-          <value>login password authenticity_token utf8 commit</value>
-        </detail>
-        <detail
-            key="form.secure.parameters">
-          <value>password</value>
-        </detail>
-        <detail
-            key="form.filter">
-          <value>login=anonymous\&amp;.*</value>
-        </detail>
-        <detail
-            key="form.parameter.login">
-          <value>$${github.user.id}</value>
-        </detail>
-        <detail
-            key="form.parameter.password">
-          <value>$${value}</value>
-        </detail>
-        <detail
-            key="form.parameter.utf8">
-          <value>✓</value>
-        </detail>
-        <detail
-            key="form.parameter.commit">
-          <value>Sign in</value>
-        </detail>
-        <detail
-            key="form.ok">
-          <value>Valid password for $${form.parameter.login} at $${form.url}.</value>
-        </detail>
-        <detail
-            key="form.info">
-          <value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
-        </detail>
-        <detail
-            key="form.warning">
-          <value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
-        </detail>
-        <detail
-            key="form.error">
-          <value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
-        </detail>
-      </annotation>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="github.remoteURIs"
-        value=""
-        label="Github repository">
-      <choice
-          value="git@github.com:@{remoteURI}.git"
-          label="Git (read-write)"/>
-      <choice
-          value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
-          label="HTTPS (read-write)">
-        <annotation
-            source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
-      </choice>
-      <choice
-          value="https://github.com/@{remoteURI}.git"
-          label="HTTPS (read-only, anonymous)"/>
-      <description>Choose from the available Github URIs</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="git-stream"
+        name="git.stream"
+        defaultValue="master"
         label="Stream to checkout">
       <choice
           value="master"/>
@@ -170,22 +75,7 @@
       xsi:type="git:GitCloneTask"
       id="git.clone.SCViewer"
       filter=""
-      remoteURI="Minres/SCViewer">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/InducedChoices">
-      <detail
-          key="inherit">
-        <value>github.remoteURIs</value>
-      </detail>
-      <detail
-          key="label">
-        <value>${scope.project.label} Git repository</value>
-      </detail>
-      <detail
-          key="target">
-        <value>remoteURI</value>
-      </detail>
-    </annotation>
+      remoteURI="https://${git.user.id}@git.minres.com/VP-Tools/SCViewer.git">
     <description>${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -212,7 +102,7 @@
       name="Neon Platform">
     <description>Sets the RDL Editor target platform</description>
   </setupTask>
-  <stream name="${git-stream}"
+  <stream name="${git.stream}"
       label="Stream to checkout"/>
   <description>A lightweight tool to visualize VCD and transaction traces.</description>
 </setup:Project>