Merge pull request #113 from junkerm/develop

Merge current state from develop

.gitignore

@@ -1,4 +1,6 @@
 *.class
+*.lock
+*.bin
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -10,3 +12,13 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/*.log
+/web/src/css/bootstrap.min.css
+/web/src/lib
+*.map
+/web/src/app/*.js
+
+/web/aot
+/web/dist
+bundles/specmate-std-env/workspace/.metadata/.log
+bundles/specmate-ui-core/webcontent/COMMITHASH

.travis.yml

@@ -0,0 +1,34 @@
+sudo: false
+language:
+- java
+- node_js
+node_js:
+- '7'
+jdk:
+- oraclejdk8
+env:
+- TERM=dumb
+install:
+- cd web && npm run init
+- cd ../bundles && ./gradlew --version
+script:
+- cd ../web && npm run build-prod
+- cd ../bundles && ./gradlew build --continue
+- cd ../bundles && ./gradlew check
+- cd ../bundles && ./gradlew export
+- cd ..
+after_success:
+- git status
+cache:
+  directories:
+  - cnf/cache/stable
+deploy:
+  provider: releases
+  skip_cleanup: true
+  api_key:
+    secure: eUiVeNw9rlpcaXi+bpoV4B4WFEjXCgBn6td9NRXFF9dOcJiozn5oHh6qk8g6kMHuUrGDCKcOo5fitxkNaoV1vqxNuRjo7ssPN3yG3QcUmIlsMHM2ueM+9AEyQxP1SuNXku/Vb+ATQ1F7jWUlWotcCWTPbELuhUvziwcF4zYWm2jcTL1twD3gCT9GFdovqnUnmVLHrUha4EUO8bwFlJmyaSmxH5RpcTbKK2tRagRlv/4yUajhBxaNgCXD2nBpNtV6nb2sPbybilB9gRO5d4oPurNQWb28aiobGm0+hNU5bG+MYOyF3fJWU7NaQ0tQP0M8zZ5QM/Lw8g/xMOdMaqZ2rHWPNyxFqNFsUa+H1S9f+tEmje+kvTZ7oPZRuzy90dYC1ZzwpuhG9y3qIlpnDs+9E+JRU3yASEWeb7VVZFrMJKK3wh/FEvVCduYKoTYgcckFeipkjQY1V/umfKRrlq/3ZFATBX3PKaUnHzctZ+KK2nEWBiYMLacw8JKqQSjTIGRchjLZHYpuTR2CuttfBHVH1kDs0SNd7mKsFQShzXfPDylHTT0ZyfVJ++IKaf1Ww37dmqui0FTULmVTy1vtmkcImpFX0y9WFWoOy1vI7QWM4U3YfasRBZlIigNNyLgPR3Bzg+Z+6YBVUdi4T/ulsDf7iU7ZEOD5g7fl06gfcDAKr9E=
+  file: bundles/specmate-std-env/generated/distributions/executable/specmate.jar
+  on:
+    repo: junkerm/specmate
+    branch: master
+    tags: true

README.md

@@ -1 +1,13 @@
-# specmate
+# Specmate
+
+## How to set up your development environment
+1. Install Eclipse Neon.2 Modeling Tools
+2. From the Eclipse Marketplace, install 
+    - bndtools 3.3
+    - Acceleo 3.6
+3. Install node js
+4. In the folder web, run npm install.
+
+## Developing the GUI
+
+See ```web/README.md```

bundles/.gitignore

@@ -0,0 +1,15 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/specmate-std-env/database/specmate.mv.db
+/specmate-std-env/database/specmate.trace.db
+/specmate-std-env/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
+/specmate-model-plugin/

bundles/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Sat Mar 18 07:55:53 CET 2017
+gradle.version=3.4.1

bundles/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

bundles/build.gradle

@@ -0,0 +1,20 @@
+/*
+ * Master Gradle build script
+ *
+ * Depends on bndWorkspace and bndURI properties set by settings.gradle.
+ */
+
+/* Add bnd as a script dependency */
+buildscript {
+  dependencies {
+    classpath files(bndURI)
+  }
+}
+
+/* Configure the subprojects */
+subprojects {
+  def bndProject = bndWorkspace.getProject(name)
+  if (bndProject != null) {
+    plugins.apply 'biz.aQute.bnd'
+  }
+}

