catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.action/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.authorization/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.blip/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.chart/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.cube/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datamart/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datatype/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.dialog/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.entity/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.menu/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.message/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.organization/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.report/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE
new file mode 100644
index 0000000..b2ce26c
--- /dev/null
+++ b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE
@@ -0,0 +1,3 @@
+package ${{MODEL_PROJECT_PACKAGE_NAME}} {
+
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_de_AT.properties
deleted file mode 100644
index 6e15430..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#de_AT
-male=m\u00E4nnlich
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.topology/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectCreator.java b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectCreator.java
index 538da8e..c62d5ed 100644
--- a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectCreator.java
+++ b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectCreator.java
@@ -139,7 +139,22 @@
break;
case REQUIRED_BUNDLE:
if (isOsbpBundle(item)) {
- item = item.split(";")[0]+";bundle-version=\""+getObspBundleVersion()+"\"";
+ String bundleVersionPrefix = "bundle-version=\"";
+ String[] splitItem = item.split(";");
+ boolean bundleVersionExists = false;
+ for (int i = 0; i < splitItem.length; i++) {
+ if (splitItem[i].startsWith(bundleVersionPrefix)) {
+ bundleVersionExists = true;
+ }
+ }
+ // Only for items without an already defined bundle version
+ if (!bundleVersionExists) {
+ StringBuffer strBuf = new StringBuffer(splitItem[0]+";"+bundleVersionPrefix+getObspBundleVersion()+"\"");
+ for (int i = 1; i < splitItem.length; i++) {
+ strBuf.append(";").append(splitItem[i]);
+ }
+ item = strBuf.toString();
+ }
}
break;
}
diff --git a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
index 4c2b1c0..f33cf7b 100644
--- a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
+++ b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
@@ -128,16 +128,16 @@
return addFromMultiLine(result, ManifestAttribute.REQUIRED_BUNDLE, /* getFeatureBasedRequiredPlugins() + */"net.osbee.bpm;bundle-version=\"1.0.0\";resolution:=optional,"
+ "net.osbee.organization.permissions;bundle-version=\"1.0.0\";resolution:=optional," + "net.osbee.org.drools;bundle-version=\"5.5.1\";resolution:=optional," + "OpenCSV;bundle-version=\"2.3.0\";resolution:=optional,"
+ "animator.osgi;bundle-version=\"0.2.0\"," + "com.ibm.icu;bundle-version=\"52.1.0\"," + "com.vaadin.client;bundle-version=\"7.5.7\","
- + "com.vaadin.server;bundle-version=\"7.5.7\"," + "com.vaadin.shared;bundle-version=\"7.5.7\"," + "dCharts.osgi;bundle-version=\"1.7.0\","
+ + "com.vaadin.server;bundle-version=\"[7.7.6#7.8.0)\"," + "com.vaadin.shared;bundle-version=\"[7.7.6#7.8.0)\"," + "dCharts.osgi;bundle-version=\"1.7.0\","
+ "dom.osgi;bundle-version=\"0.1.0\"," + "easyuploads.osgi;bundle-version=\"7.4.2\"," + "filteringtable.osgi;bundle-version=\"0.9.13\","
+ "javax.inject;bundle-version=\"1.0.0\"," + "javax.persistence;bundle-version=\"2.1.0\"," + "javax.validation.api;bundle-version=\"1.1.0\","
- + "joda-time;bundle-version=\"2.3.0\"," + "mondrian.osgi;bundle-version=\"3.5.0\"," + "olap4j.osgi;bundle-version=\"[1.1.0#1.3.1)\","
+ + "joda-time;bundle-version=\"2.3.0\"," + "mondrian.osgi;bundle-version=\"[3.5.0#4.0.0)\"," + "olap4j.osgi;bundle-version=\"[1.1.0#1.3.1)\","
+ "org.apache.commons.beanutils;bundle-version=\"1.8.0\"," + "org.apache.commons.collections;bundle-version=\"3.2.1\","
+ "org.apache.commons.dbcp;bundle-version=\"1.4.0\"," + "org.apache.commons.discovery;bundle-version=\"0.5.0\","
+ "org.apache.commons.lang3;bundle-version=\"3.1.0\"," + "org.apache.commons.lang;bundle-version=\"2.6.0\","
+ "org.apache.commons.logging;bundle-version=\"1.1.1\"," + "org.apache.commons.math3;bundle-version=\"3.1.1\","
+ "org.apache.commons.math;bundle-version=\"1.2.0\"," + "org.apache.commons.net;bundle-version=\"3.2.0\"," + "org.apache.commons.pool;bundle-version=\"1.6.0\","
- + "org.apache.commons.vfs;bundle-version=\"2.0.0\"," + "org.apache.log4j;bundle-version=\"1.2.15\","
+ + "org.apache.commons.vfs;bundle-version=\"2.0.0\"," + "org.apache.cxf.cxf-core;bundle-version=\"3.1.7\"," + "org.apache.httpcomponents.httpclient;bundle-version=\"4.3.6\"," + "org.apache.httpcomponents.httpcore;bundle-version=\"4.3.3\"," + "org.apache.log4j;bundle-version=\"1.2.15\","
+ "org.eclipse.birt.core;bundle-version=\"4.4.0\"," + "org.eclipse.birt.data.aggregation;bundle-version=\"4.4.0\","
+ "org.eclipse.birt.data;bundle-version=\"4.4.0\"," + "org.eclipse.birt.report.data.adapter;bundle-version=\"4.4.0\","
+ "org.eclipse.birt.report.engine.emitter.html;bundle-version=\"4.4.0\"," + "org.eclipse.birt.report.engine.emitter.pdf;bundle-version=\"4.4.0\","
@@ -151,38 +151,42 @@
+ "org.eclipse.e4.ui.model.workbench;bundle-version=\"1.1.0\"," + "org.eclipse.e4.ui.services;bundle-version=\"1.1.0\","
+ "org.eclipse.e4.ui.workbench;bundle-version=\"1.4.0\"," + "org.eclipse.emf.ecore;bundle-version=\"2.10.2\"," + "org.eclipse.emf.mwe.core,"
+ "org.eclipse.gemini.dbaccess.util;bundle-version=\"1.1.0\"," + "org.eclipse.jdt.core;bundle-version=\"3.10.0\","
- + "org.eclipse.osbp.authentication;bundle-version=\"0.9.0\"," + "org.eclipse.osbp.authentication.ui;bundle-version=\"0.9.0\","
- + "org.eclipse.osbp.bpm;bundle-version=\"0.9.0\"," + "org.eclipse.osbp.bpm.api;bundle-version=\"0.9.0\","
- + "org.eclipse.osbp.datainterchange.api;bundle-version=\"0.9.0\"," + "org.eclipse.osbp.dsl.common.xtext;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.dsl.datatype.lib;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.dsl.dto.lib;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.dsl.entity.xtext;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.ecview.core.common.editparts.emf;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.ecview.core.common;bundle-version=\"0.9.0\""
- + "org.eclipse.osbp.ecview.core.common.model;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.ecview.core.common;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.ecview.core.extension.model;bundle-version=\"0.8.1\"," + "org.eclipse.osbp.ecview.dsl.lib;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.ecview.dsl;bundle-version=\"0.9.1\";resolution:=optional," + "org.eclipse.osbp.ecview.extension.api;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.ecview.extension.editparts.emf;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.ecview.extension.editparts;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.ecview.extension.grid.editparts;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.ecview.extension.grid.model;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.ecview.extension.model;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.ecview.extension.presentation.vaadin;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.ecview.extension.strategy;bundle-version=\"1.0.0\"," + "org.eclipse.osbp.ecview.extension.widgetset;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.ecview.xtext.builder.participant;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.eventbroker;bundle-version=\"0.9.0\","
- + "org.eclipse.osbp.gitinfo;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.infogrid.api;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.infogrid.vaaclipse;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.jpa.services;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.mobile.vaadin.ecview.api;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.mobile.vaadin.ecview.model;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.osgi.hybrid.api;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.runtime.common;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.runtime.jsr303.validation;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.runtime.web.ecview.presentation.vaadin;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.runtime.web.vaadin.common;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.runtime.web.vaadin.databinding;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.ui.api;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.ui.common," + "org.eclipse.osbp.user,"
- + "org.eclipse.osbp.blob;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.utils.functionnormalizer,"
- + "org.eclipse.osbp.utils.themes.ui;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.utils.ui;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.utils;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.vaaclipse.addons.common.api;bundle-version=\"0.1.0\","
- + "org.eclipse.osbp.vaaclipse.addons.softwarefactory;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.vaaclipse.api;bundle-version=\"0.9.0\","
- + "org.eclipse.osbp.vaaclipse.common.ecview.api;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.vaaclipse.publicapi;bundle-version=\"2.7.3\","
- + "org.eclipse.osbp.vaaclipse.theme;bundle-version=\"2.7.3\"," + "org.eclipse.osbp.vaadin.widgetset," + "org.eclipse.osbp.vaadin;bundle-version=\"2.7.3\","
- + "org.eclipse.osbp.webserver.messagequeue;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.xtext.builder.metadata.services;bundle-version=\"0.9.1\","
- + "org.eclipse.osbp.xtext.cubedsl;bundle-version=\"0.9.0\";resolution:=optional,"
- + "org.eclipse.osbp.xtext.datamartdsl;bundle-version=\"0.9.0\";resolution:=optional,"
- + "org.eclipse.osbp.xtext.entitymock.common;bundle-version=\"0.9.0\"," + "org.eclipse.osbp.xtext.functionlibrary.common,"
- + "org.eclipse.osbp.xtext.menu;bundle-version=\"0.1.0\"," + "org.eclipse.osbp.xtext.table.common;bundle-version=\"0.1.0\","
+ + "org.eclipse.osbp.abstractstatemachine,"
+ + "org.eclipse.osbp.authentication," + "org.eclipse.osbp.authentication.ui,"
+ + "org.eclipse.osbp.bpm," + "org.eclipse.osbp.bpm.api,"
+ + "org.eclipse.osbp.blob,"
+ + "org.eclipse.osbp.datainterchange.api," + "org.eclipse.osbp.dsl.common.xtext,"
+ + "org.eclipse.osbp.dsl.datatype.lib," + "org.eclipse.osbp.dsl.dto.lib," + "org.eclipse.osbp.dsl.dto.xtext,"
+ + "org.eclipse.osbp.dsl.entity.xtext," + "org.eclipse.osbp.ecview.core.common.editparts.emf,"
+ + "org.eclipse.osbp.ecview.core.common.model," + "org.eclipse.osbp.ecview.core.common,"
+ + "org.eclipse.osbp.ecview.core.extension.model," + "org.eclipse.osbp.ecview.dsl.lib,"
+ + "org.eclipse.osbp.ecview.dsl;resolution:=optional," + "org.eclipse.osbp.ecview.extension.api,"
+ + "org.eclipse.osbp.ecview.extension.editparts.emf," + "org.eclipse.osbp.ecview.extension.editparts,"
+ + "org.eclipse.osbp.ecview.extension.grid.editparts," + "org.eclipse.osbp.ecview.extension.grid.model,"
+ + "org.eclipse.osbp.ecview.extension.model," + "org.eclipse.osbp.ecview.extension.presentation.vaadin,"
+ + "org.eclipse.osbp.ecview.extension.strategy," + "org.eclipse.osbp.ecview.extension.widgetset,"
+ + "org.eclipse.osbp.ecview.xtext.builder.participant," + "org.eclipse.osbp.eventbroker,"
+ + "org.eclipse.osbp.fork.jpos;bundle-version=\"1.14.0\","
+ + "org.eclipse.osbp.gitinfo," + "org.eclipse.osbp.infogrid.api,"
+ + "org.eclipse.osbp.infogrid.vaaclipse," + "org.eclipse.osbp.jpa.services,"
+ + "org.eclipse.osbp.mobile.vaadin.ecview.api," + "org.eclipse.osbp.mobile.vaadin.ecview.model,"
+ + "org.eclipse.osbp.preferences,"
+ + "org.eclipse.osbp.osgi.hybrid.api," + "org.eclipse.osbp.runtime.common,"
+ + "org.eclipse.osbp.runtime.jsr303.validation," + "org.eclipse.osbp.runtime.web.ecview.presentation.vaadin,"
+ + "org.eclipse.osbp.runtime.web.vaadin.common," + "org.eclipse.osbp.runtime.web.vaadin.databinding,"
+ + "org.eclipse.osbp.ui.api,"
+ + "org.eclipse.osbp.ui.common," + "org.eclipse.osbp.user,"
+ + "org.eclipse.osbp.utils.functionnormalizer,"
+ + "org.eclipse.osbp.utils.themes.ui," + "org.eclipse.osbp.utils.ui,"
+ + "org.eclipse.osbp.utils," + "org.eclipse.osbp.vaaclipse.addons.common.api,"
+ + "org.eclipse.osbp.vaaclipse.addons.softwarefactory," + "org.eclipse.osbp.vaaclipse.api,"
+ + "org.eclipse.osbp.vaaclipse.common.ecview.api," + "org.eclipse.osbp.vaaclipse.publicapi,"
+ + "org.eclipse.osbp.vaaclipse.theme," + "org.eclipse.osbp.vaadin.widgetset," + "org.eclipse.osbp.vaadin,"
+ + "org.eclipse.osbp.webserver.messagequeue," + "org.eclipse.osbp.xtext.builder.metadata.services,"
+ + "org.eclipse.osbp.xtext.cubedsl;resolution:=optional,"
+ + "org.eclipse.osbp.xtext.datamartdsl;resolution:=optional,"
+ + "org.eclipse.osbp.xtext.entitymock.common," + "org.eclipse.osbp.xtext.functionlibrary.common,"
+ + "org.eclipse.osbp.xtext.menu," + "org.eclipse.osbp.xtext.table.common,"
+ "org.eclipse.osgi.services;bundle-version=\"3.4.0\"," + "org.eclipse.persistence.antlr;bundle-version=\"3.2.0\","
+ "org.eclipse.persistence.asm;bundle-version=\"3.3.1\"," + "org.eclipse.persistence.core;bundle-version=\"2.6.0\","
+ "org.eclipse.persistence.jpa;bundle-version=\"2.5.1\"," + "org.eclipse.uomo.core;bundle-version=\"0.6.0\"," + "org.eclipse.uomo.units;bundle-version=\"0.6.0\","
@@ -197,17 +201,17 @@
protected List<String> getImportedPackages() {
List<String> result = Lists.newArrayList(super.getImportedPackages());
return addFromMultiLine(result, ManifestAttribute.IMPORTED_PACKAGE,
- "org.apache.commons.io;version=\"2.1.0\"," + "org.apache.commons.lang," + "org.eclipse.bpmn2,"
- + "org.eclipse.e4.core.contexts," + "org.eclipse.e4.core.di," + "org.eclipse.e4.core.di.annotations," + "org.eclipse.e4.ui.di,"
+ "javax.validation;version=\"1.1.0.Final\"," + "org.apache.commons.io;version=\"2.1.0\"," + "org.apache.commons.lang," + "org.eclipse.bpmn2,"
+ + "org.eclipse.e4.core.di," + "org.eclipse.e4.core.di.annotations," + "org.eclipse.e4.ui.di,"
+ "org.eclipse.e4.ui.model.application," + "org.eclipse.e4.ui.model.application.ui," + "org.eclipse.e4.ui.model.application.ui.basic,"
+ "org.eclipse.e4.ui.model.application.ui.menu," + "org.eclipse.osbp.dsl.common.datatypes,"
- + "org.eclipse.osbp.dsl.dto.lib.impl," + "org.eclipse.osbp.ecview.core.util.emf," + "org.eclipse.osbp.eventbroker," + "org.eclipse.osbp.osgi.hybrid.api,"
- + "org.eclipse.osbp.core.api.persistence," + "org.eclipse.osbp.preferences,"
+ + "org.eclipse.osbp.ecview.core.util.emf," + "org.eclipse.osbp.eventbroker," + "org.eclipse.osbp.osgi.hybrid.api,"
+ + "org.eclipse.osbp.core.api.persistence,"
// + "org.eclipse.osbp.ui.api.contextfunction," + "org.eclipse.osbp.ui.api.metadata," + "org.eclipse.osbp.ui.api.useraccess,"
+ "org.eclipse.osbp.vaaclipse.presentation.engine," + "org.eclipse.osbp.vaaclipse.presentation.renderers," + "org.eclipse.osbp.xtext.blip,"
+ "org.eclipse.osbp.xtext.blip.common," + "org.eclipse.osbp.xtext.datainterchange.common," + "org.eclipse.osbp.xtext.datamart.common,"
+ "org.eclipse.osbp.xtext.datamart.common.olap," + "org.eclipse.osbp.xtext.datamart.common.sql," + "org.eclipse.osbp.xtext.datamartdsl,"
- + "org.eclipse.osbp.xtext.dialogdsl.common," + "org.eclipse.osbp.xtext.functionlibrary.common," + "org.eclipse.osbp.xtext.i18n,"
+ + "org.eclipse.osbp.xtext.dialogdsl.common," + "org.eclipse.osbp.xtext.i18n,"
+ "org.eclipse.osbp.xtext.messagedsl.common," + "org.eclipse.osbp.xtext.reportdsl.common," + "org.eclipse.osbp.xtext.reportdsl.common.attribute,"
+ "org.eclipse.osbp.xtext.reportdsl.common.item," + "org.eclipse.osbp.xtext.reportdsl.jvmmodel,"
+ "org.eclipse.osbp.xtext.reportdsl.oda.datamart.impl," + "org.eclipse.persistence.annotations;version=\"2.5.1\"," + "org.osgi.service.component.annotations;version=\"1.2.0\","
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/FEATURE/__basic__/PROJECT/feature.xml.TEMPLATE_NO_COMMENT b/org.eclipse.osbp.wizard.ui/wizardtemplates/FEATURE/__basic__/PROJECT/feature.xml.TEMPLATE_NO_COMMENT
index ce7e215..09a74da 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/FEATURE/__basic__/PROJECT/feature.xml.TEMPLATE_NO_COMMENT
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/FEATURE/__basic__/PROJECT/feature.xml.TEMPLATE_NO_COMMENT
@@ -159,6 +159,13 @@
unpack="false"/>
<plugin
+ id="${{MODEL_SYMBOLIC_NAME}}.statemachine"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="${{MODEL_SYMBOLIC_NAME}}.table"
download-size="0"
install-size="0"
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.chart/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.core/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.cube/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datamart/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dialog/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.dto/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
index f49603e..e534979 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
@@ -7,26 +7,27 @@
mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Users {
priority 4
- resources {
-
- resource resourceUserAccounts {
- attributes (userName, password, position, enabled, localeTag)
- items {
- ADMIN ( "Admin", "Admin", "Administrator", "false", "en-US" )
- }
- }
- }
-
- entities {
-
- mocking mockUserAccount entity UserAccount resource resourceUserAccounts {
- var userName as userName
- var password as password
- var position as position
- var enabled as enabled
- var localeTag as localeTag
- }
- }
+ resources {
+
+ resource resourceUserAccounts {
+ attributes( userName, password, email, position, enabled, localeTag )
+ items {
+ ADMIN( "Admin", "Admin", "admin@test.local", "Administrator", "false", "en-US" )
+ }
+ }
+ }
+
+ entities {
+
+ mocking mockUserAccount entity UserAccount resource resourceUserAccounts {
+ var userName as userName
+ var password as password
+ var email as email
+ var position as position
+ var enabled as enabled
+ var localeTag as localeTag
+ }
+ }
}
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.functionlibrary/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.menu/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.message/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
index d242963..a036e4e 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
@@ -5,7 +5,7 @@
package ${{MODEL_PROJECT_PACKAGE_NAME}} {
- perspective ${{BUSINESS_BUNDLE}} iconURI "employee" {
+ perspective ${{BUSINESS_BUNDLE}} icon "employee" {
sashContainer ${{BUSINESS_BUNDLE}}1 orientation horizontal {
part ${{BUSINESS_BUNDLE}}Table spaceVolume "50" view editableTable Persons
part ${{BUSINESS_BUNDLE}}View spaceVolume "50" view dialog Person
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.report/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_de_AT.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_de_AT.properties
deleted file mode 100644
index 1c06974..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1 +0,0 @@
-#de_AT
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_en_US.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_en_US.properties
deleted file mode 100644
index 4f2383a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.topology/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1 +0,0 @@
-#en_US
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.dialog/META-INF/MANIFEST.MF.ADDONS b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.dialog/META-INF/MANIFEST.MF.ADDONS
index 9bf56b6..d610274 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.dialog/META-INF/MANIFEST.MF.ADDONS
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.dialog/META-INF/MANIFEST.MF.ADDONS
@@ -11,4 +11,4 @@
${{BASIC_PROJECT_NAME}}.model.report
${{BASIC_PROJECT_NAME}}.model.strategy
FACTORY_MODEL:
- dialog
\ No newline at end of file
+ dialog, ui
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
index 5c58ce4..723e864 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
@@ -8,9 +8,9 @@
resources {
resource resourceUserAccounts {
- attributes (user_name, password, position, enabled, localeTag)
+ attributes( userName, password, email, position, enabled, localeTag )
items {
- ADMIN ( "Admin", "Admin", "Administrator", "false", "en-US" )
+ ADMIN( "Admin", "Admin", "admin@test.local", "Administrator", "false", "en-US" )
}
}
}
@@ -18,10 +18,11 @@
entities {
mocking mockUserAccount entity UserAccount resource resourceUserAccounts {
- var userName as user_name
- var password as password
- var position as position
- var enabled as enabled
+ var userName as userName
+ var password as password
+ var email as email
+ var position as position
+ var enabled as enabled
var localeTag as localeTag
}
}
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/META-INF/MANIFEST.MF.ADDONS b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/META-INF/MANIFEST.MF.ADDONS
new file mode 100644
index 0000000..c94fa27
--- /dev/null
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/META-INF/MANIFEST.MF.ADDONS
@@ -0,0 +1,12 @@
+# ${{BASIC_SYMBOLIC_NAME}}
+# ${{BASIC_PROJECT_NAME}}
+EXPORTED_PACKAGE:
+ ${{MODEL_PROJECT_PACKAGE_NAME}}
+IMPORTED_PACKAGE:
+REQUIRED_BUNDLE:
+ ${{BASIC_PROJECT_NAME}}.model.entity
+ ${{BASIC_PROJECT_NAME}}.model.dto
+ ${{BASIC_PROJECT_NAME}}.model.functionlibrary
+ ${{BASIC_PROJECT_NAME}}.model.report
+FACTORY_MODEL:
+ statemachine
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE
new file mode 100644
index 0000000..b2ce26c
--- /dev/null
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.statemachine/src/BUSINESSBUNDLECLASSNAME.statemachine.TEMPLATE
@@ -0,0 +1,3 @@
+package ${{MODEL_PROJECT_PACKAGE_NAME}} {
+
+}
\ No newline at end of file
