diff options
author | Ralf Mollik | 2018-02-23 15:51:57 +0000 |
---|---|---|
committer | Ralf Mollik | 2018-02-23 15:51:57 +0000 |
commit | 6e3a3fde435cab7cf7026b015519bb528565785d (patch) | |
tree | a7c01f538b826ace25acb87e1a7abe047e04379b | |
parent | 703fb4f6ef471e5c15f7aee6d84db3941ec8d29e (diff) | |
download | org.eclipse.osbp.vaadin.emf-6e3a3fde435cab7cf7026b015519bb528565785d.tar.gz org.eclipse.osbp.vaadin.emf-6e3a3fde435cab7cf7026b015519bb528565785d.tar.xz org.eclipse.osbp.vaadin.emf-6e3a3fde435cab7cf7026b015519bb528565785d.zip |
catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
21 files changed, 131 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d1add00 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +**/target/ +**/bin/ +**/VAADIN/widgetsets/ +**/VAADIN/gwt-unitCache/ +**._trace +**git.properties + +**/target/ +**/.metadata/ + +**/emf-gen/**/.gitignore +**/src-gen/**/.gitignore +**/git.properties +**/*.java._trace +**/*.log +**/*.log.properties + +**/bin/ +**/build/ +*.class +*.ctrl +**/Debug/ +.DS_Store +*.ear +*.war + +**/*.actionbin +**/*.blipbin +**/*.chartbin +**/*.cubebin +**/*.datatypebin +**/*.dtobin +**/*.entitybin +**/*.servicebin +**/*.tablebin +**/*.uibin +**/*.uisemanticbin +**/*.xtendbin +**/*.xtextbin + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.osbp.vaadin.emf.api/.classpath b/org.eclipse.osbp.vaadin.emf.api/.classpath new file mode 100644 index 0000000..43b9862 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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="src" path="src"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/org.eclipse.osbp.vaadin.emf.api/.gitignore b/org.eclipse.osbp.vaadin.emf.api/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.8 diff --git a/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 0000000..0933f8c --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,10 @@ +//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend +eclipse.preferences.version=1 +is_project_specific=true +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/org.eclipse.osbp.vaadin.emf.feature/.gitignore b/org.eclipse.osbp.vaadin.emf.feature/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.feature/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 0000000..0933f8c --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf.feature/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,10 @@ +//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend +eclipse.preferences.version=1 +is_project_specific=true +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/org.eclipse.osbp.vaadin.emf.feature/feature.xml b/org.eclipse.osbp.vaadin.emf.feature/feature.xml index 5850c7f..ade0a7c 100644 --- a/org.eclipse.osbp.vaadin.emf.feature/feature.xml +++ b/org.eclipse.osbp.vaadin.emf.feature/feature.xml @@ -14,7 +14,8 @@ id="org.eclipse.osbp.vaadin.emf.feature" label="%featureName" version="0.9.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.eclipse.osbp.vaadin.emf"> <description> %description diff --git a/org.eclipse.osbp.vaadin.emf/.classpath b/org.eclipse.osbp.vaadin.emf/.classpath new file mode 100644 index 0000000..43b9862 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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="src" path="src"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/org.eclipse.osbp.vaadin.emf/.gitignore b/org.eclipse.osbp.vaadin.emf/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.8 diff --git a/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 0000000..0933f8c --- /dev/null +++ b/org.eclipse.osbp.vaadin.emf/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,10 @@ +//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend +eclipse.preferences.version=1 +is_project_specific=true +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen +outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/org.eclipse.osbp.vaadin.emf/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaadin.emf/META-INF/MANIFEST.MF index 042294c..8e47a00 100644 --- a/org.eclipse.osbp.vaadin.emf/META-INF/MANIFEST.MF +++ b/org.eclipse.osbp.vaadin.emf/META-INF/MANIFEST.MF @@ -6,14 +6,14 @@ Bundle-Vendor: Eclipse OSBP Bundle-Version: 0.9.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.osbp.vaadin.emf.api;bundle-version="[0.9.0,0.10.0)";visibility:=reexport, - com.vaadin.server, + com.vaadin.server;bundle-version="[7.7.6,7.8.0)", org.eclipse.emf.ecore, - com.vaadin.shared, + com.vaadin.shared;bundle-version="[7.7.6,7.8.0)", org.eclipse.emf.edit, org.eclipse.osbp.runtime.web.vaadin.common;bundle-version="[0.9.0,0.10.0)", org.jsoup;bundle-version="1.8.3", - org.eclipse.xtext.common.types;bundle-version="[2.7.3,2.8.0)", - org.eclipse.xtext.xbase.lib;bundle-version="[2.7.3,2.8.0)", + org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)", org.eclipse.core.runtime;bundle-version="3.10.0" Import-Package: org.slf4j Export-Package: org.eclipse.osbp.vaadin.emf.actions;version="0.9.0", |