bundles/cnf/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

bundles/cnf/.gitignore

@@ -0,0 +1,3 @@
+/bin/
+/generated/
+/cache/

bundles/cnf/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cnf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

bundles/cnf/build.bnd

@@ -0,0 +1,57 @@
+########################
+## BND BUILD SETTINGS ## 
+########################
+
+
+## Global defaults are loaded from the bnd library (as shown below), place your
+## specific settings here. Additional settings are inherited from ext/*.bnd and
+## they will be overridden by anything you specify in this file.
+
+## General Options
+#project.dependson:     ${p-dependson;:}
+#project.bootclasspath: ${p-bootclasspath;:}
+#project.buildpath:     ${p-buildpath;:}
+#project.sourcepath:    ${p-sourcepath;:}
+#project.allsourcepath: ${p-allsourcepath;:}
+#project.output:        ${p-output}
+#project.testpath:      ${p-testpath;:} 
+
+#-verbose:              false
+#project:               ${basedir}
+#src:                   src
+#bin:                   bin
+#testsrc:               test
+#testbin:               bin_test
+#target-dir:            generated
+#target:                ${project}/${target-dir}
+#build:                 ${workspace}/cnf
+#p:                     ${basename;${project}}
+#project.name:          ${p}
+#plugin-dir:            ${build}/plugins
+
+## Java Compiler Options
+#java:                  java
+#javac:                 javac
+javac.source:          1.8
+javac.target:          1.8
+#javac.debug:           on
+
+## Bnd Options
+#-sources:              true
+#-sourcepath:           ${project}/src
+
+
+## Properties from ext/*.bnd can be referenced in order to extend them. For
+## example, to add one additional plugin to the list defined in
+## ext/repositories.bnd:
+# -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
+
+
+## To enable baselining, uncomment the following lines:
+# -baseline: *
+
+
+## If you use git, you might want to uncomment the following lines:
+# Git-Descriptor:       ${system-allow-fail;git describe --dirty --always}
+# Git-SHA:              ${system-allow-fail;git rev-list -1 HEAD}
+# -diffignore:          Git-Descriptor,Git-SHA

bundles/cnf/buildrepo/README.txt

@@ -0,0 +1,6 @@
+WARNING
+=======
+
+This directory contains JAR file dependencies that are intended ONLY FOR BUILT-TIME usage.
+None are intended to be deployed as bundles into a running OSGi Framework, and indeed they may cause
+unexpected errors if they are used at runtime.

bundles/cnf/ext/junit.bnd

@@ -0,0 +1,3 @@
+junit:\
+	junit;version=latest,\
+	hamcrest-core;version=latest

bundles/cnf/ext/pluginpaths.bnd

@@ -0,0 +1,2 @@
+-pluginpath:\
+	${plugin-dir}/biz.aQute.repository/biz.aQute.repository.jar

bundles/cnf/ext/repositories.bnd

@@ -0,0 +1,5 @@
+-plugin:  \
+	aQute.bnd.deployer.repository.LocalIndexedRepo;name=Release;local=${workspace}/cnf/releaserepo;pretty=true,\
+	aQute.bnd.deployer.repository.LocalIndexedRepo;name=Local;local=${workspace}/cnf/localrepo;pretty=true,\
+	aQute.lib.deployer.FileRepo;name=Build;location=${workspace}/cnf/buildrepo;latest=false
+-releaserepo: Release

bundles/cnf/gradle/.gitignore

@@ -0,0 +1 @@
+!*.jar

bundles/cnf/localrepo/.gitignore

@@ -0,0 +1 @@
+!**/*.jar