adjusted legal info, adjust wizard to changes in the SWF
diff --git a/org.eclipse.osbp.wizard.ui.feature/feature.xml b/org.eclipse.osbp.wizard.ui.feature/feature.xml
index 9e4e41a..b86f28c 100644
--- a/org.eclipse.osbp.wizard.ui.feature/feature.xml
+++ b/org.eclipse.osbp.wizard.ui.feature/feature.xml
@@ -17,7 +17,7 @@
label="%featureName"
version="0.9.0.qualifier"
provider-name="%providerName"
- plugin="org.eclipse.osbp.wizard.ui">
+ plugin="org.eclipse.osbp.license">
<description>
%description
diff --git a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectInfo.java b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectInfo.java
index bc8b009..1e22d80 100644
--- a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectInfo.java
+++ b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/basic/BasicProjectInfo.java
@@ -816,11 +816,6 @@
return DEFAULT_PROJECT_LOC;
}
- // private Set<EnumDatabaseVendor> getNecessaryDataBaseVendors() {
- // return
- // ProductConfiguration.getNecessaryDataBaseVendors(ProductConfiguration.getPersistenceUnitNames());
- // }
-
public String getEntityPropertyBaseID() {
DataSourceConfiguration ds = ProductConfiguration.getDataSource(dataSourceForBusinessData);
if (ds != null) {
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/AGGREGATOR/__basic__/PROJECT/pom.xml.TEMPLATE_NO_COMMENT b/org.eclipse.osbp.wizard.ui/wizardtemplates/AGGREGATOR/__basic__/PROJECT/pom.xml.TEMPLATE_NO_COMMENT
index d38cec8..eff9812 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/AGGREGATOR/__basic__/PROJECT/pom.xml.TEMPLATE_NO_COMMENT
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/AGGREGATOR/__basic__/PROJECT/pom.xml.TEMPLATE_NO_COMMENT
@@ -49,7 +49,6 @@
<module>${{BASIC_SYMBOLIC_NAME}}.model.organization</module>
<module>${{BASIC_SYMBOLIC_NAME}}.model.perspective</module>
<module>${{BASIC_SYMBOLIC_NAME}}.model.report</module>
- <module>${{BASIC_SYMBOLIC_NAME}}.model.strategy</module>
<module>${{BASIC_SYMBOLIC_NAME}}.model.table</module>
<module>${{BASIC_SYMBOLIC_NAME}}.model.topology</module>
<module>${{BASIC_SYMBOLIC_NAME}}.application</module>
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/Application.e4xmi b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/Application.e4xmi
deleted file mode 100644
index f5e6bab..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/Application.e4xmi
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmi:id="_-mWvcBrzEeOfIsTyD-ldRQ" elementId="${{BASIC_PROJECT_NAME}}.application">
- <children xsi:type="basic:TrimmedWindow" xmi:id="_-mWvcRrzEeOfIsTyD-ldRQ" label="${{BUSINESS_BUNDLE}}" x="20" y="20" width="500" height="400">
- <tags>mainWindow</tags>
- </children>
- <addons xmi:id="_eh1uUAyNEeaoRoao1NdJ3g" elementId="${{BASIC_PROJECT_NAME}}.application.addon.OSBPService" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.softwarefactory/org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.OSBPServiceAddon"/>
- <addons xmi:id="_-mWvchrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
- <addons xmi:id="_-mWvcxrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
- <addons xmi:id="_-mWvdBrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
- <addons xmi:id="_-mWvdRrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
- <addons xmi:id="_-mWvdhrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.ui.workbench.handler.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
- <addons xmi:id="_-mWvdxrzEeOfIsTyD-ldRQ" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
- <addons xmi:id="_32m9YBjyEea-e5UH_hOkzw" elementId="org.eclipse.osbp.vaaclipse.addon.EMFAddon" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.emf.addon/org.eclipse.osbp.vaaclipse.addon.EMFAddon"/>
- <addons xmi:id="_BJLZIJ0bEeeHe6qMHB_oIg" elementId="${{BASIC_PROJECT_NAME}}.application.addon.KeyBindingService" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.keybinding/org.eclipse.osbp.vaaclipse.addons.keybinding.KeyBindingServiceAddon"/>
-</application:Application>
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
index c638914..ff9d5bf 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
@@ -3,36 +3,31 @@
<extension
id="product"
- name="myproduct"
point="org.eclipse.core.runtime.products">
<product
name="${{BUSINESS_BUNDLE}}"
application="org.eclipse.osbp.vaaclipse.addons.app.application">
<property
name="clearPersistedState"
- value="true">
+ value="false">
</property>
<property
name="appName"
value="${{BUSINESS_BUNDLE}}">
</property>
<property
- name="applicationXMI"
- value="${{APPLICATION_SYMBOLIC_NAME}}/Application.e4xmi">
- </property>
- <property
name="applicationWidgetset"
- value="platform:/plugin/org.eclipse.osbp.vaadin.widgetset/VAADIN/widgetsets/org.eclipse.osbp.vaadin.widgetset.widgetsets.OSBPWidgetset">
+ value="org.eclipse.osbp.vaadin.widgetset/VAADIN/widgetsets/org.eclipse.osbp.vaadin.widgetset.widgetsets.OSBPWidgetset">
</property>
<!--
<property
name="applicationHeaderIcon"
- value="platform:/plugin/${{PRODUCT_SYMBOLIC_NAME}}/img/logo.png">
+ value="${{PRODUCT_SYMBOLIC_NAME}}/img/logo.png">
</property>
-->
<property
name="applicationAuthenticationProvider"
- value="bundleclass://org.eclipse.osbp.authentication.ui/org.eclipse.osbp.authentication.ui.login.AuthenticationProvider">
+ value="org.eclipse.osbp.authentication.ui/org.eclipse.osbp.authentication.ui.login.AuthenticationProvider">
</property>
<property
name="vaadin.productionMode"
@@ -47,6 +42,10 @@
value="AUTOMATIC">
</property>
<property
+ name="showFrame"
+ value="false">
+ </property>
+ <property
name="startupForegroundColor"
value="000000">
</property>
@@ -67,8 +66,5 @@
<extension
id="${{APPLICATION_SYMBOLIC_NAME}}"
point="org.eclipse.e4.workbench.model">
- <fragment apply="notexists"
- uri="problemsViewFragment.e4xmi">
- </fragment>
</extension>
</plugin>
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/problemsViewFragment.e4xmi b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/problemsViewFragment.e4xmi
deleted file mode 100644
index 1fd221a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/problemsViewFragment.e4xmi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:basic_1="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_MNDvwMWxEeSzw8CCZBgGfQ">
- <fragments xsi:type="fragment:StringModelFragment" xmi:id="_ieGRoM-xEeSscMz1WjkrfA" featurename="descriptors" parentElementId="org.eclipse.e4.ide.application">
- <elements xsi:type="basic:PartDescriptor" xmi:id="_VG-MkM--EeSqGowmJdFaKQ" elementId="org.eclipse.osbp.vaaclipse.addons.problems.partdescriptor.problems" label="Problems view" iconURI="platform:/plugin/org.eclipse.osbp.vaaclipse.addons.problems/images/problems.png" tooltip="Problems view" category="org.eclipse.osbp.vaaclipse.addons.application.partstack.bottom" closeable="true" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.problems/org.eclipse.osbp.vaaclipse.addons.problems.views.ProblemsView">
- <tags>View</tags>
- <toolbar xmi:id="_7ANhYEEDEeWrZbjw3rhvHw" elementId="org.eclipse.osbp.vaaclipse.addons.problems.toolbar.0">
- <children xsi:type="menu:DirectToolItem" xmi:id="_8qvJgEEDEeWrZbjw3rhvHw" elementId="org.eclipse.osbp.vaaclipse.addons.problems.directtoolitem.showAllMessages" label="Show all messages" iconURI="platform:/plugin/org.eclipse.osbp.vaaclipse.addons.problems/images/showAllMessages.png" tooltip="Show all messages" type="Check" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.problems/org.eclipse.osbp.vaaclipse.addons.problems.handler.ShowAllMessagesHandler"/>
- </toolbar>
- </elements>
- </fragments>
- <fragments xsi:type="fragment:StringModelFragment" xmi:id="_99lXAN0iEeSOjIDi2pwsFg" featurename="sharedElements" parentElementId="mainWindow">
- <elements xsi:type="basic_1:Part" xmi:id="_G4dAQN0jEeSOjIDi2pwsFg" elementId="org.eclipse.osbp.vaaclipse.addons.problems.partdescriptor.problems" accessibilityPhrase="" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.problems/org.eclipse.osbp.vaaclipse.addons.problems.views.ProblemsView" label="Problems" iconURI="platform:/plugin/org.eclipse.osbp.vaaclipse.addons.problems/images/problems.png" tooltip="Problems" closeable="true">
- <toolbar xmi:id="_-icSAEEDEeWrZbjw3rhvHw" elementId="org.eclipse.osbp.vaaclipse.addons.problems.toolbar.1">
- <children xsi:type="menu:DirectToolItem" xmi:id="_Dqfw8EEEEeWrZbjw3rhvHw" elementId="org.eclipse.osbp.vaaclipse.addons.problems.directtoolitem.showAllMessages" label="Show all messages" iconURI="platform:/plugin/org.eclipse.osbp.vaaclipse.addons.problems/images/showAllMessages.png" tooltip="Show all messages" type="Check" contributionURI="bundleclass://org.eclipse.osbp.vaaclipse.addons.problems/org.eclipse.osbp.vaaclipse.addons.problems.handler.ShowAllMessagesHandler"/>
- </toolbar>
- </elements>
- </fragments>
-</fragment:ModelFragments>
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 09a74da..d43624f 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
@@ -152,13 +152,6 @@
unpack="false"/>
<plugin
- id="${{MODEL_SYMBOLIC_NAME}}.strategy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="${{MODEL_SYMBOLIC_NAME}}.statemachine"
download-size="0"
install-size="0"
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/src/BUSINESSBUNDLECLASSNAME.authorization.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/src/BUSINESSBUNDLECLASSNAME.authorization.TEMPLATE
index fbbfb6c..6af4433 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/src/BUSINESSBUNDLECLASSNAME.authorization.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.authorization/src/BUSINESSBUNDLECLASSNAME.authorization.TEMPLATE
@@ -1,6 +1,8 @@
+import ns ${{BASIC_PROJECT_NAME}}.model.entities.Person
package ${{MODEL_PROJECT_PACKAGE_NAME}} {
- role User {
+ role Admin {
+ entity Person ANY
}
}
\ 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 e534979..3e0abdb 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
@@ -10,9 +10,9 @@
resources {
resource resourceUserAccounts {
- attributes( userName, password, email, position, enabled, localeTag )
+ attributes( userName, password, email, position, enabled, localeTag, isSuperuser )
items {
- ADMIN( "Admin", "Admin", "admin@test.local", "Administrator", "false", "en-US" )
+ ADMIN( "Admin", "Admin", "admin@test.local", "Admin", "false", "en-US", "true" )
}
}
}
@@ -26,9 +26,9 @@
var position as position
var enabled as enabled
var localeTag as localeTag
+ var superuser as isSuperuser
}
}
-
}
mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Entities{
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/src/BUSINESSBUNDLECLASSNAME.organization.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/src/BUSINESSBUNDLECLASSNAME.organization.TEMPLATE
index f24bd23..d0d06c5 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/src/BUSINESSBUNDLECLASSNAME.organization.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.organization/src/BUSINESSBUNDLECLASSNAME.organization.TEMPLATE
@@ -1,5 +1,11 @@
-import ns ${{BASIC_PROJECT_NAME}}.model.authorizations.Administrator
+import ns ${{BASIC_PROJECT_NAME}}.model.authorizations.Admin
package ${{MODEL_PROJECT_PACKAGE_NAME}} {
+ organization FoodMart Title "FoodMart" {
+
+ position Admin alias "Admin" {
+ role Admin
+ }
+ }
}
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N.properties
deleted file mode 100644
index dcdbfad..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#default
-export=export
-import=import
-sample=sample
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de.properties
deleted file mode 100644
index dd9e54b..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_de.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Generated by Eclipse Messages Editor (Eclipse Babel)
-#de
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en.properties
deleted file mode 100644
index d45ebfe..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_en.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Eclipse Messages Editor (Eclipse Babel)
-#en
-export = Export
-import = Import
-sample = Sample
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_fr.properties b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_fr.properties
deleted file mode 100644
index 7a963f3..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/i18n/I18N_fr.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Generated by Eclipse Messages Editor (Eclipse Babel)
-#fr
-export = Export
-import = Import
-
-
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE
deleted file mode 100644
index b7ee7b0..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE
+++ /dev/null
@@ -1,29 +0,0 @@
-package ${{MODEL_PROJECT_PACKAGE_NAME}} {
-
- strategy {
- targets {
- layoutingStrategy GenForm2 layout=Form2
- layoutingStrategy GenForm3 layout=Form3
- layoutingStrategy GenHorizontal layout=Horizontal
- layoutingStrategy GenVertical layout=Vertical
- layoutingStrategy GenGrid layout=Grid
- layoutingStrategy GenCss layout=Css
- focusingStrategy GenAltEnter ecviewFocusingId=cxAltEnterForward focus=Forward keyStrokeDefinition {
- keyCode=ENTER modifierKeys{ALT}
- }
- focusingStrategy GenEnter ecviewFocusingId=cxEnterForward focus=Forward keyStrokeDefinition {
- keyCode=ENTER
- }
- focusingStrategy GenTab ecviewFocusingId=cxEnTabForward focus=Forward keyStrokeDefinition {
- keyCode=TAB
- }
- focusingEnhancer GenEnterTab {
- GenEnter GenTab
- }
- }
- default {
- defaultLayouting=GenForm2
- defaultFocusing=GenEnterTab
- }
- }
-}
\ 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 d610274..3711021 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
@@ -9,6 +9,5 @@
${{BASIC_PROJECT_NAME}}.model.dto
${{BASIC_PROJECT_NAME}}.model.message
${{BASIC_PROJECT_NAME}}.model.report
- ${{BASIC_PROJECT_NAME}}.model.strategy
FACTORY_MODEL:
dialog, ui
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
index d284258..c88da44 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
@@ -3,11 +3,6 @@
package ${{MODEL_PROJECT_PACKAGE_NAME}} {
- mappedSuperclass BaseID {
- ${{ENTITY_PROPERTY_BASE_ID}} id
- version int version
- }
-
mappedSuperclass BaseUUID {
${{ENTITY_PROPERTY_BASE_UUID}} id
version int version
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/META-INF/MANIFEST.MF.ADDONS b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/META-INF/MANIFEST.MF.ADDONS
deleted file mode 100644
index 64fa5d3..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/META-INF/MANIFEST.MF.ADDONS
+++ /dev/null
@@ -1,8 +0,0 @@
-# ${{BASIC_SYMBOLIC_NAME}}
-# ${{BASIC_PROJECT_NAME}}
-EXPORTED_PACKAGE:
- ${{MODEL_PROJECT_PACKAGE_NAME}}
-IMPORTED_PACKAGE:
-REQUIRED_BUNDLE:
-FACTORY_MODEL:
- strategy
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE
deleted file mode 100644
index b7ee7b0..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.strategy/src/BUSINESSBUNDLECLASSNAME.strategy.TEMPLATE
+++ /dev/null
@@ -1,29 +0,0 @@
-package ${{MODEL_PROJECT_PACKAGE_NAME}} {
-
- strategy {
- targets {
- layoutingStrategy GenForm2 layout=Form2
- layoutingStrategy GenForm3 layout=Form3
- layoutingStrategy GenHorizontal layout=Horizontal
- layoutingStrategy GenVertical layout=Vertical
- layoutingStrategy GenGrid layout=Grid
- layoutingStrategy GenCss layout=Css
- focusingStrategy GenAltEnter ecviewFocusingId=cxAltEnterForward focus=Forward keyStrokeDefinition {
- keyCode=ENTER modifierKeys{ALT}
- }
- focusingStrategy GenEnter ecviewFocusingId=cxEnterForward focus=Forward keyStrokeDefinition {
- keyCode=ENTER
- }
- focusingStrategy GenTab ecviewFocusingId=cxEnTabForward focus=Forward keyStrokeDefinition {
- keyCode=TAB
- }
- focusingEnhancer GenEnterTab {
- GenEnter GenTab
- }
- }
- default {
- defaultLayouting=GenForm2
- defaultFocusing=GenEnterTab
- }
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT b/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
index 1ebff34..2204685 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
@@ -16,6 +16,7 @@
-Dorg.eclipse.osbp.ecview.jetty.contextpath=${{PRODUCT_URL_PATH}}
-Dorg.eclipse.osbp.ecview.jetty.port=${{PRODUCT_PORT_NO}}
-Dmvel2.disable.jit=true
+-Dbitronix.tm.journal=null
-Dlog4j.configuration=file:///${{PROJECT_LOC}}/META-INF/log4j.xml
-Dlogback.configurationFile=${{PROJECT_LOC}}/META-INF/logback.xml
-DproductConfigurationFile=${{PROJECT_LOC}}/DEFAULTFILE
