parallel ip - initial checkin

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/.project b/.project
new file mode 100644
index 0000000..4f461ad
--- /dev/null
+++ b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.vaaclipse.addons.softwarefactory.aggregator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/about.html b/about.html
new file mode 100644
index 0000000..64c0598
--- /dev/null
+++ b/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 1, 2016</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
new file mode 100644
index 0000000..663dcfe
--- /dev/null
+++ b/jenkins.build.config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2016 - Loetz GmbH&Co.KG                                    -->
+<!--# All rights reserved. This program and the accompanying materials 		 -->
+<!--# are made available under the terms of the Eclipse Public License v1.0  -->
+<!--# which accompanies this distribution, and is available at               -->
+<!--# http://www.eclipse.org/legal/epl-v10.html                              -->
+<!--#                                                                        -->
+<!--# Contributors:                                                          -->
+<!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation                           -->
+<!--#======================================================================= -->
+<!--# Module specific parameters for the Jenkins Job 						 -->
+<!--#======================================================================= -->
+
+<jenkins>
+	<!-- DO NOT EDIT BELOW THIS LINE -->
+        <jenkins.build.dependencies>
+                <jenkins.build.dependency>org.eclipse.osbp.authentication</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.bpm.api</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.dsl</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.dsl.metadata.service</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.ecview.core</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.ecview.extension.api</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.eventbroker</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.i18n.common</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.infogrid</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.persistence</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.preferences</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.report</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.runtime</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.runtime.web</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.ui.api</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.ui.common</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.utils</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.utils.blob</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.utils.bpmn</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.utils.themes.ui</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.utils.ui</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.vaaclipse</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.vaadin.emf</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.i18n</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.menu</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.perspective</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.strategy</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.table</jenkins.build.dependency>
+        </jenkins.build.dependencies>
+</jenkins>
diff --git a/notice.html b/notice.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/notice.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/.project b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/.project
new file mode 100644
index 0000000..e04d0be
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt
new file mode 100644
index 0000000..ff42ad4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt
@@ -0,0 +1,161 @@
+Eclipse Public License -v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
+OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
+A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
+modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
+its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
+and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
+form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
+combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
+apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
+assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
+rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
+Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
+grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
+warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
+other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
+in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
+the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
+the Program in a commercial product offering should do so in a manner which does not create potential liability for
+other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
+brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
+ participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
+then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
+Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
+those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
+the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
+determining the appropriateness of using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
+with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
+Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
+noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
+of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
+ granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
+is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
+new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
+right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
+distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
+new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
+of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
+of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties
new file mode 100644
index 0000000..72ef22d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = epl-v10.html,  feature.xml,\
+               feature.properties,\
+               license.html,\
+               LICENSE.txt
+src.includes = epl-v10.html,  LICENSE.txt,\
+               license.html
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html
new file mode 100644
index 0000000..b398acc
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html
@@ -0,0 +1,259 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties
new file mode 100644
index 0000000..fa76f46
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties
@@ -0,0 +1,169 @@
+###############################################################################
+# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cristiano Gavião - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName =OSBP Feature: Vaaclipse Addons 
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse OSBP
+
+# "description" property - description of the feature
+description=This feature provides the bundles for Vaaclipse Addons.
+
+# "updateSiteName" property - label for the update site
+updateSiteName=
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml
new file mode 100644
index 0000000..b2cc6ba
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
+<!--# All rights reserved. This program and the accompanying materials -->
+<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# which accompanies this distribution, and is available at -->
+<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# -->
+<!--# Contributors: -->
+<!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
+<!--#======================================================================= -->
+
+<feature
+        id="org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature"
+        label="%featureName"
+        version="0.9.0.qualifier"
+        provider-name="%providerName">
+        
+    <description>
+        %description
+    </description>
+        
+    <copyright>
+        %copyright
+    </copyright>
+        
+    <license url="%licenseURL">
+        %license
+    </license>
+        
+    <plugin
+        id="org.eclipse.osbp.vaaclipse.addons.softwarefactory"
+        download-size="0"
+        install-size="0"
+        version="0.0.0"
+        unpack="false"/>
+        
+</feature>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html
new file mode 100644
index 0000000..6e579a5
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html
@@ -0,0 +1,164 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml
new file mode 100644
index 0000000..8d1f3d4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
+<!--# All rights reserved. This program and the accompanying materials -->
+<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# which accompanies this distribution, and is available at -->
+<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# -->
+<!--# Contributors: -->
+<!--# Christophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation API and implementation -->
+<!--#======================================================================= -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</groupId>
+		<artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory.aggregator</artifactId>
+		<version>0.9.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	
+		<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<labelSuffix> (source)</labelSuffix>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!-- workaround while bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=398250 
+					is not fixed -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attached-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</groupId>
+			<artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</artifactId>
+			<version>0.9.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/main/javadoc/README.txt b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/main/javadoc/README.txt
new file mode 100644
index 0000000..831da7e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/main/javadoc/README.txt
@@ -0,0 +1 @@
+Resource folder for javadoc resources.
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/overview.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/overview.html
new file mode 100644
index 0000000..279944e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/src/overview.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+	<title>OSBP Tools Graphical Entity</title>
+</head>
+<body>
+<p>The <strong>OSBP&nbsp;Vaaclipse Addons (Softwarefactory) i</strong>mplements an E4 addon to be called at the start of application to establish basic functions in the eclipse context: a BPMTaskClient to handle BPM task lifecycle and provide notification to subscribers on the completion of task events.</p>
+
+<p>Three&nbsp;tool controls for</p>
+
+<ol>
+	<li>switching languages I18Nhandler,</li>
+	<li>switching layout and</li>
+	<li>focusing strategies StrategyHandler and a ThemeHandler to switch themes.</li>
+</ol>
+
+<p>These handlers are intended to be used&nbsp;in&nbsp;demo environments only.</p>
+
+<p>&nbsp;</p>
+
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/.project b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/.project
new file mode 100644
index 0000000..a1f4e4b
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/.project
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.vaaclipse.addons.softwarefactory</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.vaadin.integration.eclipse.addonStylesBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.babel.editor.rbeBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.sonarlint.eclipse.core.sonarlintNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.babel.editor.rbeNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt
new file mode 100644
index 0000000..ff42ad4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt
@@ -0,0 +1,161 @@
+Eclipse Public License -v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
+OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
+A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
+modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
+its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
+and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
+form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
+combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
+apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
+assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
+rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
+Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
+grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
+warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
+other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
+in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
+the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
+the Program in a commercial product offering should do so in a manner which does not create potential liability for
+other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
+brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
+ participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
+then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
+Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
+those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
+the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
+determining the appropriateness of using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
+with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
+Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
+noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
+of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
+ granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
+is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
+new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
+right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
+distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
+new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
+of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
+of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..52c8e80
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF
@@ -0,0 +1,98 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.osbp.vaaclipse.addons.softwarefactory
+Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.addons.softwarefactory
+Bundle-Vendor: Eclipse OSBP
+Bundle-Version: 0.9.0.qualifier
+Require-Bundle: org.slf4j.api;bundle-version="1.7.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.client;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
+ org.eclipse.e4.core.contexts;bundle-version="1.3.100",
+ org.eclipse.e4.ui.di;bundle-version="1.0.0",
+ org.eclipse.e4.ui.workbench;bundle-version="1.2.2",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
+ org.eclipse.e4.core.services;bundle-version="1.2.1",
+ org.eclipse.e4.core.di;bundle-version="1.4.0",
+ org.eclipse.e4.core.di.extensions;bundle-version="0.12.0",
+ org.eclipse.core.databinding;bundle-version="1.4.2",
+ org.eclipse.osbp.vaaclipse.presentation;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.7.3,2.8.0)",
+ org.apache.commons.lang3;bundle-version="3.4.0",
+ org.eclipse.osgi.services;bundle-version="3.4.0",
+ osgi.enterprise;bundle-version="4.2.0",
+ javax.persistence;bundle-version="2.1.0",
+ javax.annotation;bundle-version="[1.1.0,1.2.0)",
+ javax.inject;bundle-version="1.0.0",
+ org.eclipse.osbp.vaaclipse.api;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.vaaclipse.publicapi;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.runtime.web.vaadin.databinding;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.dsl.entity.xtext;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)",
+ org.drools.api;bundle-version="[5.5.1,5.5.2)",
+ org.eclipse.osbp.preferences;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.utils;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.perspective;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.eventbroker;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.persistence;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.utils.themes.ui;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.utils.ui;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ecview.extension.api;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.i18n;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.gitinfo;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ui.common;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.dsl.metadata.service;bundle-version="0.9.0",
+ org.eclipse.osbp.dsl.dto.lib;bundle-version="0.9.0",
+ org.eclipse.core.databinding.beans,
+ org.eclipse.osbp.infogrid.vaaclipse;bundle-version="0.9.0",
+ javax.servlet;bundle-version="3.0.0",
+ org.eclipse.osbp.report;bundle-version="0.9.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: javax.validation,
+ org.eclipse.osbp.authentication.account.dtos;version="0.9.0",
+ org.eclipse.osbp.authentication.account.dtos.mapper;version="0.9.0",
+ org.eclipse.osbp.authentication.account.dtos.service;version="0.9.0",
+ org.eclipse.osbp.authentication.account.entities;version="0.9.0",
+ org.eclipse.osbp.bpm.api;version="0.9.0",
+ org.eclipse.osbp.dsl.common.datatypes;version="0.9.0",
+ org.eclipse.osbp.dsl.xtext.builder.participant;version="0.9.0",
+ org.eclipse.osbp.i18n.common;version="0.9.0",
+ org.eclipse.osbp.runtime.web.vaadin.common.data;version="0.9.0",
+ org.eclipse.osbp.ui.api.contextfunction;version="0.9.0",
+ org.eclipse.osbp.ui.api.customfields;version="0.9.0",
+ org.eclipse.osbp.ui.api.metadata;version="0.9.0",
+ org.eclipse.osbp.ui.api.organization;version="0.9.0",
+ org.eclipse.osbp.ui.api.report;version="0.9.0",
+ org.eclipse.osbp.ui.api.themes;version="0.9.0",
+ org.eclipse.osbp.ui.api.user;version="0.9.0",
+ org.eclipse.osbp.ui.api.useraccess;version="0.9.0",
+ org.eclipse.osbp.ui.api.userfilter;version="0.9.0",
+ org.eclipse.osbp.utils.blob.component;version="0.9.0",
+ org.eclipse.osbp.utils.bpmn.views;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.common.ecview.api;version="0.9.0",
+ org.eclipse.osbp.vaadin.emf.api;version="0.9.0",
+ org.eclipse.osbp.vaadin.emf.data.fields;version="0.9.0",
+ org.eclipse.osbp.vaadin.optiondialog;version="0.9.0",
+ org.eclipse.osbp.xtext.builder.metadata.services;version="0.9.0",
+ org.eclipse.osbp.xtext.menu.common;version="0.9.0",
+ org.eclipse.osbp.xtext.strategy;version="0.9.0",
+ org.eclipse.osbp.xtext.table;version="0.9.0",
+ org.eclipse.xtext.resource,
+ org.jbpm.task.query,
+ org.vaadin.hene.popupbutton;version="2.5.0"
+Export-Package: org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.service;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter;version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.softwarefactory.welcome;version="0.9.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.osbp.vaaclipse.addons.softwarefactory.Activator
+Service-Component: OSGI-INF/*.xml
+Factory-Translations: 
+
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction.xml
new file mode 100644
index 0000000..3628b1d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction">
+   <property name="service.context.key" value="MainToolbar"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <implementation class="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction"/>
+</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction.xml
new file mode 100644
index 0000000..7a4ea5e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction">
+   <property name="service.context.key" value="UserFilter"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <implementation class="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction"/>
+</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html
new file mode 100644
index 0000000..64c0598
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 1, 2016</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.ini b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.ini
new file mode 100644
index 0000000..7df671f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.ini
@@ -0,0 +1,17 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+welcomePage=
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.mappings b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.mappings
new file mode 100644
index 0000000..4511a0a
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=qualifier
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties
new file mode 100644
index 0000000..5a79185
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Loetz GmbH&Co.KG - initial API and implementation
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=org.eclipse.osbp.vaaclipse.addons.softwarefactory
+
+################ blurb property ####################################
+featureText=\
+Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    Loetz GmbH&Co.KG - implementation\n
+################ end of blurb property ####################################
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/build.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/build.properties
new file mode 100644
index 0000000..d332951
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = about.properties,\
+               about.mappings,\
+               about.ini,\
+               about.html,\
+               META-INF/,\
+               .settings/,\
+               .,\
+               OSGI-INF/,\
+               license.html,\
+               LICENSE.txt,\
+               i18n/
+src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
+               LICENSE.txt
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html
new file mode 100644
index 0000000..b398acc
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html
@@ -0,0 +1,259 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties
new file mode 100644
index 0000000..3e9888f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties
@@ -0,0 +1,46 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#default
+
+all = all
+
+all_tip = all_tip\u0009
+
+data = data
+
+data_tip = All entries of the entity are displayed here
+
+entity = entity
+
+entity_tip = Choose here  which entity data is to be locked or unlocked
+
+invers = inverse
+
+invers_tip = If you check this box then the selected data is locked. Unselected data will be unlocked.
+
+locale_tooltip = locale_tooltip
+
+logout_button_tooltip = logout_button_tooltip
+
+none = none
+
+none_tip = If you press this button then none of the entries will be selected.
+
+position_label_tooltip = position_label_tooltip
+
+print_service_tooltip = Print Service
+
+save = save
+
+save_tip = If you press this button , the current selection is stored . Only the selected items are then visible to the user . If the option is "inverse" is selected, the selected entries are invisible .
+
+strategy_tooltip = strategy_tooltip
+
+themes_tooltip = themes
+
+user_label_tooltip = user_label_tooltip
+
+user_menu_tooltip = user_menu_tooltip
+
+username = Username
+
+username_tip = Enter the user name for locking or unlocking of the data.
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties
new file mode 100644
index 0000000..ce81f35
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties
@@ -0,0 +1,46 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#de
+
+all = alle
+
+all_tip = Alle Eintr\u00E4ge der Entit\u00E4t zuf\u00FCgen
+
+data = Daten der Entit\u00E4t
+
+data_tip = Alle Eintr\u00E4ge der Entit\u00E4t werde hier angezeigt
+
+entity = Entit\u00E4t ausw\u00E4hlen
+
+entity_tip = W\u00E4hlen Sie hier welche Entit\u00E4tsdaten gesperrt oder freigegeben werden sollen
+
+invers = umgekehrt
+
+invers_tip = Wenn Sie diese Option aktivieren , dann werden die ausgew\u00E4hlten Daten gesperrt. Nicht ausgew\u00E4hlte Daten werden entsperrt.
+
+locale_tooltip = Lokalisierung
+
+logout_button_tooltip = Abmelden
+
+none = keiner
+
+none_tip = Wenn Sie diese Taste dr\u00FCcken, wird keiner der Eintr\u00E4ge ausgew\u00E4hlt werden.
+
+position_label_tooltip = Position
+
+print_service_tooltip = Drucker
+
+save = speichern
+
+save_tip = Wenn Sie diese Taste dr\u00FCcken, wird die aktuelle Auswahl gespeichert. Nur die ausgew\u00E4hlten Eintr\u00E4ge sind dann f\u00FCr den Benutzer sichtbar. Wenn die Option "umgekehrt" gew\u00E4hlt ist, sind die gew\u00E4hlten Eintr\u00E4ge unsichtbar.
+
+strategy_tooltip = Anordnungsstrategie
+
+themes_tooltip = Darstellungen
+
+user_label_tooltip = Benutzername
+
+user_menu_tooltip = Aufklappmen\u00FC
+
+username = Benutzername
+
+username_tip = Geben Sie den Benutzernamen ein f\u00FCr den eine Sperrung oder Freigabe der Daten erfolgen soll.
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties
new file mode 100644
index 0000000..2d4f90c
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties
@@ -0,0 +1,4 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#de_AT
+
+print_service_tooltip = 
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties
new file mode 100644
index 0000000..f72609b
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties
@@ -0,0 +1,46 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#en
+
+all = all
+
+all_tip = add all entries
+
+data = data
+
+data_tip = All entries of the entity are displayed here
+
+entity = select entity
+
+entity_tip = Choose here  which entity data is to be locked or unlocked
+
+invers = inverse
+
+invers_tip = If you check this box then the selected data is locked. Unselected data will be unlocked.
+
+locale_tooltip = Localization
+
+logout_button_tooltip = Log-out
+
+none = none
+
+none_tip = If you press this button then none of the entries will be selected.
+
+position_label_tooltip = Position
+
+print_service_tooltip = Print Service
+
+save = save
+
+save_tip = If you press this button , the current selection is stored . Only the selected items are then visible to the user . If the option is "inverse" is selected, the selected entries are invisible .
+
+strategy_tooltip = Layout strategy
+
+themes_tooltip = Themes
+
+user_label_tooltip = User name
+
+user_menu_tooltip = Drop-down menu
+
+username = Username
+
+username_tip = Enter the user name for locking or unlocking of the data.
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties
new file mode 100644
index 0000000..006cf4f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties
@@ -0,0 +1,4 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#en_US
+
+print_service_tooltip = 
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties
new file mode 100644
index 0000000..a26a5b0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties
@@ -0,0 +1,46 @@
+#Generated by Eclipse Messages Editor (Eclipse Babel)
+#fr
+
+all = tout
+
+all_tip = Ajouter tous les entr\u00E9es de l'entit\u00E9
+
+data = Les donn\u00E9es de l'entit\u00E9
+
+data_tip = Toutes les entr\u00E9es de l'entit\u00E9 seront affich\u00E9s ici
+
+entity = S\u00E9lectionnez l'entit\u00E9
+
+entity_tip = Choisissez ici quelles donn\u00E9es entit\u00E9 doit \u00EAtre verrouill\u00E9 ou d\u00E9verrouill\u00E9
+
+invers = invers\u00E9e
+
+invers_tip = Si vous cochez cette case , puis les donn\u00E9es s\u00E9lectionn\u00E9es est verrouill\u00E9. Des donn\u00E9es non s\u00E9lectionn\u00E9s seront d\u00E9verrouill\u00E9s.
+
+locale_tooltip = Localisation
+
+logout_button_tooltip = D\u00E9connecter
+
+none = aucun
+
+none_tip = Si vous appuyez sur ce bouton aucune des entr\u00E9es sera s\u00E9lectionn\u00E9 .
+
+position_label_tooltip = Position
+
+print_service_tooltip = 
+
+save = sauvegarder
+
+save_tip = Si vous appuyez sur ce bouton , la s\u00E9lection en cours est stock\u00E9 . Seuls les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s sont alors visibles \u00E0 l'utilisateur. Si l'option est "invers\u00E9e" est s\u00E9lectionn\u00E9, les entr\u00E9es s\u00E9lectionn\u00E9es sont invisibles .
+
+strategy_tooltip = Strat\u00E9gy d'arrangement
+
+themes_tooltip = Pr\u00E9sentations
+
+user_label_tooltip = Nom d'utiliseur
+
+user_menu_tooltip = Menu d\u00E9roulant
+
+username = Utilisateur
+
+username_tip = Entrez le nom d'utilisateur pour une activation ou la d\u00E9sactivation des donn\u00E9es \u00E0 effectuer.
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html
new file mode 100644
index 0000000..6e579a5
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html
@@ -0,0 +1,164 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.png b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.png
new file mode 100644
index 0000000..dde11c2
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.png
Binary files differ
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.ucls b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.ucls
new file mode 100644
index 0000000..32b8a69
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/model.ucls
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.10" icons="true" automaticImage="PNG" always-add-relationships="false" 
+  generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true" 
+  router="FAN">  
+  <class id="1" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.I18NHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="214" y="365"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="924" y="164"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.EntityComboBoxValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1437" y="672"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.StrategyHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="53" width="256" x="90" y="37"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.ThemeResourceService" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="506"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.SaveClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1820" y="507"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserAccountFilterHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="575" y="364"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="570" y="294"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="224" y="460"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="10" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl.PostponeNotification" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/PostponeNotification.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="139"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="11" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.UserHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="219" y="138"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="12" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="912" y="598"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="13" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterSelectNoneClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1660" y="597"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="14" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserAccountFilterDialogContent" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterDialogContent.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1518" y="227"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="15" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.ThemeResourceService.TypeItem" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="599"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="16" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveSupport" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveSupport.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1225" y="161"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="17" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl.BPMTaskClient" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskClient.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="574" y="63"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="18" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.OSBPServiceAddon" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1225" y="61"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="19" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterSelectAllClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="916" y="507"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="20" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants.E4Constants" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="223" y="546"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="21" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.UserComboBoxValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1235" y="598"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="22" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.ThemeHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="214" y="292"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="23" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="581" y="218"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="24" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.welcome.WelcomeView" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="217" y="213"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="25" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1522" y="414"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="26" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1052" y="299"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <nesting id="27">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="20"/>  
+  </nesting>  
+  <nesting id="28">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <nesting id="29">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="3"/>  
+  </nesting>  
+  <association id="30">    
+    <end type="SOURCE" refId="16" navigable="false">      
+      <attribute id="31" name="toolbarProvider">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="32" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="33">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="13"/>  
+  </nesting>  
+  <association id="34">    
+    <end type="SOURCE" refId="18" navigable="false">      
+      <attribute id="35" name="perspectiveSupport">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="36" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="16" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="37">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="26"/>  
+  </realization>  
+  <nesting id="38">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="15"/>  
+  </nesting>  
+  <nesting id="39">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="19"/>  
+  </nesting>  
+  <association id="40">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="41" name="ThemeTypetoLocatorMap">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="42" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="15" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="43">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="12"/>  
+  </nesting>  
+  <nesting id="44">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="21"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+    sort-features="false" accessors="true" visibility="false">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml
new file mode 100644
index 0000000..9189cbd
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
+<!--# All rights reserved. This program and the accompanying materials -->
+<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# which accompanies this distribution, and is available at -->
+<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# -->
+<!--# Contributors: -->
+<!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
+<!--#======================================================================= -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</groupId>
+        <artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory.aggregator</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</artifactId>
+    <packaging>eclipse-plugin</packaging>
+
+    <dependencies>
+    </dependencies>
+</project>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java
new file mode 100644
index 0000000..ba13704
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java
@@ -0,0 +1,49 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.osbp.gitinfo.Loginfo;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends Plugin implements BundleActivator {
+
+	private static BundleContext context;
+
+	public static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		super.start(bundleContext);
+		Activator.context = bundleContext;
+		Loginfo li = new Loginfo();
+		li.print( Activator.class.getCanonicalName(), Activator.class.getClassLoader());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		super.stop(bundleContext);
+		Activator.context = null;
+	}
+
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMProcessEnhancer.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMProcessEnhancer.java
new file mode 100644
index 0000000..e0b4155
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMProcessEnhancer.java
@@ -0,0 +1,474 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.drools.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
+import org.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.ObjectDataType;
+import org.drools.process.core.datatype.impl.type.StringDataType;
+import org.drools.process.core.impl.WorkImpl;
+import org.eclipse.osbp.bpm.api.AbstractBPMServiceTask;
+import org.eclipse.osbp.bpm.api.BPMCallActivity;
+import org.eclipse.osbp.bpm.api.BPMEndEvent;
+import org.eclipse.osbp.bpm.api.BPMScriptTask;
+import org.eclipse.osbp.bpm.api.BPMSplitGateway;
+import org.eclipse.osbp.bpm.api.IBlipBPMConstants;
+import org.eclipse.osbp.bpm.api.IBlipBPMItem;
+import org.eclipse.osbp.bpm.api.IBlipBPMOutgoing;
+import org.eclipse.osbp.bpm.api.IBlipBPMUserTask;
+import org.eclipse.osbp.ui.api.useraccess.IBlipProcessPermissions;
+import org.eclipse.osbp.xtext.blip.common.BlipBPMStartInfo;
+import org.eclipse.osbp.xtext.blip.common.BlipHelper;
+import org.jbpm.compiler.IProcessEnhancer;
+import org.jbpm.process.core.context.variable.Variable;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.impl.ConstraintImpl;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
+import org.jbpm.workflow.core.impl.ExtendedNodeImpl;
+import org.jbpm.workflow.core.node.ActionNode;
+import org.jbpm.workflow.core.node.EndNode;
+import org.jbpm.workflow.core.node.HumanTaskNode;
+import org.jbpm.workflow.core.node.Join;
+import org.jbpm.workflow.core.node.Split;
+import org.jbpm.workflow.core.node.StartNode;
+import org.jbpm.workflow.core.node.SubProcessNode;
+import org.jbpm.workflow.core.node.WorkItemNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.drools.process.core.ParameterDefinition;
+import org.drools.process.core.impl.ParameterDefinitionImpl;
+
+public class BPMProcessEnhancer implements IProcessEnhancer {
+
+	private static Logger log = LoggerFactory.getLogger(BPMProcessEnhancer.class);
+
+	private final BlipBPMStartInfo startInfo;
+	private final IBlipProcessPermissions blipProcessPermissions;
+
+	private ObjectDataType protocolDataType;
+	private StringDataType stringDataType;
+	private ObjectDataType workloadDtoDataType;
+	
+	public BPMProcessEnhancer(BlipBPMStartInfo startInfo, IBlipProcessPermissions blipProcessPermissions) {
+		this.startInfo = startInfo;
+		if	(blipProcessPermissions == null) {
+			this.blipProcessPermissions = DefaultBlipProcessPermissions.INSTANCE;
+		}
+		else {
+			this.blipProcessPermissions = blipProcessPermissions;
+		}
+	}
+	
+	@Override
+	public void enhanceProcess(Process basicProcess) {
+		if	(basicProcess instanceof RuleFlowProcess) {
+			RuleFlowProcess process = (RuleFlowProcess) basicProcess;
+			String workloadDtoFqn = startInfo.getWorkloadDtoFqn();
+			String functionGroupFqn = startInfo.getFunctionGroupFqn();
+			if	(functionGroupFqn == null) {
+				functionGroupFqn = "";
+			}
+			String[] tokens = functionGroupFqn.split("\\.");
+			String functionGroupCls = tokens[tokens.length-1];
+			enhanceProcessImports(process, workloadDtoFqn, functionGroupFqn);
+			enhanceProcessFunctionImports(process, functionGroupFqn);
+			enhanceProcessVariables(process, workloadDtoFqn);
+			// enhance nodes 
+			for	(Node node : process.getNodes()) {
+				if	(node instanceof HumanTaskNode) {
+					enhanceHumanTaskNode(process, (HumanTaskNode) node, functionGroupCls);
+				}
+				else if (node instanceof ActionNode) {
+					enhanceActionNode(process, (ActionNode) node, functionGroupCls);
+				}
+				else if (node instanceof Split) {
+					enhanceSplitGateway(process, functionGroupCls, (Split) node);
+				}
+				else if (node instanceof Join) {
+					log.warn("Node "+node.getName()+" "+node.getClass().getCanonicalName()+" does not be enhanced RIGHT NOW! Maybe later on?");
+				}
+				else if (node instanceof SubProcessNode) {
+					enhanceSubProcessNode(process, functionGroupCls, (SubProcessNode) node);
+				}
+				else if (node instanceof StartNode) {
+					log.debug("Node "+node.getName()+" "+node.getClass().getCanonicalName()+" does not need to be enhanced");
+				}
+				else if (node instanceof EndNode) {
+					enhanceEndNode(process, (EndNode) node);
+				}
+				else if (node instanceof WorkItemNode) {
+					enhanceWorkItemNode(process, (WorkItemNode) node, functionGroupCls);
+				}
+				else {
+					log.warn("Node "+node.getName()+" "+node.getClass().getCanonicalName()+" will not be enhanced! IS ITR NECESSARY?");
+				}
+			}
+		}
+	}
+
+	private void enhanceSplitGateway(RuleFlowProcess process, String functionGroupCls, Split split) {
+		String name = BlipHelper.getBpmItemRecommendedName(split.getName());
+		IBlipBPMItem bpmItem = startInfo.getBpmItemForBpmId(name);
+		if	(bpmItem instanceof BPMSplitGateway) {
+			for	(IBlipBPMOutgoing outgoing : ((BPMSplitGateway) bpmItem).getOutgoings()) {
+				List<Connection> connections = split.getOutgoingConnections(org.jbpm.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
+				for	(Connection connection : connections) {
+					if	(connection.getMetaData("UniqueId").equals(outgoing.getBpmId())) {
+						// enhance sequence flow constraints
+						boolean modify = true;
+						Constraint constraint = split.getConstraint(connection);
+						if	(constraint == null) {
+							constraint = new ConstraintImpl();
+							modify = false;
+						}
+						constraint.setName(outgoing.getBlipId());
+						constraint.setType("code");
+						constraint.setDialect("mvel");
+						constraint.setDefault(false);
+						constraint.setPriority(outgoing.getPriority());
+						constraint.setConstraint("return "+functionGroupCls+"."+outgoing.getTestFunction()+"(kcontext);");
+						if	(modify) {
+							log.debug(process.getId()+" "+constraint.getName()+": modify constraint "+constraint.getPriority()+" "+constraint.getDialect()+" "+constraint.getConstraint());
+						}
+						else {
+							split.setConstraint(connection, constraint);
+							log.debug(process.getId()+" "+constraint.getName()+": add constraint "+constraint.getPriority()+" "+constraint.getDialect()+" "+constraint.getConstraint());
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private void enhanceProcessImports(RuleFlowProcess process, String workloadDtoFqn, String functionGroupFqn) {
+		boolean modified = false;
+		List<String> imports = process.getImports();
+		if	(imports == null) {
+			imports = new ArrayList<String>();
+		}
+		modified |= addItem(process, "imports", imports, workloadDtoFqn, "");
+		modified |= addItem(process, "imports", imports, functionGroupFqn, "");
+		if	(modified) {
+			process.setImports(imports);
+		}
+	}
+
+	private void enhanceProcessFunctionImports(RuleFlowProcess process, String functionGroupFqn) {
+		boolean modified;
+		modified = false;
+		List<String> functions = process.getFunctionImports();
+		if	(functions == null) {
+			functions = new ArrayList<String>();
+		}
+		modified |= addItem(process, "function imports", functions, functionGroupFqn, ".*");
+		if	(modified) {
+			process.setFunctionImports(functions);
+		}
+	}
+
+	private void enhanceProcessVariables(RuleFlowProcess process, String workloadDtoFqn) {
+		boolean modified;
+		protocolDataType = new ObjectDataType(org.eclipse.osbp.bpm.api.IBlipBPMProcessProtocol.class.getCanonicalName());
+		stringDataType = new StringDataType();
+		workloadDtoDataType = null;
+		if	((workloadDtoFqn != null) && !workloadDtoFqn.isEmpty()) {
+			workloadDtoDataType = new ObjectDataType(workloadDtoFqn);
+		}
+		// ObjectDataType functionGroupDataType = new ObjectDataType(functionGroupFqn);
+		modified = false;
+		List<Variable> variables = process.getVariableScope().getVariables();
+		modified |= addVariable (process, variables, IBlipBPMConstants.VARIABLE_PROCESS_PROTOCOL, protocolDataType);
+		if	(workloadDtoFqn != null) {
+			modified |= addVariable (process, variables, IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO_FQN, stringDataType);
+			modified |= addVariable (process, variables, IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO, workloadDtoDataType);
+		}
+		if	(modified) {
+			process.getVariableScope().setVariables(variables);
+		}
+	}
+
+	private static final String[] inOutMappings = new String[] {
+		IBlipBPMConstants.VARIABLE_PROCESS_PROTOCOL,
+		IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO_FQN,
+		IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO,
+	};
+
+	private void enhanceHumanTaskNode(RuleFlowProcess process, HumanTaskNode humantask, String functionGroupCls) {
+		String processName = BlipHelper.getBpmItemRecommendedName(process.getId());
+		String humanTaskName = BlipHelper.getBpmItemRecommendedName(humantask.getName());
+		IBlipBPMUserTask bpmUserTask = startInfo.getBpmHumanTaskForBpmId(humanTaskName);
+		// enhance authorization roles and locale
+		List<String> roles = blipProcessPermissions.getHumanTaskExecutableRoles(processName, humanTaskName);
+		modifyWorkParameter(process, humantask, "GroupId", String.join(",", roles));
+		modifyWorkParameter(process, humantask, "Locale", "en-US");
+		// enhance in-/out-mapping of process local variables
+		for	(String variable : inOutMappings) {
+			if	(!humantask.getInMappings().containsKey(variable)) {
+				humantask.addInMapping(variable, variable);
+				log.debug(process.getId()+" "+humantask.getName()+": add in-mapping "+variable);
+			}
+			if	(!humantask.getOutMappings().containsKey(variable)) {
+				humantask.addOutMapping(variable, variable);
+				log.debug(process.getId()+" "+humantask.getName()+": add out-mapping "+variable);
+			}
+		}
+		if	(bpmUserTask != null) {
+			String function;
+			List<DroolsAction> actions;
+			// enhance on entry
+			function = bpmUserTask.getOnEntryFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = humantask.getActions(ExtendedNodeImpl.EVENT_NODE_ENTER);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			humantask.setActions(ExtendedNodeImpl.EVENT_NODE_ENTER, actions);
+			log.debug(process.getId()+" "+humantask.getName()+": modify on entry "+function);
+			// enhance on exit
+			function = bpmUserTask.getOnExitFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = humantask.getActions(ExtendedNodeImpl.EVENT_NODE_EXIT);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			humantask.setActions(ExtendedNodeImpl.EVENT_NODE_EXIT, actions);
+			log.debug(process.getId()+" "+humantask.getName()+": modify on exit "+function);
+		}
+	}
+
+	private void enhanceSubProcessNode(RuleFlowProcess process, String functionGroupCls, SubProcessNode subProcess) {
+		String processName = BlipHelper.getBpmItemRecommendedName(process.getId());
+		String subProcessName = BlipHelper.getBpmItemRecommendedName(subProcess.getName());
+		IBlipBPMItem bpmItem = startInfo.getBpmItemForBpmId(subProcessName);
+		BPMCallActivity bpmCallActivity = (bpmItem instanceof BPMCallActivity) ? (BPMCallActivity)bpmItem : null;
+		// enhance authorization roles and locale
+//		List<String> roles = blipProcessPermissions.getHumanTaskExecutableRoles(processName, humanTaskName);
+//		modifyWorkParameter(process, humantask, "GroupId", String.join(",", roles));
+//		modifyWorkParameter(process, humantask, "Locale", "en-US");
+		// enhance in-/out-mapping of process local variables
+		for	(String variable : inOutMappings) {
+			if	(!subProcess.getInMappings().containsKey(variable)) {
+				subProcess.addInMapping(variable, variable);
+				log.debug(process.getId()+" "+subProcess.getName()+": add in-mapping "+variable);
+			}
+			if	(!subProcess.getOutMappings().containsKey(variable)) {
+				subProcess.addOutMapping(variable, variable);
+				log.debug(process.getId()+" "+subProcess.getName()+": add out-mapping "+variable);
+			}
+		}
+		if	(bpmCallActivity != null) {
+			String function;
+			List<DroolsAction> actions;
+			// enhance on entry
+			function = bpmCallActivity.getOnEntryFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = subProcess.getActions(ExtendedNodeImpl.EVENT_NODE_ENTER);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			subProcess.setActions(ExtendedNodeImpl.EVENT_NODE_ENTER, actions);
+			log.debug(process.getId()+" "+subProcess.getName()+": modify on entry "+function);
+			// enhance on exit
+			function = bpmCallActivity.getOnExitFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = subProcess.getActions(ExtendedNodeImpl.EVENT_NODE_EXIT);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			subProcess.setActions(ExtendedNodeImpl.EVENT_NODE_EXIT, actions);
+			log.debug(process.getId()+" "+subProcess.getName()+": modify on exit "+function);
+		}
+	}
+
+	private void enhanceWorkItemNode(RuleFlowProcess process, WorkItemNode workItem, String functionGroupCls) {
+		String processName = BlipHelper.getBpmItemRecommendedName(process.getId());
+		String workItemName = BlipHelper.getBpmItemRecommendedName(workItem.getName());
+		IBlipBPMItem bpmWorkItem = startInfo.getBpmItemForBpmId(workItemName);
+		// enhance authorization roles and locale
+		// enhance in-/out-mapping of process local variables
+		for	(String variable : inOutMappings) {
+			if	(!workItem.getInMappings().containsKey(variable)) {
+				workItem.addInMapping(variable, variable);
+				log.debug(process.getId()+" "+workItem.getName()+": add in-mapping "+variable);
+			}
+			if	(!workItem.getOutMappings().containsKey(variable)) {
+				workItem.addOutMapping(variable, variable);
+				log.debug(process.getId()+" "+workItem.getName()+": add out-mapping "+variable);
+			}
+		}
+		Set<ParameterDefinition> parameterDefinitions = new HashSet<>();
+		Map<String, Object> parameters = new HashMap<>();
+		parameterDefinitions.add(new ParameterDefinitionImpl(IBlipBPMConstants.VARIABLE_PROCESS_PROTOCOL, protocolDataType));
+		parameters.put(IBlipBPMConstants.VARIABLE_PROCESS_PROTOCOL, null);
+		parameterDefinitions.add(new ParameterDefinitionImpl(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO_FQN, stringDataType));
+		parameters.put(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO_FQN, null);
+		if	(workloadDtoDataType != null) {
+			parameterDefinitions.add(new ParameterDefinitionImpl(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO, workloadDtoDataType));
+			parameters.put(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO, null);
+		}
+		workItem.getWork().setParameterDefinitions(parameterDefinitions);
+		workItem.getWork().setParameters(parameters);
+		if	(bpmWorkItem instanceof AbstractBPMServiceTask) {
+			String function;
+			List<DroolsAction> actions;
+			// enhance on entry
+			function = ((AbstractBPMServiceTask)bpmWorkItem).getOnEntryFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = workItem.getActions(ExtendedNodeImpl.EVENT_NODE_ENTER);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			workItem.setActions(ExtendedNodeImpl.EVENT_NODE_ENTER, actions);
+			log.debug(process.getId()+" "+workItem.getName()+": modify on entry "+function);
+			// enhance on exit
+			function = ((AbstractBPMServiceTask)bpmWorkItem).getOnExitFunction();
+			if	(function != null) {
+				function = functionGroupCls+"."+function+"(kcontext);";
+				actions = workItem.getActions(ExtendedNodeImpl.EVENT_NODE_EXIT);
+				if	(actions == null) {
+					actions = new ArrayList<DroolsAction>();
+				}
+				else {
+					actions.clear();
+				}
+				actions.add(new DroolsConsequenceAction("java", function));
+			}
+			else {
+				actions = null;
+			}
+			workItem.setActions(ExtendedNodeImpl.EVENT_NODE_EXIT, actions);
+			log.debug(process.getId()+" "+workItem.getName()+": modify on exit "+function);
+		}
+	}
+
+	private void enhanceActionNode(RuleFlowProcess process, ActionNode action, String functionGroupCls) {
+		String name = BlipHelper.getBpmItemRecommendedName(action.getName());
+		IBlipBPMItem bpmItem = startInfo.getBpmItemForBpmId(name);
+		if	(bpmItem instanceof BPMScriptTask) {
+			BPMScriptTask script = (BPMScriptTask) bpmItem;
+			String function = script.getFunction();
+			if	(function == null) {
+				function = "";
+			}
+			action.setAction(new DroolsConsequenceAction("java",
+				functionGroupCls+"."+function+"(kcontext);"
+			));
+			log.debug(process.getId()+" "+action.getName()+": modify action "+function);
+		}
+	}
+
+	private void enhanceEndNode(RuleFlowProcess process, EndNode endNode) {
+		String name = BlipHelper.getBpmItemRecommendedName(endNode.getName());
+		IBlipBPMItem bpmItem = startInfo.getBpmItemForBpmId(name);
+		if	(bpmItem instanceof BPMEndEvent) {
+			boolean terminateProcess = ((BPMEndEvent)bpmItem).isTerminatesProcess();
+			endNode.setTerminate(terminateProcess);
+			log.debug(process.getId()+" "+endNode.getName()+": modify terminate process="+terminateProcess);
+		}
+	}
+
+	private void modifyWorkParameter(RuleFlowProcess process, HumanTaskNode humantask, String parameter, String value) {
+		WorkImpl work = (WorkImpl) humantask.getWork();
+		if	(!value.equals(work.getParameter(parameter))) {
+			work.setParameter(parameter, value);
+			log.debug(process.getId()+" "+humantask.getName()+": set "+parameter+"="+value);
+		}
+	}
+	
+	private Variable findVariable(List<Variable> variables, String name) {
+		for	(Variable variable : variables) {
+			if	(variable.getName().equals(name)) {
+				return variable;
+			}
+		}
+		return null;
+	}
+
+	private boolean addVariable(RuleFlowProcess process, List<Variable> variables, String name, DataType dataType) {
+		if	((dataType != null) && (findVariable(variables, name) == null)) {
+			Variable variable = new Variable();
+			variable.setName(name);
+			variable.setType(dataType);
+			variables.add(variable);
+			log.debug(process.getId()+" variables: add "+name);
+			return true;
+		}
+		return false;
+	}
+	
+	private boolean addItem(RuleFlowProcess process, String listname, List<String> items, String item, String postfix) {
+		if	((item != null) && !item.isEmpty() && !items.contains(item)) {
+			items.add(item+postfix);
+			log.debug(process.getId()+" "+listname+": add "+item+postfix);
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskClient.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskClient.java
new file mode 100644
index 0000000..71d4dd4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskClient.java
@@ -0,0 +1,654 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.drools.SystemEventListenerFactory;
+import org.drools.event.process.ProcessCompletedEvent;
+import org.drools.event.process.ProcessEventListener;
+import org.drools.event.process.ProcessNodeLeftEvent;
+import org.drools.event.process.ProcessNodeTriggeredEvent;
+import org.drools.event.process.ProcessStartedEvent;
+import org.drools.event.process.ProcessVariableChangedEvent;
+import org.eclipse.e4.core.di.annotations.Creatable;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.osbp.bpm.api.IBPMEngine;
+import org.eclipse.osbp.bpm.api.IBPMTaskClient;
+import org.eclipse.osbp.bpm.api.IBPMTaskEventNotification;
+import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.eventbroker.EventBrokerMsg;
+import org.eclipse.osbp.preferences.ProductConfiguration;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.jbpm.task.Status;
+import org.jbpm.task.Task;
+import org.jbpm.task.TaskData;
+import org.jbpm.task.event.TaskEventListener;
+import org.jbpm.task.event.entity.TaskEventType;
+import org.jbpm.task.event.entity.TaskUserEvent;
+import org.jbpm.task.query.TaskSummary;
+import org.jbpm.task.service.FaultData;
+import org.jbpm.task.service.Operation;
+import org.jbpm.task.service.PermissionDeniedException;
+import org.jbpm.task.service.TaskClient;
+import org.jbpm.task.service.mina.MinaTaskClientConnector;
+import org.jbpm.task.service.mina.MinaTaskClientHandler;
+import org.jbpm.task.service.responsehandlers.BlockingGetTaskResponseHandler;
+import org.jbpm.task.service.responsehandlers.BlockingTaskOperationResponseHandler;
+import org.jbpm.task.service.responsehandlers.BlockingTaskSummaryResponseHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.Notification.Type;
+
+@Creatable
+public class BPMTaskClient implements IBPMTaskClient {
+
+	@Inject
+	@Optional
+	private IBPMEngine bpmEngine;
+	
+	@Inject
+	private IEventBroker eventBroker;
+	
+	private static Logger log = LoggerFactory.getLogger(BPMTaskClient.class);
+	private TaskClient taskClient;
+	private MinaTaskClientHandler minaHandler;
+	private MinaTaskClientConnector minaConnector;
+	boolean isConnected = false;
+	private TaskEventListener taskEventListener;
+	private ProcessEventListener processEventListener;
+	private Map<TaskEventType, List<IBPMTaskEventNotification>> taskNotificationMap;
+	private List<IBPMTaskEventNotification> completedNotificationList;
+	private Map<Operation, Map<Long,List<PostponeNotification>>> inExecutionMap;
+	private BPMTaskVariablesCache taskVariablesCache;
+
+	@Inject
+	public BPMTaskClient() {
+		minaHandler = new  MinaTaskClientHandler(SystemEventListenerFactory.getSystemEventListener());
+		minaConnector = new MinaTaskClientConnector(UUID.randomUUID().toString(), minaHandler);
+		taskClient = new TaskClient(minaConnector);
+		taskVariablesCache = new BPMTaskVariablesCache();
+	}
+
+	@PostConstruct
+	protected void init() {
+		log.debug("init");
+		taskNotificationMap = new HashMap<TaskEventType, List<IBPMTaskEventNotification>>();
+		inExecutionMap = new HashMap<Operation, Map<Long,List<PostponeNotification>>>();
+		
+	    taskEventListener = new TaskEventListener() {
+	    	@Override
+	    	public void taskCreated(TaskUserEvent event) {
+	    		log.debug("received taskCreated event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Create, event);
+	    	}
+	    	@Override
+	    	public void taskClaimed(TaskUserEvent event) {
+	    		log.debug("received taskClaimed event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Claim, event);
+	    	}
+	    	@Override
+	    	public void taskCompleted(TaskUserEvent event) {
+	    		log.debug("received taskCompleted event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Complete, event);
+	    	}
+	    	@Override
+	    	public void taskFailed(TaskUserEvent event) {
+	    		log.debug("received taskFailed event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Fail, event);
+	    	}
+	    	@Override
+	    	public void taskForwarded(TaskUserEvent event) {
+	    		log.debug("received taskForwarded event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Forward, event);
+	    	}
+	    	@Override
+	    	public void taskReleased(TaskUserEvent event) {
+	    		log.debug("received taskReleased event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Release, event);
+	    	}
+	    	@Override
+	    	public void taskSkipped(TaskUserEvent event) {
+	    		log.debug("received taskSkipped event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Skipped, event);
+	    	}
+	    	@Override
+	    	public void taskStarted(TaskUserEvent event) {
+	    		log.debug("received taskStarted event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Started, event);
+	    	}
+	    	@Override
+	    	public void taskStopped(TaskUserEvent event) {
+	    		log.debug("received taskStopped event from bpmEngine");
+	    		notifySubscribers(TaskEventType.Stop, event);
+	    	}
+	    };
+	    processEventListener = new ProcessEventListener() {
+			@Override
+			public void beforeVariableChanged(ProcessVariableChangedEvent arg0) {}
+			
+			@Override
+			public void beforeProcessStarted(ProcessStartedEvent arg0) {}
+			
+			@Override
+			public void beforeProcessCompleted(ProcessCompletedEvent arg0) {}
+			
+			@Override
+			public void beforeNodeTriggered(ProcessNodeTriggeredEvent arg0) {}
+			
+			@Override
+			public void beforeNodeLeft(ProcessNodeLeftEvent arg0) {}
+			
+			@Override
+			public void afterVariableChanged(ProcessVariableChangedEvent arg0) {}
+			
+			@Override
+			public void afterProcessStarted(ProcessStartedEvent arg0) {}
+			
+			@Override
+			public void afterProcessCompleted(ProcessCompletedEvent event) {
+	    		log.debug("received processCompleted event from bpmEngine");
+	    		notifySubscribers(event);
+			}
+			
+			@Override
+			public void afterNodeTriggered(ProcessNodeTriggeredEvent arg0) {}
+			
+			@Override
+			public void afterNodeLeft(ProcessNodeLeftEvent arg0) {}
+		};
+	    
+	    if(bpmEngine != null) {
+		    bpmEngine.addTaskEventListener(taskEventListener);
+		    bpmEngine.addProcessEventListener(processEventListener);
+		    log.debug("connect with "+ProductConfiguration.getBpmServerIp()+" Port "+ProductConfiguration.getBpmServerPort());
+			isConnected = taskClient.connect(ProductConfiguration.getBpmServerIp(),ProductConfiguration.getBpmServerPort());
+	    } else {
+		    log.debug("bpm is not licensed");
+	    }
+	}
+	
+	@PreDestroy
+	protected void shutdown() {
+		log.debug("shutdown");
+	    if(bpmEngine != null) {
+		    bpmEngine.removeTaskEventListener(taskEventListener);
+		    bpmEngine.removeProcessEventListener(processEventListener);
+			if (isConnected) {
+				try {
+					taskClient.disconnect();
+				} catch (Exception e) {
+				}
+			}
+	    }
+	}
+
+	public boolean operations(final long taskId, final IUser user, final IUser alternateUser, final Operation operation) {
+		log.debug("try task operation " + operation.name() + " for user "
+				+ user.getUserName() + " with id " + Long.toString(taskId));
+		if (!isConnected) {
+			return false; 
+		}
+		boolean retval = true;
+		BlockingTaskOperationResponseHandler taskOperationResponseHandler = new BlockingTaskOperationResponseHandler();
+		
+		addInExecution(operation, taskId);
+		try {
+			switch (operation) {
+			case Claim:
+				taskClient.claim(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Start:
+				Task task = getTask(taskId);
+				TaskData taskData = task.getTaskData();
+				if(taskData.getStatus()==Status.Ready || taskData.getStatus()==Status.Reserved) {
+	            	taskClient.start(taskId, user.getUserName(),
+							taskOperationResponseHandler);
+				} else if(taskData.getStatus()==Status.Created) {
+	            	taskClient.claim(taskId, user.getUserName(),
+							taskOperationResponseHandler);
+				} else if(taskData.getStatus()==Status.Suspended) {
+	            	taskClient.resume(taskId, user.getUserName(),
+							taskOperationResponseHandler);
+				} else if(taskData.getStatus()==Status.InProgress) {
+					taskOperationResponseHandler.setIsDone(true);
+					openPerspective(taskId, user);
+				}
+				break;
+			case Stop:
+				taskClient.stop(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Release:
+				taskClient.release(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Suspend:
+				//taskClient.setDocumentContent(taskId, content, responseHandler);
+				taskClient.suspend(taskId, user.getUserName(), taskOperationResponseHandler);
+				break;
+			case Resume:
+				taskClient.resume(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Skip:
+				taskClient.skip(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Delegate:
+				taskClient.delegate(taskId, user.getUserName(),
+						alternateUser.getUserName(), taskOperationResponseHandler);
+				break;
+			case Forward:
+				taskClient.forward(taskId, user.getUserName(),
+						alternateUser.getUserName(), taskOperationResponseHandler);
+				break;
+			case Complete:
+				TaskSummary taskSummary = getUserTask(taskId, user);
+				Map<String, Object> variables = getProcessVariables(taskSummary);
+				try {
+					taskClient.completeWithResults(taskId, user.getUserName(), variables, taskOperationResponseHandler);
+				}
+				catch (Exception e) {
+					log.error("complete "+taskId+" with results: ", e);
+				}
+				break;
+			case Fail:
+				FaultData fData = new FaultData();
+				fData.setFaultName("user pressed fail");
+				taskClient.fail(taskId, user.getUserName(),
+						fData, taskOperationResponseHandler);
+				break;
+			case Register:
+				taskClient.register(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Remove:
+				taskClient.remove(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Activate:
+				taskClient.activate(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			case Exit:
+				taskClient.exit(taskId, user.getUserName(),
+						taskOperationResponseHandler);
+				break;
+			default:
+				break;
+			}
+			try {
+				taskOperationResponseHandler.waitTillDone(ProductConfiguration.getBpmResponseTimeout());
+			} catch(RuntimeException ex) {
+			}
+			clearTaskVariablesCache(taskId);
+			removeInExecution(operation, taskId);
+			switch (operation) {
+			case Activate:
+			case Start:
+			case Resume:
+				openPerspective(taskId, user);
+				break;
+			case Suspend:
+				closePerspective(taskId, user);
+			default:
+				break;
+			}
+		} catch (PermissionDeniedException e) {
+			log.error("permission denied", e);
+	    	Notification.show("Permission denied "+e.getLocalizedMessage()+"!",
+	    			Type.ERROR_MESSAGE);
+			retval = false;
+		}
+		return retval;
+	}
+
+	private void openPerspective(long taskId, IUser user) {
+		EventBrokerMsg msg = new EventBrokerMsg();
+		msg.setLong(taskId);
+		// TaskSummary in object1
+		msg.setObject1(getUserTask(taskId, user));
+		eventBroker.send(EventBrokerMsg.OPEN_PERSPECTIVE, msg);
+	}
+	
+	private void closePerspective(long taskId, IUser user) {
+		EventBrokerMsg msg = new EventBrokerMsg();
+		msg.setLong(taskId);
+		// TaskSummary in object1
+		msg.setObject1(getUserTask(taskId, user));
+		eventBroker.send(EventBrokerMsg.CLOSE_PERSPECTIVE, msg);
+	}
+	
+	public Task getTask(final Long taskId) {
+		log.debug("getTask "+((Long)taskId).toString());
+		if (!isConnected) {
+			return null; 
+		}
+		BlockingGetTaskResponseHandler taskResponseHandler = new BlockingGetTaskResponseHandler();
+		taskClient.getTask(taskId, taskResponseHandler);
+        try {
+        	taskResponseHandler.waitTillDone(ProductConfiguration.getBpmResponseTimeout());
+        } catch (Exception e) {
+            if (taskResponseHandler.getError() != null) {
+            	log.error("getTask ", taskResponseHandler.getError());
+            }
+        }
+        if (taskResponseHandler.isDone()) {
+        	log.debug("getUserTask returns");
+        	return taskResponseHandler.getTask();
+        }
+        return null;
+	}
+	
+   	public TaskSummary getUserTask(final Long taskId, final IUser user) {
+   		log.debug("getUserTask user "+user.getUserName()+" locale "+user.getLocale().toLanguageTag());
+		if (!isConnected) {
+			return null; 
+		}
+		List<TaskSummary> tasks = getUserTaskList(user, false);
+		if (tasks == null || tasks.size() == 0) {
+			tasks = getUserTaskList(user, true);
+		}
+		if (tasks != null && tasks.size() > 0) {
+			for (TaskSummary task : tasks) {
+				if (taskId.equals(task.getId())) {
+					return task;
+				}
+			}
+		}
+		log.debug("task not found");
+		return null;
+	}
+
+	public List<TaskSummary> getUserTaskList(final IUser user,boolean owned) {
+   		log.debug("getUserTaskList user "+user.getUserName()+" locale "+user.getLocale().toLanguageTag());
+		if (!isConnected) {
+			return Collections.emptyList(); 
+		}
+		List<TaskSummary> tasks = null;
+		BlockingTaskSummaryResponseHandler taskSummaryResponseHandler = new BlockingTaskSummaryResponseHandler();
+
+		if (!owned) {
+			if ("Administrator".equals(user.getUserName())) {
+				taskClient.getTasksAssignedAsBusinessAdministrator(user.getUserName(),
+						user.getLocale().toLanguageTag(), taskSummaryResponseHandler);
+			} else {
+				taskClient.getTasksAssignedAsPotentialOwner(user.getUserName(), 
+						user.getLocale().toLanguageTag(), taskSummaryResponseHandler);
+			}
+		}
+		else
+		{
+			taskClient.getTasksOwned(user.getUserName(), user.getLocale().toLanguageTag(), taskSummaryResponseHandler);
+		}
+        try {
+		    log.debug("awaiting summary response with timeout(ms):"+ProductConfiguration.getBpmResponseTimeout());
+        	taskSummaryResponseHandler.waitTillDone(ProductConfiguration.getBpmResponseTimeout());
+        } catch (Exception e) {
+            if (taskSummaryResponseHandler.getError() != null) {
+            	log.error("getTaskList ", taskSummaryResponseHandler.getError());
+            }
+        }
+       	tasks = taskSummaryResponseHandler.getResults();
+       	log.debug("getTaskList returns "+tasks.size()+(owned?" owned":" potential")+" tasks ");
+		return tasks;
+	}
+	
+	@Override
+	public void subscribeTaskEventNotification(IBPMTaskEventNotification notification) {
+		for(TaskEventType type : TaskEventType.values()) {
+			subscribeTaskEventNotification(type, notification);
+		}
+		subscribeProcessCompletedEventNotification(notification);
+	}
+
+	@Override
+	public void subscribeTaskEventNotification(TaskEventType type, IBPMTaskEventNotification notification) {
+		if(!taskNotificationMap.containsKey(type)) {
+			List<IBPMTaskEventNotification> notificationList = new ArrayList<IBPMTaskEventNotification>();
+			notificationList.add(notification);
+			taskNotificationMap.put(type, notificationList);
+		}
+		else
+		{
+			taskNotificationMap.get(type).add(notification);
+		}
+	}
+
+	@Override
+	public void unsubscribeTaskEventNotification(IBPMTaskEventNotification notification) {
+		for(TaskEventType type : TaskEventType.values()) {
+			unsubscribeTaskEventNotification(type, notification);
+		}
+		unsubscribeProcessCompletedEventNotification(notification);
+	}
+	
+	@Override
+	public void unsubscribeTaskEventNotification(TaskEventType type, IBPMTaskEventNotification notification) {
+		if(taskNotificationMap.containsKey(type)) {
+			taskNotificationMap.get(type).remove(notification);
+		}
+	}
+
+	@Override
+	public void subscribeProcessCompletedEventNotification(IBPMTaskEventNotification notification) {
+		if	(completedNotificationList == null) {
+			completedNotificationList = new ArrayList<IBPMTaskEventNotification>();
+		}
+		completedNotificationList.add(notification);
+	}
+
+	@Override
+	public void unsubscribeProcessCompletedEventNotification(IBPMTaskEventNotification notification) {
+		if	(completedNotificationList != null) {
+			completedNotificationList.remove(notification);
+		}
+	}
+
+	// as the type is not set by jbpm, we provide it ourself
+	private void notifySubscribers(TaskEventType type, TaskUserEvent event) {
+		log.debug("notify for "+event.getTaskId()+": "+type.getValue());
+		if(taskNotificationMap.containsKey(type)) {
+			for(IBPMTaskEventNotification subscriber : taskNotificationMap.get(type)) {
+				if(isInExecution(type, event.getTaskId())) {
+					log.debug("- postpone "+subscriber.getClass().getCanonicalName());
+					postponeNotification(subscriber, type, event);
+				}
+				else {
+					log.debug("- notify   "+subscriber.getClass().getCanonicalName());
+					subscriber.notifyTaskEvent(type, event);
+				}
+			}
+		}
+	}
+
+	// as the type is not set by jbpm, we provide it ourself
+	private void notifySubscribers(ProcessCompletedEvent event) {
+		log.debug("notify for "+event.getProcessInstance().getId()+": ProcessCompleted");
+		for(IBPMTaskEventNotification subscriber : completedNotificationList) {
+			log.debug("- notify   "+subscriber.getClass().getCanonicalName());
+			subscriber.notifyProcessCompletedEvent(event);
+		}
+	}
+	
+	// postpone notification stuff
+	private void addInExecution(Operation operation, Long taskId) {
+		if (!inExecutionMap.containsKey(operation)) {
+			Map<Long,List<PostponeNotification>> ppn = new HashMap<Long,List<PostponeNotification>>();
+			ppn.put(taskId, null);
+			inExecutionMap.put(operation, ppn);
+		}
+		else
+		{
+			inExecutionMap.get(operation).put(taskId, null);
+		}
+	}
+	
+	private void removeInExecution(Operation operation, Long taskId) {
+		if(inExecutionMap.containsKey(operation)) {
+			if(inExecutionMap.get(operation).containsKey(taskId)) {
+				if(inExecutionMap.get(operation).get(taskId) != null) {
+					for(PostponeNotification postponeNotification : inExecutionMap.get(operation).get(taskId)) {
+						postponeNotification.getNotification().notifyTaskEvent(postponeNotification.getType(), postponeNotification.getEvent());
+					}
+					inExecutionMap.get(operation).get(taskId).clear();
+				}
+				inExecutionMap.get(operation).remove(taskId);
+			}
+		}
+	}
+
+	Operation mapEventTypeToOperation(TaskEventType type) {
+		Operation operation = null;
+		switch(type) {
+		case Claim:
+			operation = Operation.Claim;
+			break;
+		case Complete:
+			operation = Operation.Complete;
+			break;
+		case Delegated:
+			operation = Operation.Delegate;
+			break;
+		case Started:
+			operation = Operation.Start;
+			break;
+		case Resume:
+			operation = Operation.Resume;
+			break;
+		case Suspended:
+			operation = Operation.Suspend;
+			break;
+		case Skipped:
+			operation = Operation.Skip;
+			break;
+		case Stop:
+			operation = Operation.Stop;
+			break;
+		default:
+			operation = Operation.Activate;
+//			log.error("unmapped TaskEventType received:"+type.toString());
+			break;
+		}
+		return operation;
+	}
+	
+	private boolean isInExecution(TaskEventType type, Long taskId) {
+		Operation operation = mapEventTypeToOperation(type);
+		if(inExecutionMap.containsKey(operation)) {
+			if (inExecutionMap.get(operation).containsKey(taskId)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	private void postponeNotification(IBPMTaskEventNotification notification, TaskEventType type, TaskUserEvent event) {
+		Operation operation = mapEventTypeToOperation(type);
+		if(inExecutionMap.containsKey(operation)) {
+			if(inExecutionMap.get(operation).get(event.getTaskId()) == null) {
+				List<PostponeNotification> ppnList = new ArrayList<PostponeNotification>();
+				inExecutionMap.get(operation).put(event.getTaskId(), ppnList);
+			}
+			inExecutionMap.get(operation).get(event.getTaskId()).add(new PostponeNotification(notification, type, event));
+		}
+	}
+
+	@Override
+	public String getProcessId(Object taskSummary) {
+		if	(taskSummary instanceof TaskSummary) {
+			return ((TaskSummary) taskSummary).getProcessId();
+		}
+		return null;
+	}
+
+	private void clearTaskVariablesCache(long taskId) {
+		taskVariablesCache.clear(taskId);
+	}
+
+	@Override
+	public Map<String, Object> getProcessVariables(Object taskSummary) {
+		if	(taskSummary != null) {
+			if	(taskVariablesCache.contains(taskSummary)) {
+				return taskVariablesCache.getVariables(taskSummary);
+			}
+			else {
+				return bpmEngine.getProcessVariables(taskSummary);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Object getProcessVariable(Object taskSummary, String variable) {
+		if	(taskSummary != null) {
+			if	(taskVariablesCache.contains(taskSummary)) {
+				return taskVariablesCache.getVariable(taskSummary, variable);
+			}
+			else {
+				return bpmEngine.getProcessVariable(taskSummary, variable);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getWorkloadDtoFqn(Object taskSummary) {
+		Object value = getProcessVariable(taskSummary, VARIABLE_PROCESS_WORKLOAD_DTO_FQN);
+		if	(value instanceof String) {
+			return (String) value;
+		}
+		return null;
+	}
+	
+	@Override
+	public IDto getWorkloadDto(Object taskSummary) {
+		Object value = getProcessVariable(taskSummary, VARIABLE_PROCESS_WORKLOAD_DTO);
+		if	(value instanceof IDto) {
+			return (IDto) value;
+		}
+		return null;
+	}
+
+	@Override
+	public void setWorkloadDto(Object taskSummary, IDto workloadDto) {
+		setProcessVariable(taskSummary, VARIABLE_PROCESS_WORKLOAD_DTO, workloadDto);
+	}
+
+	@Override
+	public Object setProcessVariable(Object taskSummary, String variable, Object value) {
+		if	(taskSummary != null) {
+			if	(taskVariablesCache.getVariables(taskSummary) == null) {
+				taskVariablesCache.initialize(taskSummary, getProcessVariables(taskSummary));
+			}
+			taskVariablesCache.setVariable(taskSummary, variable, value);
+			return bpmEngine.setProcessVariable(taskSummary, variable, value);
+		}
+		return null;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskVariablesCache.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskVariablesCache.java
new file mode 100644
index 0000000..2bbc425
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskVariablesCache.java
@@ -0,0 +1,116 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.jbpm.task.query.TaskSummary;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BPMTaskVariablesCache {
+
+	private static Logger log = LoggerFactory.getLogger(BPMTaskVariablesCache.class);
+	private final Map<Long,Map<String, Object>> cache;
+	
+	protected BPMTaskVariablesCache() {
+		cache = new HashMap<Long, Map<String,Object>>();
+	}
+
+	protected void clear(long taskId) {
+		log.debug("clear for task:"+taskId);
+		cache.remove(taskId);
+	}
+
+	protected boolean contains(Object taskInformationObject) {
+		return cache.containsKey(getProcessInstanceId(taskInformationObject));
+	}
+	
+	protected Map<String,Object> initialize(Object taskInformationObject, Map<String, Object> source) {
+		Map<String,Object> variables = new HashMap<String, Object>();
+		long taskId = getProcessInstanceId(taskInformationObject);
+		log.debug("init  for task:"+taskId);
+		if	(source != null) {
+			variables.putAll(source);
+		}
+		cache.put(taskId, variables);
+		return variables;
+	}
+	
+	protected Map<String,Object> getVariables(Object taskInformationObject) {
+		long taskId = getProcessInstanceId(taskInformationObject);
+		log.debug("got   for task:"+taskId);
+		return cache.get(taskId);
+	}
+	
+	protected Object getVariable(Object taskInformationObject, String variable) {
+		long taskId = getProcessInstanceId(taskInformationObject);
+		log.debug("got   for task:"+taskId+" variable:"+variable);
+		Object value = cache.get(taskId).get(variable);
+//		if	(value instanceof IDto) {
+//			ticket576_testSerializeObject((IDto) value);
+//		}
+		return value;
+	}
+	
+	protected void setVariable(Object taskInformationObject, String variable, Object value) {
+//		if	(value instanceof IDto) {
+//			ticket576_testSerializeObject((IDto) value);
+//		}
+		long taskId = getProcessInstanceId(taskInformationObject);
+		log.debug("set   for task:"+taskId+" variable:"+variable);
+		getVariables(taskInformationObject).put(variable, value);
+	}
+
+	protected static long getProcessInstanceId(Object taskInformationObject) {
+		if	(taskInformationObject instanceof Long) {
+			return (Long) taskInformationObject;
+		}
+		else if	(taskInformationObject instanceof Integer) {
+			return (Integer) taskInformationObject;
+		}
+		else if	(taskInformationObject instanceof TaskSummary) {
+			return ((TaskSummary) taskInformationObject).getProcessInstanceId();
+		}
+		return 0;
+	}
+
+//	protected static void ticket576_testSerializeObject(Object object) {
+//		if	(object != null) {
+//			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+//			ObjectOutput out = null;
+//			try {
+//				out = new ObjectOutputStream(bos);   
+//				out.writeObject(object);
+//				out.flush();
+//			}
+//			catch (Exception et) {
+//				log.error("ticket576_testSerializeDto("+object.getClass().getCanonicalName()+")", et);
+//			}
+//			finally {
+//				try {
+//					bos.close();
+//				}
+//				catch (Exception et) {
+//					log.error("ticket576_testSerializeDto("+object.getClass().getCanonicalName()+")", et);
+//				}
+//			}
+//		}
+//	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/DefaultBlipProcessPermissions.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/DefaultBlipProcessPermissions.java
new file mode 100644
index 0000000..6c9487a
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/DefaultBlipProcessPermissions.java
@@ -0,0 +1,34 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2015 - 2016 - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany 
+ *                                                                            
+ *  All rights reserved. 
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.osbp.ui.api.useraccess.IBlipProcessPermissions;
+
+/**
+ *  The default blip process permissions, when no organization service exists. 
+ */
+public class DefaultBlipProcessPermissions implements IBlipProcessPermissions {
+
+	private final static List<String> DEFAULT_GROUP_IDS = Arrays.asList(new String[] {"Users"});
+	public final static DefaultBlipProcessPermissions INSTANCE = new DefaultBlipProcessPermissions();
+	
+	private DefaultBlipProcessPermissions() {}
+	
+	@Override
+	public final List<String> getProcessStartableRoles(String blipProcessName) {
+		return DEFAULT_GROUP_IDS;
+	}
+
+	@Override
+	public final List<String> getHumanTaskExecutableRoles(String blipProcessName, String blipHumanTaskName) {
+		return DEFAULT_GROUP_IDS;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/PostponeNotification.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/PostponeNotification.java
new file mode 100644
index 0000000..0e710c7
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/PostponeNotification.java
@@ -0,0 +1,55 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl;
+
+import org.jbpm.task.event.entity.TaskEventType;
+import org.jbpm.task.event.entity.TaskUserEvent;
+
+import org.eclipse.osbp.bpm.api.IBPMTaskEventNotification;
+
+public class PostponeNotification {
+	private IBPMTaskEventNotification notification;
+	private TaskEventType type;
+	private TaskUserEvent event;
+	
+	public PostponeNotification(IBPMTaskEventNotification notification, TaskEventType type, TaskUserEvent event) {
+		this.notification = notification;
+		this.type = type;
+		this.event = event;
+	}
+
+	public IBPMTaskEventNotification getNotification() {
+		return notification;
+	}
+
+	public void setNotification(IBPMTaskEventNotification notification) {
+		this.notification = notification;
+	}
+
+	public TaskEventType getType() {
+		return type;
+	}
+
+	public void setType(TaskEventType type) {
+		this.type = type;
+	}
+
+	public TaskUserEvent getEvent() {
+		return event;
+	}
+
+	public void setEvent(TaskUserEvent event) {
+		this.event = event;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.png b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.png
new file mode 100644
index 0000000..dde11c2
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.png
Binary files differ
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.ucls b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.ucls
new file mode 100644
index 0000000..2345218
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/doc-files/model.ucls
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.10" icons="true" automaticImage="PNG" always-add-relationships="false" 
+  generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true" 
+  router="FAN">  
+  <class id="1" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.I18NHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="214" y="365"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="924" y="164"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.EntityComboBoxValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1437" y="672"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.StrategyHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="53" width="256" x="90" y="37"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.ThemeResourceService" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="506"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.SaveClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1820" y="507"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserAccountFilterHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="575" y="364"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterContextFunction" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="570" y="294"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="224" y="460"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="10" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl.PostponeNotification" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/PostponeNotification.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="139"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="11" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.UserHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="219" y="138"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="12" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="912" y="598"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="13" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterSelectNoneClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1660" y="597"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="14" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserAccountFilterDialogContent" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterDialogContent.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1518" y="227"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="15" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.ThemeResourceService.TypeItem" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="577" y="599"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="16" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveSupport" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveSupport.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1225" y="161"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="17" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl.BPMTaskClient" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/bpmImpl/BPMTaskClient.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="574" y="63"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="18" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.service.OSBPServiceAddon" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1225" y="61"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="19" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.FilterSelectAllClickListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="916" y="507"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="20" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants.E4Constants" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="223" y="546"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="21" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider.UserComboBoxValueChangeListener" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1235" y="598"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="22" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.ThemeHandler" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="214" y="292"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="23" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.MainToolbarContextFunction" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="581" y="218"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="24" language="java" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.welcome.WelcomeView" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="217" y="213"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <class id="25" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter.UserFilterDialogProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1522" y="414"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </class>  
+  <interface id="26" language="java" 
+    name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider" 
+    project="org.eclipse.osbp.vaaclipse.addons.softwarefactory" 
+    file="/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1052" y="299"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+      sort-features="false" accessors="true" visibility="false">      
+      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
+      <operations public="false" package="false" protected="false" private="false" static="false"/>    
+    </display>  
+  </interface>  
+  <nesting id="27">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="12"/>  
+  </nesting>  
+  <nesting id="28">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="13"/>  
+  </nesting>  
+  <nesting id="29">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="21"/>  
+  </nesting>  
+  <nesting id="30">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="15"/>  
+  </nesting>  
+  <association id="31">    
+    <end type="SOURCE" refId="18" navigable="false">      
+      <attribute id="32" name="perspectiveSupport">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="33" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="16" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="34">    
+    <end type="SOURCE" refId="16" navigable="false">      
+      <attribute id="35" name="toolbarProvider">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="36" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="26" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="37">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="3"/>  
+  </nesting>  
+  <nesting id="38">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <association id="39">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="40" name="ThemeTypetoLocatorMap">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="41" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="15" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <nesting id="42">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="20"/>  
+  </nesting>  
+  <realization id="43">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="26"/>  
+  </realization>  
+  <nesting id="44">    
+    <end type="SOURCE" refId="25"/>    
+    <end type="TARGET" refId="19"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="false" 
+    sort-features="false" accessors="true" visibility="false">    
+    <attributes public="false" package="false" protected="false" private="false" static="false"/>    
+    <operations public="false" package="false" protected="false" private="false" static="false"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java
new file mode 100644
index 0000000..408a1dc
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java
@@ -0,0 +1,128 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;
+
+import java.util.Locale;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.osbp.preferences.LocaleUtils;
+import org.eclipse.osbp.preferences.ProductConfiguration;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.theme.EnumCssClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.UI;
+
+@SuppressWarnings("all")
+public class I18NHandler implements IUser.UserLocaleListener {
+	private final static Logger log = LoggerFactory.getLogger("change locale");
+	@Inject
+	private IThemeResourceService themeResourceService;
+
+	@Inject
+	private IUser user;
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	private ComboBox localeCombo;
+	private boolean noEvent = true;
+
+	@PostConstruct
+	public void init(final ComponentContainer container) {
+		FormLayout form = new FormLayout();
+		form.addStyleName("ToolControlCombo");
+		form.setMargin(false);
+		form.setSpacing(false);
+		localeCombo = new ComboBox();
+		localeCombo.addStyleName(EnumCssClass.COMBOBOX_WITH_ICON.styleName());
+		localeCombo.setItemCaptionMode(ItemCaptionMode.EXPLICIT_DEFAULTS_ID);
+		localeCombo.setNullSelectionAllowed(false);
+		localeCombo.setWidth("200px");
+		localeCombo.setTextInputAllowed(false);
+		boolean needCountry = false;
+		if (UI.getCurrent().getLocale().getCountry().length() == 0) {
+			needCountry = true;
+		}
+		Locale[] locales = Locale.getAvailableLocales();
+		// --- sort by display name used in the respective locale, if it is
+		// configured ---
+		LocaleUtils.sortLocalesOnDisplayName(locales, ProductConfiguration.showLanguageSelectInRespectiveLocale());
+		for (Locale locale : locales) {
+			// only allow locales with country due to currency sign formatters
+			if (locale.getCountry().length() > 0) {
+				String loc = locale.toLanguageTag();
+				if (needCountry && locale.getLanguage().equals(UI.getCurrent().getLocale().getLanguage())) {
+					// force a default country if not already given by default
+					Locale newLocale = new Locale(locale.getLanguage(), locale.getCountry());
+					UI.getCurrent().setLocale(newLocale);
+					Locale.setDefault(newLocale);
+					needCountry = false;
+				}
+				String path = "";
+				if (ProductConfiguration.getLanguages().containsKey(locale.getLanguage()) /*
+																						 * && ProductConfiguration.getLanguages () .get (locale.getLanguage()).equals (locale
+																						 * .getCountry())
+																						 */) {
+					if (log.isDebugEnabled())
+						log.debug("language preference:" + locale.getLanguage() + " " + locale.getCountry() + " " + locale.getVariant());
+					try {
+						// --- set the display name used in the respective
+						// locale, if it is configured ---
+						localeCombo.setItemCaption(loc, LocaleUtils.getDisplayName(locale, ProductConfiguration.showLanguageSelectInRespectiveLocale()));
+						localeCombo.addItem(loc);
+						if (themeResourceService != null) {
+							localeCombo.setItemIcon(loc, themeResourceService.getThemeResource(locale.getCountry().toLowerCase(), ThemeResourceType.FLAG));
+						}
+					} catch (Exception e) {
+					}
+				}
+			}
+		}
+		form.addComponent(localeCombo);
+		container.addComponent(form);
+		localeCombo.addValueChangeListener(new ValueChangeListener() {
+			@Override
+			public void valueChange(ValueChangeEvent event) {
+				if (!noEvent) {
+					if (log.isDebugEnabled())
+						log.debug("will set locale to:" + event.getProperty().getValue());
+					user.setLocale(Locale.forLanguageTag((String) event.getProperty().getValue()));
+				}
+			}
+		});
+		if (log.isDebugEnabled())
+			log.debug("default locale:" + user.getLocale().toLanguageTag());
+		localeCombo.select(user.getLocale().toLanguageTag());
+		noEvent = false;
+		user.addUserLocaleListener(this);
+	}
+
+	@Override
+	public void localeChanged(Locale locale) {
+		localeCombo.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "localeTooltip"));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java
new file mode 100644
index 0000000..a06a5da
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java
@@ -0,0 +1,110 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.servlet.http.HttpSession;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.theme.EnumCssClass;
+import org.eclipse.osbp.utils.themes.ui.VaaclipseUiTheme;
+import org.eclipse.osbp.utils.themes.ui.VaaclipseUiTheme.ThemeList;
+import org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.Theme;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeConstants;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeEngine;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeManager;
+import org.eclipse.osbp.xtext.reportdsl.common.PdfPrintService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.VaadinSession;
+import com.vaadin.server.WrappedHttpSession;
+import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.FormLayout;
+
+@SuppressWarnings("all")
+public class PrintServiceHandler implements IUser.UserLocaleListener {
+	private final static Logger log = LoggerFactory.getLogger("change theme");
+	@Inject
+	private IEventBroker eventBroker;
+
+	private ComboBox printServiceCombo;
+
+	@Inject
+	private IUser user;
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	@PostConstruct
+	public void init(final ComponentContainer container) {
+		FormLayout form = new FormLayout();
+		form.addStyleName("ToolControlCombo");
+		form.setMargin(false);
+		form.setSpacing(false);
+		printServiceCombo = new ComboBox();
+		printServiceCombo.setItemCaptionMode(ItemCaptionMode.EXPLICIT_DEFAULTS_ID);
+		printServiceCombo.setNullSelectionAllowed(false);
+		printServiceCombo.setWidth("200px");
+		printServiceCombo.setTextInputAllowed(false);
+		reloadCombo();
+		form.addComponent(printServiceCombo);
+		container.addComponent(form);
+		printServiceCombo.addValueChangeListener(new ValueChangeListener() {
+			@Override
+			public void valueChange(ValueChangeEvent event) {
+				String printService = ((String) event.getProperty().getValue());
+				if (log.isDebugEnabled())
+					log.debug("will set print service to:" + printService);
+				user.setPrintService(printService);
+			}
+		});
+		user.addUserLocaleListener(this);
+	}
+
+	protected void reloadCombo() {
+		String[] printServices = PdfPrintService.reLookupPrintServiceNames().toArray(new String[0]);
+		printServiceCombo.removeAllItems();
+		for (String printService : printServices) {
+			try {
+				printServiceCombo.addItem(printService);
+			} catch (Exception e) {
+			}
+		}
+		printServiceCombo.setPageLength(printServices.length);
+		if(user.getPrintService() != null) {
+			printServiceCombo.select(user.getPrintService());
+		} else if (printServices.length > 0){
+			printServiceCombo.select(printServices[0]);
+		}
+	}
+	
+	@Override
+	public void localeChanged(Locale locale) {
+		printServiceCombo.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "printServiceTooltip"));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java
new file mode 100644
index 0000000..714e1e2
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java
@@ -0,0 +1,111 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;
+
+import java.util.Locale;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osbp.eventbroker.EventBrokerMsg;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider;
+import org.eclipse.osbp.xtext.dialogdsl.common.StrategyProvider;
+import org.eclipse.osbp.xtext.strategy.FocusingEnhancer;
+import org.eclipse.osbp.xtext.strategy.LayoutingStrategy;
+import org.eclipse.osbp.xtext.strategy.StrategyDSLPackage;
+import org.eclipse.osbp.xtext.strategy.StrategyDefault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.FormLayout;
+
+@SuppressWarnings("all")
+public class StrategyHandler implements IUser.UserLocaleListener {
+	private final static Logger log = LoggerFactory.getLogger("change strategy");
+
+	@Inject
+	private IEventBroker eventBroker;
+
+	@Inject
+	private ResourceInfoProvider resourceInfoProvider;
+
+	private ComboBox strategyCombo;
+
+	@Inject
+	private IUser user;
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+	
+	private StrategyProvider stdProvider;
+
+	@PostConstruct
+	public void init(final ComponentContainer container) {
+		FormLayout form = new FormLayout();
+		form.addStyleName("ToolControlCombo");
+		form.setMargin(false);
+		form.setSpacing(false);
+		strategyCombo = new ComboBox();
+		strategyCombo.setNullSelectionAllowed(false);
+		strategyCombo.setWidth("200px");
+		strategyCombo.setTextInputAllowed(false);
+
+		for (EObject obj : dslMetadataService.getAll(StrategyDSLPackage.Literals.STRATEGY_DEFAULT)) {
+			StrategyDefault stdStrategy = ((StrategyDefault) obj);
+			stdProvider = new StrategyProvider(stdStrategy.getDefaultLayouting().getName()+"LayoutingStrategy",
+					stdStrategy.getDefaultFocusing().getName()+"FocusingEnhancer");
+			strategyCombo.addItem(stdProvider);
+			strategyCombo.setItemCaption(stdProvider, "Standard");
+		}
+		for (EObject strategyObj : dslMetadataService.getAll(StrategyDSLPackage.Literals.LAYOUTING_STRATEGY)) {
+			LayoutingStrategy strategy = (LayoutingStrategy) strategyObj;
+			for (EObject enhancerObj : dslMetadataService.getAll(StrategyDSLPackage.Literals.FOCUSING_ENHANCER)) {
+				FocusingEnhancer enhancer = (FocusingEnhancer) enhancerObj; 
+				StrategyProvider verticalProvider = new StrategyProvider(strategy.getName()+"LayoutingStrategy", enhancer.getName()+"FocusingEnhancer");
+				strategyCombo.addItem(verticalProvider);
+				strategyCombo.setItemCaption(verticalProvider, strategy.getName());
+			}
+		}
+		form.addComponent(strategyCombo);
+		container.addComponent(form);
+		strategyCombo.select(stdProvider);
+		strategyCombo.addValueChangeListener(new ValueChangeListener() {
+			@Override
+			public void valueChange(ValueChangeEvent event) {
+				if (log.isDebugEnabled())
+					log.debug("will set theme to:"
+							+ event.getProperty().getValue());
+				StrategyProvider provider = ((StrategyProvider) event
+						.getProperty().getValue());
+				if ((provider != null) && (provider.getLayoutingId() != null)) {
+					eventBroker.send(EventBrokerMsg.DIALOG_STRATEGY_CHANGED, provider);
+				}
+			}
+		});
+		user.addUserLocaleListener(this);
+	}
+
+	@Override
+	public void localeChanged(Locale locale) {
+		strategyCombo.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "strategyTooltip"));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java
new file mode 100644
index 0000000..ac7b93c
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java
@@ -0,0 +1,136 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.servlet.http.HttpSession;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.themes.ui.VaaclipseUiTheme;
+import org.eclipse.osbp.utils.themes.ui.VaaclipseUiTheme.ThemeList;
+import org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.Theme;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeConstants;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeEngine;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.VaadinSession;
+import com.vaadin.server.WrappedHttpSession;
+import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.FormLayout;
+
+@SuppressWarnings("all")
+public class ThemeHandler implements IUser.UserLocaleListener {
+	private final static Logger log = LoggerFactory.getLogger("change theme");
+	@Inject
+	private IEventBroker eventBroker;
+
+	@Inject
+	private ThemeEngine themeEngine;
+
+	@Inject
+	private ThemeManager themeManager;
+
+	@Inject
+	private ResourceInfoProvider resourceInfoProvider;
+
+	private ComboBox themeCombo;
+
+	private List<String> themeBlackList;
+
+	@Inject
+	private IThemeResourceService themeResourceService;
+
+	@Inject
+	private IUser user;
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	@PostConstruct
+	public void init(final ComponentContainer container) {
+		FormLayout form = new FormLayout();
+		form.addStyleName("ToolControlCombo");
+		form.setMargin(false);
+		form.setSpacing(false);
+		themeCombo = new ComboBox();
+		themeCombo.setItemCaptionMode(ItemCaptionMode.EXPLICIT_DEFAULTS_ID);
+		themeCombo.setNullSelectionAllowed(false);
+		themeCombo.setWidth("200px");
+		themeCombo.setTextInputAllowed(false);
+		VaaclipseUiTheme actualTheme = null;
+
+		// get a preset theme or the default
+		HttpSession httpSession = ((WrappedHttpSession) VaadinSession.getCurrent().getSession()).getHttpSession();
+		String actualThemeId = (String) httpSession.getAttribute(ThemeConstants.Attrubutes.themeid);
+		if (actualThemeId == null) {
+			actualThemeId = resourceInfoProvider.getCssTheme();
+		}
+
+		Set<VaaclipseUiTheme> themes = VaaclipseUiTheme.values(ThemeList.forProduct);
+		for (VaaclipseUiTheme theme : themes) {
+			try {
+				themeCombo.addItem(theme);
+				themeCombo.setItemCaption(theme, theme.getLabel());
+				if (theme.getId().equals(actualThemeId)) {
+					actualTheme = theme;
+				}
+			} catch (Exception e) {
+			}
+		}
+		themeCombo.setPageLength(themes.size());
+		form.addComponent(themeCombo);
+		container.addComponent(form);
+		themeCombo.select(actualTheme);
+		themeCombo.addValueChangeListener(new ValueChangeListener() {
+			@Override
+			public void valueChange(ValueChangeEvent event) {
+				if (log.isDebugEnabled())
+					log.debug("will set theme to:" + event.getProperty().getValue());
+				VaaclipseUiTheme uiTheme = ((VaaclipseUiTheme) event.getProperty().getValue());
+				Theme theme = themeEngine.getTheme(uiTheme.getId());
+				if ((theme != null) && (uiTheme.getId() != null)) {
+					if (themeCombo.getUI() != null) {
+						themeCombo.getUI().setTheme(uiTheme.getId());
+					}
+					if (themeManager != null) {
+						themeManager.setTheme(uiTheme.getId());
+					}
+					eventBroker.send(ThemeConstants.Events.setThemeEvent, theme);
+					themeResourceService.reset();
+				}
+			}
+		});
+		user.addUserLocaleListener(this);
+	}
+
+	@Override
+	public void localeChanged(Locale locale) {
+		themeCombo.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "themesTooltip"));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java
new file mode 100644
index 0000000..697504e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java
@@ -0,0 +1,156 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler;
+
+import java.util.Locale;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.osbp.eventbroker.EventBrokerMsg;
+import org.eclipse.osbp.ui.api.contextfunction.IUserMenuProvider;
+import org.eclipse.osbp.ui.api.customfields.IBlobUploadComponent;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.blob.component.BlobUploadComponent;
+import org.eclipse.osbp.vaaclipse.publicapi.authentication.AuthenticationConstants;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.vaadin.hene.popupbutton.PopupButton;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+//import com.vaadin.ui.Notification;
+//import com.vaadin.ui.Notification.Type;
+import com.vaadin.ui.VerticalLayout;
+
+@SuppressWarnings("all")
+public class UserHandler implements IUser.UserLocaleListener {
+	private final static Logger log = LoggerFactory.getLogger(UserHandler.class);
+	@Inject
+	private MApplication m_Application;
+
+	@Inject
+	private IEventBroker eventBroker;
+
+	@Inject
+	private IUser user;
+
+	@Inject
+	private MWindow window;
+
+	@Inject
+	private IThemeResourceService themeResourceService;
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	@Inject
+	@Named("Menu")
+	private IUserMenuProvider userMenu;
+
+	private EventHandler closeMenu;
+
+	private PopupButton popup;
+	private Label name;
+	private Label position;
+	private Button logout;
+
+	@PostConstruct
+	public void init(final ComponentContainer container) {
+
+		HorizontalLayout form = new HorizontalLayout();
+		form.addStyleName("ToolControlMenu");
+		form.setMargin(false);
+
+		BlobUploadComponent userImage = (BlobUploadComponent)user.getBlobUploadComponent();
+		userImage.setDisplayResolutionId(2);
+		userImage.addStyleName("os-userportrait");
+		form.addComponent(userImage);
+
+		VerticalLayout info = new VerticalLayout();
+		info.setMargin(false);
+
+		name = new Label(user.getUserName());
+		name.addStyleName("os-username");
+		info.addComponent(name);
+		position = new Label(user.getPosition());
+		position.addStyleName("os-userposition");
+		info.addComponent(position);
+
+		VerticalLayout buttons = new VerticalLayout();
+		buttons.setMargin(false);
+		buttons.setSpacing(false);
+		form.addComponent(buttons);
+		form.addComponent(info);
+
+		logout = new Button(themeResourceService.getThemeResource("logout_big", ThemeResourceType.ICON));
+		logout.addStyleName("os-userlogoutbutton");
+		logout.addClickListener(new ClickListener() {
+			@Override
+			public void buttonClick(ClickEvent event) {
+				logoutUser();
+			}
+		});
+		buttons.addComponent(logout);
+		popup = new PopupButton();
+		popup.addStyleName("os-usermenubutton");
+		popup.setContent(userMenu.getMenu());
+
+		buttons.addComponent(popup);
+
+		container.addComponent(form);
+		closeMenu = new EventHandler() {
+			@Override
+			public void handleEvent(Event event) {
+				popup.setPopupVisible(false);
+			}
+		};
+
+		eventBroker.subscribe(EventBrokerMsg.MENU_CLOSE, closeMenu);
+		user.addUserLocaleListener(this);
+	}
+
+	private void logoutUser() {
+		log.debug("logout user");
+		eventBroker.send(AuthenticationConstants.Events.Authentication.PRE_LOGOUT, new Object());
+		eventBroker.send(AuthenticationConstants.Events.Authentication.LOGOUT, new Object());
+	}
+
+	@PreDestroy
+	private void unsubscribe() {
+		eventBroker.unsubscribe(closeMenu);
+	}
+
+	@Override
+	public void localeChanged(Locale locale) {
+		name.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "userLabelTooltip"));
+		position.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "positionLabelTooltip"));
+		logout.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "logoutButtonTooltip"));
+		popup.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "userMenuTooltip"));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java
new file mode 100644
index 0000000..be8e583
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java
@@ -0,0 +1,52 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar;
+
+import org.eclipse.osbp.xtext.action.ActionToolbar;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Interface IMainToolbarProvider.
+ */
+public interface IMainToolbarProvider {
+	
+	/**
+	 * Adds the toolbar.
+	 *
+	 * @param perspectiveId the perspective id
+	 * @param toolBarModel the tool bar model
+	 */
+	void addToolbar(String perspectiveId, ActionToolbar toolBarModel);
+	
+	/**
+	 * Removes the toolbar.
+	 *
+	 * @param perspectiveId the perspective id
+	 */
+	void removeToolbar(String perspectiveId);
+	
+	/**
+	 * Sets the toolbar active or inactive.
+	 *
+	 * @param perspectiveId the perspective id
+	 * @param active the active
+	 */
+	void setActive(String perspectiveId, boolean active);
+	
+	/**
+	 * Gets the unique toolbar id composed of action id and uuid.
+	 *
+	 * @return the toolbar id
+	 */
+	String getToolbarId();
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java
new file mode 100644
index 0000000..464c8cf
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java
@@ -0,0 +1,33 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.osgi.service.component.annotations.Component;
+
+@Component(service = IContextFunction.class, property = "service.context.key=MainToolbar")
+public class MainToolbarContextFunction implements IContextFunction {
+	@Override
+	public Object compute(final IEclipseContext context, final String contextKey) {
+		MApplication application = context.get(MApplication.class);
+		IEclipseContext appCtx = application.getContext();
+		IMainToolbarProvider provider = ContextInjectionFactory.make(
+				MainToolbarProvider.class, appCtx);
+		appCtx.set(IMainToolbarProvider.class, provider);
+		return provider;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java
new file mode 100644
index 0000000..7d4ae5e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java
@@ -0,0 +1,346 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar;
+
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
+import org.eclipse.osbp.utils.theme.EnumCssClass;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants;
+import org.eclipse.osbp.vaaclipse.presentation.engine.GenericPresentationEngine;
+import org.eclipse.osbp.xtext.action.ActionButton;
+import org.eclipse.osbp.xtext.action.ActionChart;
+import org.eclipse.osbp.xtext.action.ActionDialog;
+import org.eclipse.osbp.xtext.action.ActionGeneric;
+import org.eclipse.osbp.xtext.action.ActionPackage;
+import org.eclipse.osbp.xtext.action.ActionReport;
+import org.eclipse.osbp.xtext.action.ActionTask;
+import org.eclipse.osbp.xtext.action.ActionToolbar;
+import org.eclipse.osbp.xtext.action.ActionWorkflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.ui.AbstractLayout;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CssLayout;
+
+/**
+ * The Class MainToolbarProvider.
+ */
+@SuppressWarnings("restriction")
+public class MainToolbarProvider implements IMainToolbarProvider {
+
+	/** The log. */
+	private static Logger log = LoggerFactory.getLogger(MainToolbarProvider.class);
+
+	/** The app model. */
+	@Inject
+	private MApplication appModel;
+
+	/** The eclipse context. */
+	@Inject
+	private IEclipseContext eclipseContext;
+
+	/** The theme resource service. */
+	@Inject
+	private IThemeResourceService themeResourceService;
+
+	/** The dsl metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	/** The trimmed window. */
+	private MTrimmedWindow trimmedWindow;
+
+	/** The trim bar. */
+	private MTrimBar trimBar;
+
+	/** The menu factory. */
+	private MenuFactoryImpl menuFactory;
+
+	/** The basic factory. */
+	private BasicFactoryImpl basicFactory;
+
+	/** The presentation engine. */
+	private GenericPresentationEngine presentationEngine;
+
+	/** The unique toolbar id. */
+	private String toolbarId;
+
+	/**
+	 * Instantiates a new main toolbar provider. It is injected later via E4ContextFunction.
+	 */
+	@Inject
+	public MainToolbarProvider() {
+	}
+
+	/**
+	 * Inits the maintoolbar provider.
+	 */
+	@PostConstruct
+	public void init() {
+		log.debug("init MainToolbarProvider");
+		menuFactory = MenuFactoryImpl.init();
+		basicFactory = BasicFactoryImpl.init();
+		presentationEngine = eclipseContext.get(GenericPresentationEngine.class);
+		if (appModel != null) {
+			trimmedWindow = null;
+			if (appModel.getChildren().isEmpty()) {
+				trimmedWindow = BasicFactoryImpl.eINSTANCE.createTrimmedWindow();
+				trimmedWindow.setToBeRendered(true);
+				trimmedWindow.setVisible(true);
+				appModel.getChildren().add(trimmedWindow);
+			} else {
+				trimmedWindow = (MTrimmedWindow) appModel.getChildren().get(0);
+			}
+			trimBar = null;
+			if (trimmedWindow.getTrimBars().isEmpty()) {
+				// create trimBar
+				trimBar = basicFactory.createTrimBar();
+				trimBar.setElementId(PerspectiveConstants.E4Constants.TRIMBAR);
+				trimBar.setToBeRendered(true);
+				trimBar.setVisible(true);
+				trimBar.setSide(SideValue.TOP);
+				trimmedWindow.getTrimBars().add(trimBar);
+			} else {
+				trimBar = trimmedWindow.getTrimBars().get(0);
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider#addToolbar(java.lang.String, org.eclipse.osbp.xtext.action.ActionToolbar,
+	 * java.lang.String)
+	 */
+	@Override
+	public void addToolbar(String perspectiveId, ActionToolbar toolBarModel) {
+		log.debug("addToolbar for perspectiveId " + perspectiveId);
+		MToolBar toolBar = createToolbar(perspectiveId, toolBarModel);
+		createToolbarArea(toolBar);
+	}
+
+	/**
+	 * Creates the toolbar area.
+	 *
+	 * @param toolBar
+	 *            the tool bar
+	 */
+	void createToolbarArea(MToolBar toolBar) {
+		// set os style
+		CssLayout toolBarArea = (CssLayout) trimBar.getWidget();
+		toolBarArea.setStyleName(EnumCssClass.MPARTTOOLBARAREA.toString());
+
+		Component toolBarWidget = null;
+		for (int idx = 0; idx < toolBarArea.getComponentCount(); idx++) {
+			Component test = toolBarArea.getComponent(idx);
+			AbstractLayout hl = (AbstractLayout) test;
+			if (hl.getData() instanceof MToolBar) {
+				toolBarWidget = (Component) toolBarArea.getComponent(idx);
+				break;
+			}
+		}
+		if (toolBarWidget == null) {
+			// create toolBar
+			toolBarWidget = (Component) presentationEngine.createGui(toolBar);
+			((AbstractLayout) toolBarWidget).setSizeUndefined();
+		}
+		toolBarWidget.setStyleName(EnumCssClass.MPARTTOOLBAR.toString());
+		toolBarArea.addComponent(toolBarWidget);
+	}
+
+	/**
+	 * Creates the toolbar.
+	 *
+	 * @param perspectiveId
+	 *            the perspective id
+	 * @param toolBarModel
+	 *            the tool bar model
+	 * @param actionUri
+	 *            the action uri
+	 * @return the m tool bar
+	 */
+	MToolBar createToolbar(String perspectiveId, ActionToolbar toolBarModel) {
+		MToolBar toolBar = null;
+		toolBar = menuFactory.createToolBar();
+		toolBar.setElementId(PerspectiveConstants.E4Constants.TOOLBARCONTROLS + "." + perspectiveId);
+		toolBar.setToBeRendered(true);
+		addToolbarItems(toolBar, toolBarModel);
+		// set handle
+		toolBar.getTransientData().put("perspectiveId", perspectiveId);
+		trimBar.getChildren().add(toolBar);
+		return toolBar;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider#removeToolbar(java.lang.String)
+	 */
+	@Override
+	public void removeToolbar(String perspectiveId) {
+		log.debug("removeToolbar for perspectiveId " + perspectiveId);
+		MTrimElement elementToRemove = null;
+		for (MTrimElement element : trimBar.getChildren()) {
+			if (element instanceof MToolBar) {
+				if (perspectiveId.equals(((MToolBar) element).getTransientData().get("perspectiveId"))) {
+					removeToolbarItems((MToolBar) element);
+					elementToRemove = element;
+				}
+			}
+		}
+		trimBar.getChildren().remove(elementToRemove);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider#setActive(java.lang.String, boolean)
+	 */
+	@Override
+	public void setActive(String perspectiveId, boolean active) {
+		for (MTrimElement element : trimBar.getChildren()) {
+			if (element instanceof MToolBar) {
+				if (perspectiveId.equals(((MToolBar) element).getTransientData().get("perspectiveId"))) {
+					((MToolBar) element).setVisible(active);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Add toolBar items.
+	 *
+	 * @param toolBar
+	 *            the tool bar
+	 * @param toolBarModel
+	 *            the tool bar model
+	 * @param actionUri
+	 *            the action uri
+	 */
+	private void addToolbarItems(MToolBar toolBar, ActionToolbar toolBarModel) {
+		for (ActionButton buttonModel : toolBarModel.getActions()) {
+			addToolbarItem(buttonModel, toolBar);
+		}
+	}
+
+	/**
+	 * Adds the toolbar item.
+	 *
+	 * @param buttonModel
+	 *            the button model
+	 * @param toolBar
+	 *            the tool bar
+	 * @param actionUri
+	 *            the action uri
+	 */
+	private void addToolbarItem(ActionButton buttonModel, MToolBar toolBar) {
+		MDirectToolItem toolItem = menuFactory.createDirectToolItem();
+		toolItem.setType(ItemType.PUSH);
+
+		toolItem.setTooltip(buttonModel.getName());
+		toolItem.setIconURI(themeResourceService.getThemeURI(buttonModel.getIconURI(), ThemeResourceType.ICON));
+		toolItem.setEnabled(true);
+		toolItem.setToBeRendered(true);
+		toolItem.setVisible(true);
+
+		toolItem.setContributionURI(getToolItemURI(buttonModel));
+		toolItem.setElementId(PerspectiveConstants.E4Constants.TOOLBARITEM_PREFIX + buttonModel.getName());
+		toolBar.getChildren().add(toolItem);
+	}
+
+	/**
+	 * Removes toolBar items.
+	 *
+	 * @param toolBar
+	 *            the tool bar
+	 */
+	private void removeToolbarItems(MToolBar toolBar) {
+		toolBar.getChildren().clear();
+	}
+
+	/**
+	 * Gets the tool item uri.
+	 *
+	 * @param buttonModel
+	 *            the button model
+	 * @param actionUri
+	 *            the action uri
+	 * @return the tool item uri
+	 */
+	private String getToolItemURI(ActionButton buttonModel) { // NOSONAR
+		log.debug("add toolitemuri " + buttonModel.getName());
+		String pkgName = null;
+		String toolBarName = null;
+		EObject eObj = buttonModel.eContainer();
+		while (eObj != null) {
+			if (eObj instanceof ActionToolbar) {
+				toolBarName = ((ActionToolbar) eObj).getName();
+			}
+			if (eObj instanceof ActionPackage) {
+				pkgName = ((ActionPackage) eObj).getName();
+			}
+			eObj = eObj.eContainer();
+		}
+		// create unique id for broadcast message identification and put to context
+		String uuid = UUID.randomUUID().toString();
+		toolbarId = toolBarName + "Action" + uuid;
+		eclipseContext.set(toolBarName + "_TOOLBAR_ID", uuid);
+
+		String actionId = null;
+		if (buttonModel.getActionType() instanceof ActionTask) {
+			actionId = ((ActionTask) buttonModel.getActionType()).getAction().getLiteral();
+		}
+		if (buttonModel.getActionType() instanceof ActionDialog) {
+			actionId = ((ActionDialog) buttonModel.getActionType()).getAction().getLiteral();
+		}
+		if (buttonModel.getActionType() instanceof ActionReport) {
+			actionId = ((ActionReport) buttonModel.getActionType()).getAction().getLiteral();
+		}
+		if (buttonModel.getActionType() instanceof ActionChart) {
+			actionId = ((ActionChart) buttonModel.getActionType()).getAction().getLiteral();
+		}
+		if (buttonModel.getActionType() instanceof ActionWorkflow) {
+			actionId = ((ActionWorkflow) buttonModel.getActionType()).getAction().getLiteral();
+		}
+		if (buttonModel.getActionType() instanceof ActionGeneric) {
+			actionId = ((ActionGeneric) buttonModel.getActionType()).getAction();
+		}
+		return dslMetadataService.getClassURI(pkgName + "." + StringUtils.capitalize(toolBarName) + StringUtils.capitalize(actionId) + "Action", "action");
+	}
+
+	@Override
+	public String getToolbarId() {
+		return toolbarId;
+	}
+
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java
new file mode 100644
index 0000000..bc08808
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java
@@ -0,0 +1,34 @@
+/*
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Initial contribution:                                                      
+ *     Loetz GmbH & Co. KG                               
+ * 
+ */
+
+/**
+ * 
+ *  Additions to the vaaclipse environment. 
+ *  Provides basic service injections for translations, perspectives and others. The OSBPServiceAddon must therefore be present 
+ *  in the Add-on section of Application.xmi.
+ *  Provides toolControl handler for the user menu, language, layouting and focusing strategy and theme selection.
+ *  Provides BPM task client handler to be notified about BPM task completitions and to trigger BPM tasks
+ *  Provides data filtering on DTO basis and its settings dialogs for super-users.
+ *  Provides main menu tool-bar functions to be injected in perspectives, tables, dialogs and others.
+ *  Provides the welcome perspective and its content
+ *   
+ *  @since  0.9.0
+ *  
+ *  <p>The Class Dependency Graph<br>
+ *  <img src="doc-files/model.png" alt="The Class Dependency Graph">
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory;
+
+
+
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java
new file mode 100644
index 0000000..3aaf279
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveConstants.java
@@ -0,0 +1,54 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.osbp.xtext.dialogdsl.Dialog;
+import org.eclipse.osbp.xtext.dialogdsl.DialogDSLPackage;
+import org.eclipse.osbp.xtext.perspective.PerspectiveDialog;
+
+public class PerspectiveConstants {
+	public static class E4Constants {
+		public static final String TRIMBAR = "TRIMBAR";//$NON-NLS-1$
+		public static final String TOOLBARCONTROLS = "TOOLBARCONTROLS";//$NON-NLS-1$
+		public static final String TOOLBARCONTROLITEM_PREFIX = "TOOLBARCONTROLITEM.";//$NON-NLS-1$
+		public static final String TOOLBARITEM_PREFIX = "TOOLBARITEM.";//$NON-NLS-1$
+		public static final String PERSPECTIVESTACK = "PERSPECTIVESTACK";//$NON-NLS-1$
+		public static final String PERSPECTIVE_PREFIX = "PERSPECTIVE.";//$NON-NLS-1$
+
+		/**
+		 * The NS URI of the model element to be shown in the part. This
+		 * information must be put into {@link MPart#getPersistedState()}.<br>
+		 * For instance: For {@link PerspectiveDialog} use
+		 * {@link DialogDSLPackage#eNS_URI}
+		 */
+		public static final String OSBP_NS_URI = "osbp-NS-Uri";
+		
+		/**
+		 * The flavor of the type. For instance table vs. grid.
+		 */
+		public static final String OSBP_FLAVOR = "osbp-NS-Uri-flavor";
+
+		/**
+		 * The fully qualified name <code>{package.name}.{object.name}</code> of
+		 * the model element to be shown in the part. This information must be
+		 * put into {@link MPart#getPersistedState()}.<br>
+		 * For instance: For {@link PerspectiveDialog} use the FQN for
+		 * {@link Dialog}.
+		 * 
+		 */
+		public static final String OSBP_FQN = "osbp-model-fqn";
+
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveSupport.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveSupport.java
new file mode 100644
index 0000000..b24744a
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveSupport.java
@@ -0,0 +1,1057 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License v1.0       
+ * which accompanies this distribution, and is available at                  
+ * http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.drools.event.process.ProcessCompletedEvent;
+import org.eclipse.bpmn2.Bpmn2Package;
+import org.eclipse.bpmn2.Process;
+import org.eclipse.bpmn2.Task;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.EventUtils;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedFactoryImpl;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osbp.bpm.api.AbstractBlipBPMFunctionProvider;
+import org.eclipse.osbp.bpm.api.IBPMTaskClient;
+import org.eclipse.osbp.bpm.api.IBPMTaskEventNotification;
+import org.eclipse.osbp.bpm.api.IBlipBPMConstants;
+import org.eclipse.osbp.bpm.api.IBlipBPMStartInfo;
+import org.eclipse.osbp.bpm.api.IBlipBPMWorkloadModifiableItem;
+import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.eventbroker.EventBrokerMsg;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.organization.IOrganizationViewPartProvider;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.bpmn.views.BpmnView;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider;
+import org.eclipse.osbp.vaaclipse.publicapi.authentication.AuthenticationConstants;
+import org.eclipse.osbp.vaadin.emf.api.IModelingContext;
+import org.eclipse.osbp.xtext.action.ActionDSLPackage;
+import org.eclipse.osbp.xtext.action.ActionToolbar;
+import org.eclipse.osbp.xtext.blip.BlipItem;
+import org.eclipse.osbp.xtext.blip.BlipUserTask;
+import org.eclipse.osbp.xtext.chart.Chart;
+import org.eclipse.osbp.xtext.chart.ChartDSLPackage;
+import org.eclipse.osbp.xtext.chart.ChartPackage;
+import org.eclipse.osbp.xtext.dialogdsl.Dialog;
+import org.eclipse.osbp.xtext.dialogdsl.DialogDSLPackage;
+import org.eclipse.osbp.xtext.dialogdsl.DialogPackage;
+import org.eclipse.osbp.xtext.organizationdsl.Organization;
+import org.eclipse.osbp.xtext.organizationdsl.OrganizationDSLPackage;
+import org.eclipse.osbp.xtext.organizationdsl.OrganizationPackage;
+import org.eclipse.osbp.xtext.perspective.Perspective;
+import org.eclipse.osbp.xtext.perspective.PerspectiveBPMN;
+import org.eclipse.osbp.xtext.perspective.PerspectiveChart;
+import org.eclipse.osbp.xtext.perspective.PerspectiveDialog;
+import org.eclipse.osbp.xtext.perspective.PerspectiveDslPackage;
+import org.eclipse.osbp.xtext.perspective.PerspectiveElement;
+import org.eclipse.osbp.xtext.perspective.PerspectiveGrid;
+import org.eclipse.osbp.xtext.perspective.PerspectiveOrganization;
+import org.eclipse.osbp.xtext.perspective.PerspectivePart;
+import org.eclipse.osbp.xtext.perspective.PerspectivePartStack;
+import org.eclipse.osbp.xtext.perspective.PerspectiveReport;
+import org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer;
+import org.eclipse.osbp.xtext.perspective.PerspectiveSelection;
+import org.eclipse.osbp.xtext.perspective.PerspectiveTable;
+import org.eclipse.osbp.xtext.perspective.PerspectiveTopology;
+import org.eclipse.osbp.xtext.perspective.PerspectiveView;
+import org.eclipse.osbp.xtext.reportdsl.Report;
+import org.eclipse.osbp.xtext.reportdsl.ReportDSLPackage;
+import org.eclipse.osbp.xtext.reportdsl.ReportPackage;
+import org.eclipse.osbp.xtext.table.Table;
+import org.eclipse.osbp.xtext.table.TableDSLPackage;
+import org.eclipse.osbp.xtext.table.TablePackage;
+import org.eclipse.osbp.xtext.topologydsl.Topology;
+import org.eclipse.osbp.xtext.topologydsl.TopologyDSLPackage;
+import org.eclipse.osbp.xtext.topologydsl.TopologyPackage;
+import org.jbpm.task.event.entity.TaskEventType;
+import org.jbpm.task.event.entity.TaskUserEvent;
+import org.jbpm.task.query.TaskSummary;
+import org.jbpm.task.service.Operation;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The Class PerspectiveSupport. Available as injectable service to create and maintain perspectives coming from the perspective DSL model.
+ */
+@SuppressWarnings("restriction")
+public class PerspectiveSupport implements IBPMTaskEventNotification {
+
+	/** The log. */
+	private static Logger log = LoggerFactory.getLogger(PerspectiveSupport.class);
+
+	/**
+	 * Removes the perspective from stack if it is closed.
+	 */
+	private static final String TAG__REMOVE_ON_CLOSE = "remove_on_close";
+
+	/**
+	 * The perspective is not visible in the open perspective dialog.
+	 */
+	private static final String TAG__NOT_IN_OPEN_PERSPECTIVE_DIALOG = "not_in_open_perspective_dialog";
+
+	/** The event broker. */
+	@Inject
+	private IEventBroker eventBroker;
+
+	/** The app model. */
+	@Inject
+	private MApplication appModel;
+
+	/** The eclipse context. */
+	@Inject
+	private IEclipseContext eclipseContext;
+
+	@Inject
+	private IModelingContext modelingContext;
+
+	/** The theme resource service. */
+	@Inject
+	private IThemeResourceService themeResourceService;
+
+	/** The current user. */
+	@Inject
+	private IUser user;
+
+	/** The task client. */
+	@Inject
+	private IBPMTaskClient taskClient;
+
+	/** The task provider */
+	private AbstractBlipBPMFunctionProvider taskProvider;
+
+	/** The dsl metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+
+	/** The toolbar provider. */
+	@Inject
+	@Named("MainToolbar")
+	private IMainToolbarProvider toolbarProvider;
+
+	@Inject
+	@Optional
+	private IOrganizationViewPartProvider optionalOrgURIProvider;
+
+	/** The dispatch action. */
+	private EventHandler dispatchAction;
+
+	/** The do open perspective. */
+	private EventHandler doOpenPerspective;
+
+	/** The do close perspective. */
+	private EventHandler doClosePerspective;
+
+	/** The do logout. */
+	private EventHandler doLogout;
+
+	/** The basic factory. */
+	private BasicFactoryImpl basicFactory;
+
+	/** The advanced factory. */
+	private MAdvancedFactory advancedFactory;
+
+	/** The current perspective stack. */
+	private MPerspectiveStack currentPerspectiveStack = null;
+
+	/** The trimmed window. */
+	private MTrimmedWindow trimmedWindow = null;
+
+	/** The trim bar. */
+	private MTrimBar trimBar = null;
+
+	/** The model service. */
+	private EModelService modelService;
+
+	/** The perspectives. */
+	private Map<String, MPerspective> perspectives = new HashMap<>();
+
+	/** The perspective tasks. */
+	private Map<Long, String> perspectiveTasks = new HashMap<>();
+
+	/**
+	 * Inits the PerspectiveSupport.
+	 */
+	@PostConstruct
+	protected void init() {
+		perspectives.clear();
+		perspectiveTasks.clear();
+		basicFactory = BasicFactoryImpl.init();
+		advancedFactory = AdvancedFactoryImpl.init();
+		modelService = eclipseContext.get(EModelService.class);
+		subscribe();
+	}
+
+	/**
+	 * Prepare perspective contexts.
+	 */
+	private void prepareContext() {
+		log.debug("analyze app model");
+		if (appModel != null) {
+			trimmedWindow = null;
+			if (appModel.getChildren().isEmpty()) {
+				trimmedWindow = BasicFactoryImpl.eINSTANCE.createTrimmedWindow();
+				trimmedWindow.setToBeRendered(true);
+				trimmedWindow.setVisible(true);
+				appModel.getChildren().add(trimmedWindow);
+			} else {
+				trimmedWindow = (MTrimmedWindow) appModel.getChildren().get(0);
+			}
+			// find perspective stack
+			if (trimmedWindow.getChildren().isEmpty()) {
+				// create perspective stack
+				currentPerspectiveStack = advancedFactory.createPerspectiveStack();
+				currentPerspectiveStack.setElementId(PerspectiveConstants.E4Constants.PERSPECTIVESTACK);
+				currentPerspectiveStack.setToBeRendered(true);
+				currentPerspectiveStack.setVisible(true);
+			} else {
+				for (MWindowElement element : trimmedWindow.getChildren()) {
+					if (element instanceof MPerspectiveStack) { // NOSONAR
+						currentPerspectiveStack = (MPerspectiveStack) element;
+						break;
+					}
+				}
+			}
+
+			// find trimbar
+			trimBar = null;
+			if (trimmedWindow.getTrimBars().isEmpty()) {
+				// create trimbar
+				trimBar = basicFactory.createTrimBar();
+				trimBar.setElementId(PerspectiveConstants.E4Constants.TRIMBAR);
+				trimBar.setToBeRendered(true);
+				trimBar.setVisible(true);
+				trimBar.setSide(SideValue.TOP);
+				trimmedWindow.getTrimBars().add(trimBar);
+			} else {
+				trimBar = trimmedWindow.getTrimBars().get(0);
+			}
+		}
+
+		// handle toolbar
+		((EObject) currentPerspectiveStack).eAdapters().add(new AdapterImpl() {
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getEventType() == Notification.SET
+						&& notification.getFeatureID(MElementContainer.class) == AdvancedPackageImpl.PERSPECTIVE_STACK__SELECTED_ELEMENT) {
+					log.debug("perspective stack changed selection");
+					if (notification.getNewValue() == null && notification.getOldValue() != null
+							&& PerspectiveSupport.isPerspectiveElementId(((MPerspective) notification.getOldValue()).getElementId())) {
+						closePerspective(PerspectiveSupport.fromPerspectiveElementId(((MPerspective) notification.getOldValue()).getElementId()), true);
+					} else {
+						// perspective changed
+						if (notification.getNewValue() != notification.getOldValue()) {
+							if (notification.getOldValue() != null) {
+								// deactivate old perspective - hide its toolBar
+								String perspectiveId = PerspectiveSupport.fromPerspectiveElementId(((MPerspective) notification.getOldValue()).getElementId());
+								toolbarProvider.setActive(perspectiveId, false);
+							}
+							if (notification.getNewValue() != null) {
+								// activate new perspective - show its toolbar
+								String perspectiveId = PerspectiveSupport.fromPerspectiveElementId(((MPerspective) notification.getNewValue()).getElementId());
+								toolbarProvider.setActive(perspectiveId, true);
+							}
+						}
+					}
+				}
+			}
+		});
+	}
+
+	/**
+	 * Checks if is our perspective element id.
+	 *
+	 * @param elementId
+	 *            the element id
+	 * @return true, if is perspective element id
+	 */
+	protected static boolean isPerspectiveElementId(String perspectiveId) {
+		if (perspectiveId.startsWith(PerspectiveConstants.E4Constants.PERSPECTIVE_PREFIX)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * converts a name to a perspective element id.
+	 *
+	 * @param perspectiveId
+	 *            the perspective id
+	 * @return the string
+	 */
+	protected static String toPerspectiveElementId(String perspectiveId) {
+		return PerspectiveConstants.E4Constants.PERSPECTIVE_PREFIX + perspectiveId;
+	}
+
+	/**
+	 * converts from perspective element id to a name.
+	 *
+	 * @param elementId
+	 *            the element id
+	 * @return the string
+	 */
+	protected static String fromPerspectiveElementId(String elementId) {
+		return elementId.substring(PerspectiveConstants.E4Constants.PERSPECTIVE_PREFIX.length());
+	}
+
+	/**
+	 * Creates a new perspective.
+	 *
+	 * @param perspectiveModel
+	 *            the perspective model
+	 */
+	public void openPerspectiveEvent(String perspectiveId) {
+		PerspectiveFound perspectiveFound = findPerspective(perspectiveId);
+		openPerspective(perspectiveFound, -1L);
+	}
+
+	/**
+	 * Creates a new perspective suitable for the given task it was called from.
+	 *
+	 * @param perspectiveModel
+	 *            the perspective model
+	 * @param humanTask
+	 * @param taskSummary
+	 */
+	private void openPerspective(PerspectiveFound perspectiveFound, Long taskId) {
+		if (perspectiveFound.perspective != null) {
+			prepareContext();
+			// bring to top if already contained in model
+			for (MPerspective perspective : currentPerspectiveStack.getChildren()) {
+				if ((PerspectiveSupport.toPerspectiveElementId(perspectiveFound.perspective.getName())).equals(perspective.getElementId())) {
+					modelService.bringToTop(perspective);
+					return;
+				}
+			}
+
+			log.debug("open perspective with " + perspectiveFound.perspective.getName());
+			log.debug("add perspective");
+			MPerspective perspective = createPerspective(perspectiveFound.perspective, perspectiveFound.perspective.getName());
+			if (taskId != -1L) {
+				registerContext(perspective.getTransientData(), perspectiveFound);
+				// create the toolbar
+				if (perspectiveFound.perspective.getToolbarTypeJvm() != null) {
+					String toolBarId = perspectiveFound.perspective.getToolbarTypeJvm().getQualifiedName().replace("Action", "");
+					toolbarProvider.addToolbar(perspectiveFound.perspective.getName(), findToolbar(toolBarId));
+					// we cannot subscribe earlier as the toolbar id is unknown
+					// before
+					eventBroker.subscribe(EventBrokerMsg.ACTION_BUTTON_EXECUTE_PREFIX + toolbarProvider.getToolbarId(), dispatchAction);
+				}
+			}
+			currentPerspectiveStack.getChildren().add(perspective);
+			currentPerspectiveStack.setSelectedElement(perspective);
+			modelService.bringToTop(perspective);
+
+			perspectives.put(perspectiveFound.perspective.getName(), perspective);
+			perspectiveTasks.put(taskId, perspectiveFound.perspective.getName());
+			// get notified from bpm
+			taskClient.subscribeProcessCompletedEventNotification(this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Release, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Complete, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Delegated, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Fail, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Skipped, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Release, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Stop, this);
+			taskClient.subscribeTaskEventNotification(TaskEventType.Suspended, this);
+		}
+	}
+
+	/**
+	 * Close perspective.
+	 *
+	 * @param perspectiveId
+	 *            of the perspective to close
+	 * @param suspendTask
+	 *            is true if task should be set to susupended
+	 */
+	private void closePerspective(String perspectiveId, boolean suspendTask) {
+		if (perspectiveTasks.containsValue(perspectiveId)) {
+			for (Long taskId : perspectiveTasks.keySet()) {
+				if (perspectiveTasks.get(taskId).equals(perspectiveId)) {
+					closePerspective(taskId);
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Close perspective an remove from PerspectiveStack.
+	 *
+	 * @param taskId
+	 *            of the perspective to close
+	 * @param suspendTask
+	 *            is true if task should be set to susupended
+	 */
+	private void closePerspective(long taskId) {
+		if (perspectiveTasks.containsKey(taskId)) {
+			modelService.resetPerspectiveModel(perspectives.get(perspectiveTasks.get(taskId)), trimmedWindow);
+			modelService.removePerspectiveModel(perspectives.get(perspectiveTasks.get(taskId)), trimmedWindow);
+			toolbarProvider.removeToolbar(perspectiveTasks.get(taskId));
+			perspectives.remove(taskId);
+			perspectiveTasks.remove(taskId);
+		}
+	}
+
+	/**
+	 * Add the perspective identified by perspectiveId to PerspectiveStack.
+	 *
+	 * @param perspectiveModel
+	 *            - the model everything is based on
+	 * @param perspectiveId
+	 *            - unique identifier for a perspective in the model
+	 * @return the m perspective
+	 */
+	private MPerspective createPerspective(Perspective perspectiveModel, String perspectiveId) {
+		MPerspective perspective = advancedFactory.createPerspective();
+
+		perspective.getTags().add(TAG__REMOVE_ON_CLOSE);
+		perspective.getTags().add(TAG__NOT_IN_OPEN_PERSPECTIVE_DIALOG);
+
+		perspective.setElementId(PerspectiveSupport.toPerspectiveElementId(perspectiveId));
+		perspective.setLabel(perspectiveModel.getName());
+		perspective.setVisible(true);
+		perspective.setToBeRendered(true);
+		perspective.setIconURI(themeResourceService.getThemeURI(perspectiveModel.getIconURI(), ThemeResourceType.ICON));
+		perspective.setAccessibilityPhrase(perspectiveModel.getAccessibilityPhrase());
+		if (perspectiveModel.isDescription()) {
+			perspective.setTooltip(perspectiveModel.getDescriptionValue().replace("\"", ""));
+		}
+
+		// iterate over all elements
+		traverseModel(perspective, perspectiveModel);
+		if (isUseDesigner(perspectiveModel, perspective) && !perspective.getChildren().isEmpty()) {
+			MPartSashContainerElement firstElement = perspective.getChildren().get(0);
+			if (firstElement instanceof MPartSashContainer) {
+				// create placeholder for designer
+				//
+				MPlaceholder designerPH = MAdvancedFactory.INSTANCE.createPlaceholder();
+				MUIElement area = modelService.find("org.eclipse.osbp.model.area.designer", currentPerspectiveStack);
+				designerPH.setRef(area);
+				designerPH.setContainerData("40");
+				designerPH.setVisible(modelingContext.isDesignMode());
+				designerPH.setToBeRendered(modelingContext.isDesignMode());
+				designerPH.getTags().add("designer:autoVisible");
+
+				((MPartSashContainer) firstElement).getChildren().add(designerPH);
+			}
+		}
+		return perspective;
+	}
+
+	protected boolean isUseDesigner(Perspective perspectiveModel, MPerspective perspective) {
+		return true;
+	}
+
+	/**
+	 * Because the startup of the bundles doesn't allow injecting the taskProvider via the preferred way, get the taskProvider later on manually!
+	 * 
+	 * @return the task provider
+	 */
+	private AbstractBlipBPMFunctionProvider getTaskProvider() {
+		if (taskProvider == null) {
+			IEclipseContext appCtx = appModel.getContext();
+			taskProvider = appCtx.get(AbstractBlipBPMFunctionProvider.class);
+		}
+		return taskProvider;
+	}
+
+	/**
+	 * Register context.
+	 *
+	 * @param map
+	 *            the map
+	 * @param task
+	 *            the task
+	 */
+	private void registerContext(Map<String, Object> map, PerspectiveFound perspectiveFound) {
+		String workloadDtoFqn = null;
+		IDto workloadDto = null;
+		IBlipBPMStartInfo startInfo = null;
+		IBlipBPMWorkloadModifiableItem task = null;
+		Class<?> operativeDtoClass = null;
+		String operativeDtoFqn = null;
+		List<IDto> operativeDtos = null;
+
+		if (taskClient != null) {
+			workloadDtoFqn = taskClient.getWorkloadDtoFqn(perspectiveFound.taskSummary);
+			workloadDto = taskClient.getWorkloadDto(perspectiveFound.taskSummary);
+			if ((getTaskProvider() != null) && (perspectiveFound.blipTask != null)) {
+				startInfo = getTaskProvider().getStartInfo(perspectiveFound.taskSummary);
+			}
+			if (startInfo != null) {
+				task = startInfo.getWorkloadMofifiableBpmItemForBlipId(perspectiveFound.blipTask.getName());
+			}
+			if (task != null) {
+				operativeDtos = task.getOperativeDtos(workloadDto);
+				operativeDtoClass = task.getOperativeDtoClass();
+				if (operativeDtoClass != null) {
+					operativeDtoFqn = operativeDtoClass.getCanonicalName();
+				} else {
+					operativeDtoClass = null;
+				}
+			}
+		}
+		map.put(IBlipBPMConstants.VARIABLE_PROCESS_START_INFO, startInfo);
+		map.put(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO_FQN, workloadDtoFqn);
+		map.put(IBlipBPMConstants.VARIABLE_PROCESS_WORKLOAD_DTO, workloadDto);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_JBPM_SUMMARY, perspectiveFound.taskSummary);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_BLIP_ITEM, perspectiveFound.blipTask);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_BPM2_ITEM, perspectiveFound.bpmTask);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_START_INFO, task);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_OPERATIVE_DTO_CLASS, operativeDtoClass);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_OPERATIVE_DTO_FQN, operativeDtoFqn);
+		map.put(IBlipBPMConstants.VARIABLE_TASK_OPERATIVE_DTOS, operativeDtos);
+	}
+
+	/**
+	 * for every model element that can hold children, traverse recursively the model.
+	 * 
+	 * @param parent
+	 *            - the parent e4 node to which the next child is added
+	 * @param modelElement
+	 *            - the current element which is traversed
+	 */
+	private void traverseModel(MElementContainer<?> parent, EObject modelElement) {
+		if (modelElement instanceof Perspective) {
+			log.debug("traverse model perspective");
+			Perspective perspectiveModel = (Perspective) modelElement;
+			for (PerspectiveElement element : perspectiveModel.getElements()) {
+				addElement(parent, element);
+			}
+		} else if (modelElement instanceof PerspectiveSashContainer) {
+			log.debug("traverse model sashcontainer");
+			PerspectiveSashContainer sashModel = (PerspectiveSashContainer) modelElement;
+			for (PerspectiveElement element : sashModel.getElements()) {
+				addElement(parent, element);
+			}
+		} else if (modelElement instanceof PerspectivePartStack) {
+			log.debug("traverse model perspectivestack");
+			PerspectivePartStack stackModel = (PerspectivePartStack) modelElement;
+			for (PerspectiveElement element : stackModel.getElements()) {
+				addElement(parent, element);
+			}
+		}
+	}
+
+	/**
+	 * for PerspectiveSashContainer create an e4 element by it's factory.
+	 * 
+	 * @param parent
+	 *            - the parent e4 node to which the next child is added
+	 * @param element
+	 *            - the current element which is traversed
+	 */
+	@SuppressWarnings("unchecked")
+	private void addElementPerspectiveSashContainer(MElementContainer<?> parent, EObject element) {
+		PerspectiveSashContainer sashModel = (PerspectiveSashContainer) element;
+		MPartSashContainer sashContainer = basicFactory.createPartSashContainer();
+		sashContainer.setAccessibilityPhrase(sashModel.getAccessibilityPhrase());
+		if (sashModel.getContainerData() != null) {
+			sashContainer.setContainerData(sashModel.getContainerData().replace("\"", ""));
+		} else {
+			sashContainer.setContainerData("50");
+		}
+
+		sashContainer.setElementId(sashModel.getElementId());
+		if ("HORIZONTAL".equals(sashModel.getOrientation().getName())) {
+			sashContainer.setHorizontal(true);
+		} else {
+			sashContainer.setHorizontal(false);
+		}
+		sashContainer.setVisible(true);
+		sashContainer.setParent((MElementContainer<MUIElement>) parent);
+		if (parent instanceof MPerspective) {
+			((MPerspective) parent).getChildren().add(sashContainer);
+		} else if (parent instanceof MPartSashContainer) {
+			((MPartSashContainer) parent).getChildren().add(sashContainer);
+		}
+		// go deeper
+		traverseModel(sashContainer, element);
+		// set selected references
+		for (MPartSashContainerElement child : sashContainer.getChildren()) {
+			if (sashModel.getSelectedElement() != null && child.getElementId().equals(sashModel.getSelectedElement().getElementId())) {
+				sashContainer.setSelectedElement(child);
+				break;
+			}
+		}
+	}
+
+	/**
+	 * for addElementPerspectivePartStack create an e4 element by it's factory.
+	 * 
+	 * @param parent
+	 *            - the parent e4 node to which the next child is added
+	 * @param element
+	 *            - the current element which is traversed
+	 */
+	@SuppressWarnings("unchecked")
+	private void addElementPerspectivePartStack(MElementContainer<?> parent, EObject element) {
+		PerspectivePartStack stackModel = (PerspectivePartStack) element;
+		MPartStack stack = basicFactory.createPartStack();
+		stack.setAccessibilityPhrase(stackModel.getAccessibilityPhrase());
+		if (stackModel.getContainerData() != null) {
+			stack.setContainerData(stackModel.getContainerData().replace("\"", ""));
+		} else {
+			stack.setContainerData("50");
+		}
+		stack.setElementId(stackModel.getElementId());
+		stack.setVisible(true);
+		stack.setParent((MElementContainer<MUIElement>) parent);
+		if (parent instanceof MPerspective) {
+			((MPerspective) parent).getChildren().add(stack);
+		} else if (parent instanceof MPartSashContainer) {
+			((MPartSashContainer) parent).getChildren().add(stack);
+		}
+		// go deeper
+		traverseModel(stack, element);
+		// set selected references
+		for (MStackElement child : stack.getChildren()) {
+			if (stackModel.getSelectedElement() != null && child.getElementId().equals(stackModel.getSelectedElement().getElementId())) {
+				stack.setSelectedElement(child);
+				break;
+			}
+		}
+	}
+
+	/**
+	 * for addElementPerspectivePart create an e4 element by it's factory.
+	 * 
+	 * @param parent
+	 *            - the parent e4 node to which the next child is added
+	 * @param element
+	 *            - the current element which is traversed
+	 */
+	@SuppressWarnings("unchecked")
+	private void addElementPerspectivePart(MElementContainer<?> parent, EObject element) {
+		PerspectivePart partModel = (PerspectivePart) element;
+		MPart part = basicFactory.createPart();
+		part.setAccessibilityPhrase(partModel.getAccessibilityPhrase());
+		if (partModel.getContainerData() != null) {
+			part.setContainerData(partModel.getContainerData().replace("\"", ""));
+		} else {
+			part.setContainerData("50");
+		}
+
+		part.setElementId(partModel.getElementId());
+		part.setIconURI(partModel.getIconURI());
+		if (partModel.isDescription()) {
+			part.setTooltip(partModel.getDescriptionValue().replace("\"", ""));
+		}
+		part.setLabel(partModel.getElementId());
+		part.setVisible(true);
+		part.setCloseable(partModel.isIsClosable());
+
+		part.getPersistedState().put(PerspectiveConstants.E4Constants.OSBP_NS_URI, getNsURI(partModel.getView()));
+		part.getPersistedState().put(PerspectiveConstants.E4Constants.OSBP_FQN, getFQN(partModel.getView()));
+
+		String flavor = getFlavor(partModel.getView());
+		if (flavor != null) {
+			part.getPersistedState().put(PerspectiveConstants.E4Constants.OSBP_FLAVOR, flavor);
+		}
+
+		part.setParent((MElementContainer<MUIElement>) parent);
+		if (parent instanceof MPerspective) {
+			((MPerspective) parent).getChildren().add(part);
+		} else if (parent instanceof MPartSashContainer) {
+			((MPartSashContainer) parent).getChildren().add(part);
+		} else if (parent instanceof MPartStack) {
+			((MPartStack) parent).getChildren().add(part);
+		}
+		if (partModel.getView() != null) {
+			part.setContributionURI(getContributionURI(partModel.getView()));
+		}
+	}
+
+	/**
+	 * for every model element create an e4 element by it's factory.
+	 * 
+	 * @param parent
+	 *            - the parent e4 node to which the next child is added
+	 * @param element
+	 *            - the current element which is traversed
+	 */
+	private void addElement(MElementContainer<?> parent, EObject element) {
+		if (element instanceof PerspectiveSashContainer) {
+			addElementPerspectiveSashContainer(parent, element);
+		} else if (element instanceof PerspectivePartStack) {
+			addElementPerspectivePartStack(parent, element);
+		} else if (element instanceof PerspectivePart) {
+			addElementPerspectivePart(parent, element);
+		}
+	}
+
+	/**
+	 * create the view connected to a part.
+	 * 
+	 * @param viewModel
+	 *            - the model of the view
+	 * @return null or the classURI
+	 */
+	private String getContributionURI(PerspectiveView viewModel) { // NOSONAR
+		if (viewModel instanceof PerspectiveTable) {
+			String className = ((PerspectiveTable) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "table");
+		} else if (viewModel instanceof PerspectiveSelection) {
+			String className = ((PerspectiveSelection) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "table");
+		} else if (viewModel instanceof PerspectiveGrid) {
+			String className = ((PerspectiveGrid) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "table");
+		} else if (viewModel instanceof PerspectiveChart) {
+			String className = ((PerspectiveChart) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "chart");
+		} else if (viewModel instanceof PerspectiveReport) {
+			String className = ((PerspectiveReport) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "report");
+		} else if (viewModel instanceof PerspectiveOrganization) {
+			if (optionalOrgURIProvider != null) {
+				return optionalOrgURIProvider.getViewPartURI();
+			} else {
+				return null;
+			}
+		} else if (viewModel instanceof PerspectiveTopology) {
+			String className = ((PerspectiveTopology) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "topology");
+		} else if (viewModel instanceof PerspectiveDialog) {
+			String className = ((PerspectiveDialog) viewModel).getRefTypeJvm().getQualifiedName();
+			return dslMetadataService.getClassURI(className, "dialog");
+		} else if (viewModel instanceof PerspectiveBPMN) {
+			String className = BpmnView.class.getCanonicalName();
+			return dslMetadataService.getClassURI(className, "bpmn");
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the FQN for the content of the view.
+	 * 
+	 * @param viewModel
+	 *            - the model of the view
+	 * @return null or the FQN
+	 */
+	private String getFQN(PerspectiveView viewModel) { // NOSONAR
+		if (viewModel instanceof PerspectiveTable) {
+			Table object = ((PerspectiveTable) viewModel).getRef();
+			TablePackage pkg = (TablePackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveSelection) {
+			Table object = ((PerspectiveSelection) viewModel).getRef();
+			TablePackage pkg = (TablePackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveGrid) {
+			Table object = ((PerspectiveGrid) viewModel).getRef();
+			TablePackage pkg = (TablePackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveChart) {
+			Chart object = ((PerspectiveChart) viewModel).getRef();
+			ChartPackage pkg = (ChartPackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveReport) {
+			Report object = ((PerspectiveReport) viewModel).getRef();
+			ReportPackage pkg = (ReportPackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveOrganization) {
+			Organization object = ((PerspectiveOrganization) viewModel).getRef();
+			OrganizationPackage pkg = (OrganizationPackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveTopology) {
+			Topology object = ((PerspectiveTopology) viewModel).getRef();
+			TopologyPackage pkg = (TopologyPackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveDialog) {
+			Dialog object = ((PerspectiveDialog) viewModel).getRef();
+			DialogPackage pkg = (DialogPackage) object.eContainer();
+			return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
+		} else if (viewModel instanceof PerspectiveBPMN) {
+			// TODO Right now PerspectiveBPMN has no attributes
+		}
+		return null;
+	}
+
+	/**
+	 * Return the NS-URI for the content of the view. Used as a content type marker.
+	 *
+	 * @param viewModel
+	 *            the view model
+	 * @return the ns uri
+	 */
+	private String getNsURI(PerspectiveView viewModel) { // NOSONAR
+		if (viewModel instanceof PerspectiveTable) {
+			return TableDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveSelection) {
+			return TableDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveGrid) {
+			return TableDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveChart) {
+			return ChartDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveReport) {
+			return ReportDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveOrganization) {
+			return OrganizationDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveTopology) {
+			return TopologyDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveDialog) {
+			return DialogDSLPackage.eNS_URI;
+		} else if (viewModel instanceof PerspectiveBPMN) {
+			return Bpmn2Package.eNS_URI;
+		}
+		return null;
+	}
+
+	private String getFlavor(PerspectiveView viewModel) { // NOSONAR
+		if (viewModel instanceof PerspectiveTable) {
+			return "table";
+		} else if (viewModel instanceof PerspectiveGrid) {
+			return "grid";
+		}
+		return null;
+	}
+
+	/**
+	 * To fqn.
+	 *
+	 * @param pkg
+	 *            the pkg
+	 * @param name
+	 *            the name
+	 * @return the string
+	 */
+	private String toFQN(String pkg, String name) {
+		return pkg + "." + name;
+	}
+
+	/**
+	 * Subscribe.
+	 */
+	protected void subscribe() {
+		createEventHandlers();
+		eventBroker.subscribe(EventBrokerMsg.OPEN_PERSPECTIVE, doOpenPerspective);
+		eventBroker.subscribe(EventBrokerMsg.CLOSE_PERSPECTIVE, doClosePerspective);
+		eventBroker.subscribe(AuthenticationConstants.Events.Authentication.PRE_LOGOUT, doLogout);
+	}
+
+	/**
+	 * Unsubscribe.
+	 */
+	@PreDestroy
+	protected void unsubscribe() {
+		eventBroker.unsubscribe(dispatchAction);
+		taskClient.unsubscribeTaskEventNotification(this);
+	}
+
+	/**
+	 * Creates the event handlers.
+	 */
+	private void createEventHandlers() {
+		dispatchAction = new EventHandler() {
+			@Override
+			public void handleEvent(Event event) {
+				EventBrokerMsg msg = (EventBrokerMsg) event.getProperty(EventUtils.DATA);
+				log.debug("dispatch action received in PerspectiveSupport for " + msg.getName());
+				if ("delegate".equalsIgnoreCase(msg.getName())) {
+					// UI.getCurrent().addWindow(selectUserWindow.init(getAllUsers(),
+					// eventBroker, EventBrokerMsg.TASK_DELEGATED, msg));
+				} else {
+					taskClient.operations(msg.getLong(), user, null, Operation.valueOf(msg.getName()));
+				}
+			}
+		};
+		doOpenPerspective = new EventHandler() {
+			@Override
+			public void handleEvent(Event event) {
+				PerspectiveFound perspectiveFound = null;
+				EventBrokerMsg msg = (EventBrokerMsg) event.getProperty(EventUtils.DATA);
+				if (msg.getName() != null) { // called by menu
+					log.debug("open perspective with id " + msg.getName());
+					perspectiveFound = findPerspective(msg.getName());
+					if (perspectiveFound == null) {
+						log.error("the perspective " + msg.getName() + " doesn't exist. Either blip model or perspective model must be modified.");
+						return;
+					}
+				} else if (msg.getObject1() != null) { // called by bpm task
+														// client
+					log.debug("open perspective with taskId " + msg.getLong());
+					perspectiveFound = findPerspective((TaskSummary) msg.getObject1());
+					if (perspectiveFound != null) {
+						eventBroker.post(EventBrokerMsg.BPMNCHART_EVENT, new EventBrokerMsg(perspectiveFound.taskSummary.getProcessId(), perspectiveFound.taskSummary.getName()));
+						// notify orgachart with current user's position
+						eventBroker.post(EventBrokerMsg.ORGCHART_SELECT, user.getPosition());
+					}
+				}
+				if (perspectiveFound != null) {
+					openPerspective(perspectiveFound, msg.getLong());
+				}
+			}
+		};
+		doClosePerspective = new EventHandler() {
+			@Override
+			public void handleEvent(Event event) {
+				EventBrokerMsg msg = (EventBrokerMsg) event.getProperty(EventUtils.DATA);
+				log.debug("close perspective " + msg.getName());
+				// awaits a Long object as taskId
+				closePerspective(msg.getLong());
+			}
+		};
+		doLogout = new EventHandler() {
+			@Override
+			public void handleEvent(Event event) {
+				log.debug("logout pending");
+				suspendAllTasks();
+			}
+		};
+	}
+
+	/**
+	 * Suspend all pending tasks while user pressed logout or closed browser.
+	 * 
+	 */
+	private void suspendAllTasks() {
+		for (Long taskId : perspectiveTasks.keySet()) {
+			log.debug("suspend task " + taskId);
+			taskClient.operations(taskId, user, null, Operation.Suspend);
+		}
+	}
+
+	/**
+	 * Tries to find the perspective model using the perspective builder service.
+	 *
+	 * @param perspectiveId
+	 *            - the id of the perspective used in the model
+	 * @return the perspective
+	 */
+	protected PerspectiveFound findPerspective(String perspectiveId) {
+		log.debug("find perspective model by id");
+		return new PerspectiveFound(null, (Perspective) dslMetadataService.getMetadata(perspectiveId, PerspectiveDslPackage.Literals.PERSPECTIVE), null, null);
+	}
+
+	private final class PerspectiveFound {
+		public final TaskSummary taskSummary;
+		public final Perspective perspective;
+		public final BlipItem blipTask;
+		public final Task bpmTask;
+
+		protected PerspectiveFound(TaskSummary taskSummary, Perspective perspective, BlipItem blipTask, Task bpmTask) {
+			this.taskSummary = taskSummary;
+			this.perspective = perspective;
+			this.blipTask = blipTask;
+			this.bpmTask = bpmTask;
+		}
+	}
+
+	/**
+	 * Tries to find the perspective model using the perspective builder service.
+	 *
+	 * @param task
+	 *            the task
+	 * @return the perspective
+	 */
+	protected PerspectiveFound findPerspective(TaskSummary taskSummary) {
+		log.debug("find perspective model by task");
+		for (EObject eObj : dslMetadataService.getAll(PerspectiveDslPackage.Literals.PERSPECTIVE)) {
+			// assumed that all packages of any dsl inherit LPackage
+			if (eObj instanceof Perspective) {
+				Perspective perspective = (Perspective) eObj;
+				if ((perspective.getProcess() != null) && (perspective.getUserTask() != null)) {
+					Process process = perspective.getProcess().getProcess();
+					BlipUserTask blipTask = perspective.getUserTask();
+					if ((process != null) && (process.getId().equals(taskSummary.getProcessId()))) {
+						Task bpmTask = blipTask.getTask();
+						if ((bpmTask != null) && taskSummary.getName().equals(bpmTask.getName())) {
+							if (taskClient != null) {
+								IDto wd = taskClient.getWorkloadDto(taskSummary);
+								System.err.println();
+							}
+							return new PerspectiveFound(taskSummary, perspective, blipTask, bpmTask);
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Tries to find the action toolbar model using the action builder service.
+	 *
+	 * @param toolbarId
+	 *            the toolbar id
+	 * @return the action toolbar
+	 */
+	protected ActionToolbar findToolbar(String toolbarId) {
+		log.debug("find toolbar model");
+		return (ActionToolbar) dslMetadataService.getMetadata(toolbarId, ActionDSLPackage.Literals.ACTION_TOOLBAR);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.bpm.api.IBPMTaskEventNotification#notifyTaskEvent(org .jbpm.task.event.entity.TaskEventType, org.jbpm.task.event.entity.TaskUserEvent)
+	 */
+	@Override
+	public void notifyTaskEvent(TaskEventType type, TaskUserEvent event) {
+		closePerspective(event.getTaskId());
+	}
+
+	@Override
+	public void notifyProcessCompletedEvent(ProcessCompletedEvent event) {
+		// NOP
+	}
+
+	// protected String getFQN(EObject obj, String name) {
+	// while(obj != null && !(obj instanceof PerspectivePackage)) {
+	// obj = obj.eContainer();
+	// }
+	// if(obj != null) {
+	// String key = I18NKeyGenerator.key(name);
+	// return ((PerspectivePackage) obj).getName()+"."+key;
+	// }
+	// return name;
+	// }
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java
new file mode 100644
index 0000000..5093959
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java
@@ -0,0 +1,234 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.service;
+
+import java.util.Locale;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.contexts.RunAndTrack;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.core.services.translation.TranslationService;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
+import org.eclipse.osbp.bpm.api.IBPMTaskClient;
+import org.eclipse.osbp.dsl.metadata.service.DSLBuilderParticipant.DSLMetadataService;
+import org.eclipse.osbp.ecview.core.common.editpart.IViewEditpart;
+import org.eclipse.osbp.preferences.ProductConfiguration;
+import org.eclipse.osbp.report.ReportProvider;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.report.IReportProvider;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.ui.common.helper.ICommonUIHelper;
+import org.eclipse.osbp.ui.common.helper.impl.CommonUIHelper;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.bpmImpl.BPMTaskClient;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.I18NHandler;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.PrintServiceHandler;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.StrategyHandler;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.ThemeHandler;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.handler.UserHandler;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveConstants;
+import org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective.PerspectiveSupport;
+import org.eclipse.osbp.vaaclipse.common.ecview.api.IECViewContainer;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.ui.UI;
+
+public class OSBPServiceAddon {
+	private static final Logger log = LoggerFactory.getLogger(OSBPServiceAddon.class);
+	private PerspectiveSupport perspectiveSupport;
+	private OSBPTranslationService translationService;
+	private IBPMTaskClient taskClient;
+	private CommonUIHelper commonUIHelper;
+	private IThemeResourceService themeResourceService;
+	private IDSLMetadataService dslMetadataService;
+	private IReportProvider reportProvider;
+
+	@Inject
+	private MApplication appModel;
+
+	@Inject
+	private IEventBroker eventBroker;
+
+	@SuppressWarnings("restriction")
+	@PostConstruct
+	void init(IEclipseContext context) {
+		// global task client connection
+		taskClient = context.get(BPMTaskClient.class);
+		if (taskClient == null) {
+			try {
+				taskClient = ContextInjectionFactory.make(BPMTaskClient.class, context);
+				context.set(IBPMTaskClient.class, taskClient);
+			} catch (Exception e) {
+				log.error(e.getLocalizedMessage());
+			}
+		}
+
+		// global ui helper
+		commonUIHelper = context.get(CommonUIHelper.class);
+		if (commonUIHelper == null) {
+			try {
+				commonUIHelper = ContextInjectionFactory.make(CommonUIHelper.class, context);
+				context.set(ICommonUIHelper.class, commonUIHelper);
+			} catch (Exception e) {
+				log.error(e.getLocalizedMessage());
+			}
+		}
+
+		// global themeResource service
+		themeResourceService = context.get(IThemeResourceService.class);
+		if (themeResourceService == null) {
+			try {
+				themeResourceService = ContextInjectionFactory.make(ThemeResourceService.class, context);
+				context.set(IThemeResourceService.class, themeResourceService);
+			} catch (Exception e) {
+				log.error(e.getLocalizedMessage());
+			}
+		}
+
+		dslMetadataService = context.get(IDSLMetadataService.class);
+		if (dslMetadataService == null) {
+			try {
+				dslMetadataService = (IDSLMetadataService) ContextInjectionFactory.make(DSLMetadataService.class, context);
+				context.set(IDSLMetadataService.class, dslMetadataService);
+			} catch (Exception e) {
+				log.error(e.getLocalizedMessage());
+			}
+		}
+
+		reportProvider = context.get(IReportProvider.class);
+		if (reportProvider == null) {
+			try {
+				reportProvider = (IReportProvider) ContextInjectionFactory.make(ReportProvider.class, context);
+				context.set(IReportProvider.class, reportProvider);
+			} catch (Exception e) {
+				log.error(e.getLocalizedMessage());
+			}
+		}
+		
+		// global translation service
+		if (context.get(TranslationService.class) != null) {
+			context.remove(TranslationService.class);
+		}
+		try {
+			translationService = ContextInjectionFactory.make(OSBPTranslationService.class, context);
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage());
+		}
+		context.set(TranslationService.class, translationService);
+
+		context.runAndTrack(new RunAndTrack() {
+			@Override
+			public boolean changed(IEclipseContext context) {
+				String locale = (String) context.get(TranslationService.LOCALE);
+
+				UI ui = context.get(UI.class);
+				ui.setLocale(Locale.forLanguageTag(locale));
+
+				// update all ECViews
+				IECViewContainer container = context.get(IECViewContainer.class);
+				for (IViewEditpart ep : container.getECViews()) {
+					ep.getContext().setLocale(Locale.forLanguageTag(locale));
+				}
+
+				return true;
+			}
+		});
+
+		// add our standard toolcontrols
+		if (appModel != null) {
+			log.debug("appModel loaded");
+			MTrimmedWindow trimmedWindow = null;
+			if (appModel.getChildren().size() == 0) {
+				trimmedWindow = BasicFactoryImpl.eINSTANCE.createTrimmedWindow();
+				trimmedWindow.setToBeRendered(true);
+				trimmedWindow.setVisible(true);
+				appModel.getChildren().add(trimmedWindow);
+			} else {
+				trimmedWindow = (MTrimmedWindow) appModel.getChildren().get(0);
+			}
+			MTrimBar trimBar = null;
+			if (trimmedWindow.getTrimBars().size() == 0) {
+				trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
+				trimBar.setElementId(PerspectiveConstants.E4Constants.TRIMBAR);
+				trimBar.setToBeRendered(true);
+				trimBar.setVisible(true);
+				trimBar.setSide(SideValue.TOP);
+				trimmedWindow.getTrimBars().add(trimBar);
+			} else {
+				trimBar = trimmedWindow.getTrimBars().get(0);
+			}
+			trimBar.getChildren().add(createToolControl(UserHandler.class));
+			if (ProductConfiguration.hasDemoToolsLanguage()) {
+				trimBar.getChildren().add(createToolControl(I18NHandler.class));
+			}
+			if (ProductConfiguration.hasDemoToolsStrategy()) {
+				trimBar.getChildren().add(createToolControl(StrategyHandler.class));
+			}
+			if (ProductConfiguration.hasDemoToolsTheme()) {
+				trimBar.getChildren().add(createToolControl(ThemeHandler.class));
+			}
+			if (ProductConfiguration.hasToolsPrintService()) {
+				trimBar.getChildren().add(createToolControl(PrintServiceHandler.class));
+			}
+			log.debug("toolcontrols added");
+
+			// global perspective service
+			perspectiveSupport = context.get(PerspectiveSupport.class);
+			if (perspectiveSupport == null) {
+				try {
+					perspectiveSupport = ContextInjectionFactory.make(PerspectiveSupport.class, context);
+					context.set(PerspectiveSupport.class, perspectiveSupport);
+				} catch (Exception e) {
+					log.error("{}", e);
+				}
+			}
+		}
+
+	}
+
+	@PreDestroy
+	void preDestroy() {
+		log.debug("preDestroy");
+	}
+
+	@SuppressWarnings("restriction")
+	private MToolControl createToolControl(Class<?> clzz) {
+		MToolControl toolControl = MenuFactoryImpl.eINSTANCE.createToolControl();
+		toolControl.setElementId(PerspectiveConstants.E4Constants.TOOLBARCONTROLITEM_PREFIX + clzz.getSimpleName());
+		toolControl.setContributionURI(getClassURI(clzz.getCanonicalName()));
+		toolControl.getTags().add(clzz.getSimpleName());
+		// avoid persisting
+		toolControl.getTags().add("vaaclipse-transient");
+		toolControl.setVisible(true);
+		toolControl.setToBeRendered(true);
+		return toolControl;
+	}
+
+	private String getClassURI(String className) {
+		String symbolicURI = "bundleclass://" + FrameworkUtil.getBundle(this.getClass()).getHeaders().get("Bundle-SymbolicName").split(";")[0];
+		return symbolicURI + "/" + className;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java
new file mode 100644
index 0000000..c210a3b
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java
@@ -0,0 +1,42 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.service;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.services.translation.TranslationService;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+
+public class OSBPTranslationService extends TranslationService {
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+	
+	@Override
+	protected String getResourceString(String key, ResourceBundle resourceBundle) {
+		String s = key.trim();
+		if (s.startsWith("%%", 0))
+			s = s.substring(1);
+
+		int ix = s.indexOf(' ');
+		String rbKey = ix == -1 ? s : s.substring(0, ix);
+		return translate(rbKey.substring(1), null);
+	}
+
+	@Override
+	public String translate(String key, String contributorURI) {
+		return(dslMetadataService.translate(super.locale, key));
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java
new file mode 100644
index 0000000..3de252c
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java
@@ -0,0 +1,132 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.equinox.app.IApplicationContext;
+import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
+
+public class ThemeResourceService implements IThemeResourceService {
+
+	protected static final class TypeItem {
+
+		protected final String path;
+		protected final String extension;
+
+		protected TypeItem(String path, String extension) {
+			this.path = path;
+			this.extension = extension;
+		}
+
+	}
+
+	private static final Hashtable<ThemeResourceType, TypeItem> ThemeTypetoLocatorMap = new Hashtable<ThemeResourceType, TypeItem>() {
+		private static final long serialVersionUID = -3532016435445400246L;
+		{
+			put(ThemeResourceType.IMAGE, new TypeItem(ThemeResourceType.IMAGE.toString().toLowerCase() + "/", ".jpg"));
+			put(ThemeResourceType.ICON, new TypeItem(ThemeResourceType.ICON.toString().toLowerCase() + "/", ".png"));
+			put(ThemeResourceType.FLAG, new TypeItem(ThemeResourceType.FLAG.toString().toLowerCase() + "/", ".gif"));
+		}
+	};
+
+	@Inject
+	private ThemeEngine themeEngine;
+
+	@Inject
+	private IApplicationContext appContext;
+
+	private List<String> cssUris = null;
+	private String resourcePath = null;
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ThemeResourceService.class);
+	
+	@PostConstruct
+	public void init() {
+		reset();
+	}
+
+	public void reset() {
+		String css = appContext.getBrandingProperty("cssTheme");
+		if (css != null) {
+			cssUris = themeEngine.getTheme(css).getAllResourceLocationURIs();
+		}
+		if (cssUris != null && !cssUris.isEmpty()) {
+			resourcePath = cssUris.get(0);
+		}
+	}
+
+	@Override
+	public String getThemeURI(String resourceID, ThemeResourceType themeResourceType) {
+		if (resourceID != null) {
+			return resourcePath + getRelativeResourePath(resourceID, themeResourceType);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public Resource getThemeResource(String resourceID, ThemeResourceType themeResourceType) {
+		if (resourceID != null) {
+			return new ThemeResource(getRelativeResourePath(resourceID, themeResourceType));
+		} else {
+			return null;
+		}
+	}
+
+	protected String getRelativeResourePath(String resourceID, ThemeResourceType themeResourceType) {
+		if (resourceID != null) {
+			return getThemeResourceTypePath(themeResourceType) + resourceID + getThemeResourceTypeExtension(themeResourceType);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public String getThemeResourceTypeExtension(ThemeResourceType themeResourceType) {
+		return ThemeTypetoLocatorMap.get(themeResourceType).extension;
+	}
+
+	@Override
+	public String getThemeResourceTypePath(ThemeResourceType themeResourceType) {
+		return ThemeTypetoLocatorMap.get(themeResourceType).path;
+	}
+
+	@Override
+	public InputStream getThemeResourceInputStream(String resourceURL) {
+		InputStream stream = null;
+		try {
+			// this works with platform:// url format
+			URL url = new URL(resourceURL);
+		    stream = url.openConnection().getInputStream();
+		}
+		catch (IOException e) {
+			LOGGER.warn("resource url '"+resourceURL+"' could not be loaded", e);
+		}		
+		return stream;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterDialogContent.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterDialogContent.java
new file mode 100644
index 0000000..e833c6c
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterDialogContent.java
@@ -0,0 +1,117 @@
+/*
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Initial contribution:                                                      
+ *     Loetz GmbH & Co. KG                               
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider;
+//import org.eclipse.osbp.vaaclipse.publicapi.change.ChangeCommand;
+import org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeEngine;
+import org.eclipse.osbp.vaadin.optiondialog.OptionDialog;
+import org.eclipse.osbp.vaadin.optiondialog.OptionDialog.ComponentProvider;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Component;
+
+// TODO: Auto-generated Javadoc
+//import org.eclipse.emf.ecore.EObject;
+
+/**
+ * The Class UserAccountFilterDialogContent.
+ */
+@SuppressWarnings({ "serial", "restriction" })
+public class UserAccountFilterDialogContent implements ComponentProvider,
+		ValueChangeListener {
+
+	// public static final int OPTION_OK = 0;
+	// public static final int OPTION_CANCEL = 1;
+
+	/** The context. */
+	@Inject
+	IEclipseContext context;
+
+	/** The theme engine. */
+	@Inject
+	ThemeEngine themeEngine;
+	
+	/** The filter menu provider. */
+	@Inject
+	@Named("UserFilter")
+	private IVaadinDialogProvider filterMenuProvider;
+
+	// @Inject
+	// private ResourceInfoProvider resourceInfoProvider;
+	//
+	// @Inject
+	// private IModelingContext modelingContext;
+
+	/** The option dialog. */
+	private OptionDialog optionDialog;
+
+	/** The current perspective. */
+	private MPerspective currentPerspective;
+
+	/**
+	 * Gets the current perspective.
+	 *
+	 * @return the current perspective
+	 */
+	public MPerspective getCurrentPerspective() {
+		return currentPerspective;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.vaadin.optiondialog.OptionDialog.ComponentProvider#getComponent(org.eclipse.osbp.vaadin.optiondialog.OptionDialog)
+	 */
+	@Override
+	public Component getComponent(OptionDialog optionDialog) {
+		this.optionDialog = optionDialog;
+		return filterMenuProvider.getDialog();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin.data.Property.ValueChangeEvent)
+	 */
+	@Override
+	public void valueChange(ValueChangeEvent event) {
+		if (optionDialog == null) {
+			return;
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.vaadin.optiondialog.OptionDialog.OptionListener#optionSelected(org.eclipse.osbp.vaadin.optiondialog.OptionDialog, int)
+	 */
+	@Override
+	public void optionSelected(OptionDialog optionDialog, int optionId) {
+		// if (optionId == OPTION_OK) {
+		//
+		// // optionDialog.close();
+		//
+		// } else if (optionId == OPTION_CANCEL)
+		// optionDialog.close();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.vaadin.optiondialog.OptionDialog.ComponentProvider#setMessage(java.lang.String)
+	 */
+	@Override
+	public void setMessage(String message) {
+	}
+
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterHandler.java
new file mode 100644
index 0000000..e4bc1c6
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserAccountFilterHandler.java
@@ -0,0 +1,78 @@
+/*
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Initial contribution:                                                      
+ *     Loetz GmbH & Co. KG                               
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.osbp.vaadin.optiondialog.OptionDialog;
+import org.eclipse.osbp.vaadin.optiondialog.OptionDialog.OptionsAlign;
+
+import com.vaadin.server.Sizeable.Unit;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.ui.UI;
+
+/**
+ * Creates a new perspective.
+ */
+public class UserAccountFilterHandler {
+
+//	@Inject
+//	private EModelService modelService;
+
+	@Inject
+	private IEclipseContext eclipseContext;
+
+//	@Inject
+//	private IModelingContext modelingContext;
+
+	/**
+ * Execute.
+ *
+ * @param item the item
+ */
+@Execute
+	public void execute(MHandledMenuItem item) {
+
+//		MWindow window = eclipseContext.getActive(MWindow.class);
+//		MPerspective perspective = modelService.getActivePerspective(window);
+
+		OptionDialog dlg = new OptionDialog();
+		dlg.setOptionButtonsAlignment(OptionsAlign.RIGHT);
+		dlg.setOptionButtonsWidth(80, Unit.PIXELS);
+		dlg.setWidth("500px");
+		dlg.setHeight("500px");
+		dlg.setModal(true);
+		dlg.setCaption("User Account Filter");
+		dlg.setIcon(new ThemeResource("../base/favicon.ico"));
+
+		UserAccountFilterDialogContent componentProvider = ContextInjectionFactory
+				.make(UserAccountFilterDialogContent.class, eclipseContext);
+
+		dlg.setComponentProvider(componentProvider);
+
+//		dlg.addOption(UserAccountFilterDialogContent.OPTION_CANCEL, "Cancel");
+
+		dlg.open(eclipseContext.get(UI.class));
+	}
+
+	@CanExecute
+	public boolean canExecute() {
+		return true;
+	}
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java
new file mode 100644
index 0000000..aee888a
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java
@@ -0,0 +1,42 @@
+/*
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Initial contribution:                                                      
+ *     Loetz GmbH & Co. KG                               
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider;
+import org.osgi.service.component.annotations.Component;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class UserFilterMenuContextFunction.
+ */
+@Component(service = IContextFunction.class, property = "service.context.key=UserFilter")
+@SuppressWarnings("all")
+public class UserFilterContextFunction implements IContextFunction {
+  
+  /* (non-Javadoc)
+   * @see org.eclipse.e4.core.contexts.IContextFunction#compute(org.eclipse.e4.core.contexts.IEclipseContext, java.lang.String)
+   */
+  @Override
+  public Object compute(final IEclipseContext context, final String contextKey) {
+    MApplication application = context.get(MApplication.class);
+    IEclipseContext appCtx = application.getContext();
+    IVaadinDialogProvider provider = ContextInjectionFactory.make(UserFilterDialogProvider.class, appCtx);
+    appCtx.set(IVaadinDialogProvider.class, provider);
+    return provider;
+  }
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java
new file mode 100644
index 0000000..973b3aa
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java
@@ -0,0 +1,837 @@
+/*
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Initial contribution:                                                      
+ *     Loetz GmbH & Co. KG                               
+ * 
+ */
+package org.eclipse.osbp.vaaclipse.addons.softwarefactory.userfilter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osbp.authentication.account.dtos.UserAccountDto;
+import org.eclipse.osbp.authentication.account.dtos.UserAccountFilterDto;
+import org.eclipse.osbp.authentication.account.dtos.mapper.UserAccountDtoMapper;
+import org.eclipse.osbp.authentication.account.dtos.mapper.UserAccountFilterDtoMapper;
+import org.eclipse.osbp.authentication.account.entities.UserAccount;
+import org.eclipse.osbp.authentication.account.entities.UserAccountFilter;
+import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.dsl.dto.lib.impl.DtoServiceAccess;
+import org.eclipse.osbp.dsl.dto.lib.services.IDTOServiceWithMutablePersistence;
+import org.eclipse.osbp.dsl.dto.lib.services.Query;
+import org.eclipse.osbp.dsl.dto.lib.services.filters.ILFilter;
+import org.eclipse.osbp.dsl.dto.lib.services.filters.LCompare;
+import org.eclipse.osbp.dsl.dto.lib.services.filters.LCompare.Equal;
+import org.eclipse.osbp.dsl.dto.lib.services.filters.LJoinFilter;
+import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
+import org.eclipse.osbp.dsl.semantic.entity.LEntity;
+import org.eclipse.osbp.dsl.semantic.entity.LEntityAttribute;
+import org.eclipse.osbp.dsl.semantic.entity.OSBPEntityPackage;
+import org.eclipse.osbp.persistence.IPersistenceService;
+import org.eclipse.osbp.runtime.common.annotations.DtoUtils;
+import org.eclipse.osbp.runtime.common.types.IBundleSpace;
+import org.eclipse.osbp.runtime.web.vaadin.common.data.BeanServiceLazyLoadingContainer;
+import org.eclipse.osbp.runtime.web.vaadin.common.data.StatefulDelegatingDtoSearchService;
+import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider;
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
+import org.eclipse.osbp.ui.api.user.IUser;
+import org.eclipse.osbp.utils.common.EntityUtils;
+import org.eclipse.osbp.vaadin.emf.api.IModelingContext;
+import org.eclipse.osbp.vaadin.emf.data.fields.EObjectComboBox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.VerticalLayout;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class UserFilterDialogProvider.
+ */
+@SuppressWarnings({ "serial", "restriction" })
+public class UserFilterDialogProvider implements IVaadinDialogProvider,
+		ValueChangeListener, IUser.UserLocaleListener {
+
+	/** The persistence service. */
+	@Inject
+	private IPersistenceService persistenceService;
+
+	/** The bundle space. */
+	@Inject
+	private IBundleSpace bundleSpace;
+
+	/** The modeling context. */
+	@Inject
+	IModelingContext modelingContext;
+
+	/** The user field. */
+	private ComboBox userField;
+
+	/** The entity field. */
+	private EObjectComboBox entityField;
+
+	/** The filter field. */
+	private ListSelect filterField;
+
+	/** The filter select all. */
+	private Button filterSelectAll;
+
+	/** The filter select none. */
+	private Button filterSelectNone;
+
+	/** The save. */
+	private Button save;
+
+	/** The filter check invers. */
+	private CheckBox filterCheckInvers;
+
+	/** The filter delimiter. */
+	private final String FILTER_DELIMITER = ":";
+
+	/** The persistence id. */
+	private String persistenceId = "authentication";
+
+	/** The emf. */
+	private EntityManagerFactory emf;
+
+	/** The Constant LOGGER. */
+	private static final Logger LOGGER = LoggerFactory
+			.getLogger(UserFilterDialogProvider.class);
+
+	/** The metadata service. */
+	@Inject
+	private IDSLMetadataService dslMetadataService;
+	
+	/** The user. */
+	@Inject
+	private IUser user;
+
+	/**
+	 * The listener interface for receiving userComboBoxValueChange events. The
+	 * class that is interested in processing a userComboBoxValueChange event
+	 * implements this interface, and the object created with that class is
+	 * registered with a component using the component's
+	 * <code>addUserComboBoxValueChangeListener<code> method. When
+	 * the userComboBoxValueChange event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see UserComboBoxValueChangeEvent
+	 */
+	private class UserComboBoxValueChangeListener implements
+			ValueChangeListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin
+		 * .data.Property.ValueChangeEvent)
+		 */
+		@Override
+		public void valueChange(ValueChangeEvent event) {
+			entityField.clear();
+			filterField.setContainerDataSource(null);
+			filterSelectAll.setEnabled(false);
+			filterSelectNone.setEnabled(false);
+			filterCheckInvers.clear();
+		}
+	}
+
+	/**
+	 * The listener interface for receiving entityComboBoxValueChange events.
+	 * The class that is interested in processing a entityComboBoxValueChange
+	 * event implements this interface, and the object created with that class
+	 * is registered with a component using the component's
+	 * <code>addEntityComboBoxValueChangeListener<code> method. When
+	 * the entityComboBoxValueChange event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see EntityComboBoxValueChangeEvent
+	 */
+	private class EntityComboBoxValueChangeListener implements
+			ValueChangeListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin
+		 * .data.Property.ValueChangeEvent)
+		 */
+		@Override
+		public void valueChange(ValueChangeEvent event) {
+			filterField.setContainerDataSource(null);
+			LEntity entityFieldValue = (LEntity) entityField.getValue();
+			if (entityFieldValue != null) {
+				for (LEntityAttribute entityAttr : entityFieldValue
+						.getAllAttributes()) {
+					if (entityAttr.isDomainKey()) {
+						filterField.setItemCaptionPropertyId(entityAttr
+								.getName());
+						fillfilterComboBox(entityFieldValue);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * The listener interface for receiving filterValueChange events. The class
+	 * that is interested in processing a filterValueChange event implements
+	 * this interface, and the object created with that class is registered with
+	 * a component using the component's
+	 * <code>addFilterValueChangeListener<code> method. When
+	 * the filterValueChange event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see FilterValueChangeEvent
+	 */
+	private class FilterValueChangeListener implements ValueChangeListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin
+		 * .data.Property.ValueChangeEvent)
+		 */
+		@Override
+		public void valueChange(ValueChangeEvent event) {
+			@SuppressWarnings("unchecked")
+			Collection<IDto> value = (Collection<IDto>) filterField.getValue();
+			int size = value.size();
+			if (size > 0 && size < filterField.getItemIds().size()) {
+				filterCheckInvers.setEnabled(true);
+			}
+		}
+	}
+
+	/**
+	 * The listener interface for receiving filterSelectAllClick events. The
+	 * class that is interested in processing a filterSelectAllClick event
+	 * implements this interface, and the object created with that class is
+	 * registered with a component using the component's
+	 * <code>addFilterSelectAllClickListener<code> method. When
+	 * the filterSelectAllClick event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see FilterSelectAllClickEvent
+	 */
+	private class FilterSelectAllClickListener implements ClickListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button
+		 * .ClickEvent)
+		 */
+		@Override
+		public void buttonClick(ClickEvent event) {
+			filterField.setValue(filterField.getItemIds());
+			filterCheckInvers.setEnabled(false);
+			filterCheckInvers.clear();
+		}
+	}
+
+	/**
+	 * The listener interface for receiving filterSelectNoneClick events. The
+	 * class that is interested in processing a filterSelectNoneClick event
+	 * implements this interface, and the object created with that class is
+	 * registered with a component using the component's
+	 * <code>addFilterSelectNoneClickListener<code> method. When
+	 * the filterSelectNoneClick event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see FilterSelectNoneClickEvent
+	 */
+	private class FilterSelectNoneClickListener implements ClickListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button
+		 * .ClickEvent)
+		 */
+		@Override
+		public void buttonClick(ClickEvent event) {
+			filterField.clear();
+			filterCheckInvers.setEnabled(false);
+			filterCheckInvers.clear();
+		}
+	}
+
+	/**
+	 * The listener interface for receiving saveClick events. The class that is
+	 * interested in processing a saveClick event implements this interface, and
+	 * the object created with that class is registered with a component using
+	 * the component's <code>addSaveClickListener<code> method. When
+	 * the saveClick event occurs, that object's appropriate
+	 * method is invoked.
+	 *
+	 * @see SaveClickEvent
+	 */
+	private class SaveClickListener implements ClickListener {
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button
+		 * .ClickEvent)
+		 */
+		@Override
+		public void buttonClick(ClickEvent event) {
+			updateUserAccountFilterTable();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin.data
+	 * .Property.ValueChangeEvent)
+	 */
+	@Override
+	public void valueChange(ValueChangeEvent event) {
+		if (userField.getValue() != null && entityField.getValue() != null
+				&& (filterField.getValue() != null)) {
+			save.setEnabled(true);
+		} else {
+			save.setEnabled(false);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.ui.api.contextfunction.IUserFilterDialogProvider#getDialog()
+	 */
+	@Override
+	public Component getDialog() {
+		VerticalLayout content = new VerticalLayout();
+		createView(content);
+		return content;
+	}
+
+	/**
+	 * Inits the.
+	 */
+	@PostConstruct
+	public void init() {
+		// Registration of class loader as required for the persistence service.
+		persistenceService.registerPersistenceUnit(persistenceId,
+				UserAccountFilter.class);
+		emf = persistenceService.getEntityManagerFactory(persistenceId);
+	}
+
+	/**
+	 * Creates the view.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	@Override
+	public void createView(VerticalLayout parent) {
+		parent.setSpacing(true);
+		parent.setMargin(true);
+		parent.setSizeFull();
+		parent.setPrimaryStyleName("osbp");
+
+		HorizontalLayout comboArea = new HorizontalLayout();
+		comboArea.addStyleName("loginUserArea");
+		comboArea.setSizeFull();
+		comboArea.setMargin(true);
+		parent.addComponent(comboArea);
+
+		HorizontalLayout dataArea = new HorizontalLayout();
+		dataArea.addStyleName("loginLoginArea");
+		dataArea.setSizeFull();
+		dataArea.setMargin(true);
+		parent.addComponent(dataArea);
+
+		userField = new ComboBox();
+		userField.setItemCaptionPropertyId("userName");
+		userField.setImmediate(true);
+		userField.setSizeFull();
+		comboArea.addComponent(userField);
+
+		entityField = new EObjectComboBox(modelingContext.getAdapterFactory());
+		entityField.setImmediate(true);
+		entityField.setSizeFull();
+		comboArea.addComponent(entityField);
+
+		HorizontalLayout buttonArea = new HorizontalLayout();
+		buttonArea.setId("loginButtonArea");
+		buttonArea.addStyleName("loginButtonArea");
+		buttonArea.setSizeFull();
+		buttonArea.setMargin(true);
+		parent.addComponent(buttonArea);
+
+		filterCheckInvers = new CheckBox();
+		filterCheckInvers.setImmediate(true);
+		filterCheckInvers.setEnabled(false);
+		buttonArea.addComponent(filterCheckInvers);
+		filterSelectAll = new Button("all");
+		filterSelectAll.setSizeFull();
+		filterSelectAll.setImmediate(true);
+		filterSelectAll.setEnabled(false);
+		buttonArea.addComponent(filterSelectAll);
+
+		filterSelectNone = new Button("none");
+		filterSelectNone.setSizeFull();
+		filterSelectNone.setImmediate(true);
+		filterSelectNone.setEnabled(false);
+		buttonArea.addComponent(filterSelectNone);
+
+		save = new Button("save");
+		save.setSizeFull();
+		save.setImmediate(true);
+		save.setEnabled(false);
+		buttonArea.addComponent(save);
+
+		filterField = new ListSelect();
+		filterField.setValue("entry to filter");
+		filterField.setImmediate(true);
+		filterField.setMultiSelect(true);
+		filterField.setSizeFull();
+		filterField.setRows(25);
+		dataArea.addComponent(filterField);
+		fillItems();
+
+		// Listener
+		userField.addValueChangeListener(this);
+		userField.addValueChangeListener(new UserComboBoxValueChangeListener());
+		entityField.addValueChangeListener(this);
+		entityField
+				.addValueChangeListener(new EntityComboBoxValueChangeListener());
+		filterField.addValueChangeListener(this);
+		filterField.addValueChangeListener(new FilterValueChangeListener());
+		filterSelectAll.addClickListener(new FilterSelectAllClickListener());
+		filterSelectNone.addClickListener(new FilterSelectNoneClickListener());
+		save.addClickListener(new SaveClickListener());
+		user.addUserLocaleListener(this);
+	}
+
+	/**
+	 * Fill items.
+	 */
+	protected void fillItems() {
+		fillUsersComboBox();
+		fillEntityComboBoxContent();
+	}
+
+	/**
+	 * Fill users combo box.
+	 */
+	// ---------- Helper Methods ------------
+	private void fillUsersComboBox() {
+		IDTOServiceWithMutablePersistence<UserAccountDto> service = (IDTOServiceWithMutablePersistence<UserAccountDto>) DtoServiceAccess
+				.getService(UserAccountDto.class);
+
+		// getting all existing users.
+		// not using directly the UserAccountDtoService via find-Method due to
+		// the necessary to use a container
+		// therefore we use here the combination of
+		// StatefulDelegatingDtoSearchService and
+		// BeanServiceLazyLoadingContainer.
+		StatefulDelegatingDtoSearchService<UserAccountDto> loadingService = new StatefulDelegatingDtoSearchService<>(
+				service, UserAccountDto.class);
+		BeanServiceLazyLoadingContainer<UserAccountDto> datasource = new BeanServiceLazyLoadingContainer<>(
+				loadingService, UserAccountDto.class, null);
+		userField.setContainerDataSource(datasource);
+	}
+
+	/**
+	 * Fill entity combo box content.
+	 */
+	private void fillEntityComboBoxContent() {
+		List<LEntity> result = new ArrayList<LEntity>();
+		for(EObject eObj:dslMetadataService.getAll(OSBPEntityPackage.Literals.LENTITY)) {
+			result.add((LEntity)eObj);
+		}
+		entityField.setCollection(result);
+	}
+
+	/**
+	 * Fillfilter combo box.
+	 *
+	 * @param entity
+	 *            the entity
+	 */
+	private void fillfilterComboBox(LEntity entity) {
+		String fqnDto = EntityUtils.getDtoFQNForLEntity(entity);
+		try {
+			@SuppressWarnings("unchecked")
+			Class<Object> dtoClass = (Class<Object>) bundleSpace
+					.forName(fqnDto);
+			// IMPORTANT!!!! DO NOT REMOVE!!!!
+			// Required to avoid NullPointerException trying to read data from BeanServiceLazyLoadingContainer<Object> datasource.
+			// Without this registration the IDTOServiceWithMutablePersistence<Object> service (being instance of AbstractDTOService) has 'null' as EntityManagerFactory.
+		    persistenceService.registerPersistenceUnit(entity.getPersistenceUnit(), dtoClass);
+			IDTOServiceWithMutablePersistence<Object> service = (IDTOServiceWithMutablePersistence<Object>) DtoServiceAccess
+					.getService(dtoClass);
+			StatefulDelegatingDtoSearchService<Object> loadingService = new StatefulDelegatingDtoSearchService<>(
+					service, dtoClass);
+			BeanServiceLazyLoadingContainer<Object> datasource = new BeanServiceLazyLoadingContainer<>(
+					loadingService, dtoClass, null);
+			int size1 = filterField.getItemIds().size();
+			filterField.setContainerDataSource(datasource);
+			int size2 = filterField.getItemIds().size();
+			if (size1 == 0 && size2 > 0) {
+				filterSelectAll.setEnabled(true);
+				filterSelectNone.setEnabled(true);
+			}
+			// optional preselect
+			preSelectFilter();
+		} catch (ClassNotFoundException e) {
+			LOGGER.error("{}", e);
+		}
+	}
+
+	/**
+	 * Pre select filter.
+	 */
+	private void preSelectFilter() {
+		// New empty list for the old selected and persisted filters that will
+		// be preselected.
+		final Set<IDto> selectedFilters = new HashSet<IDto>();
+		// Searching for candidates for preselection
+		for (UserAccountFilterDto accountFilterDto : getFilters()) {
+			String filter = accountFilterDto.getFilter();
+			String filterId = getFilterId(filter);
+			String filterEntity = getFilterEntity(filter);
+			@SuppressWarnings("unchecked")
+			Collection<IDto> items = (Collection<IDto>) filterField
+					.getContainerDataSource().getItemIds();
+			LEntity entityValue = (LEntity) entityField.getValue();
+			String entityDtoName = EntityUtils
+					.getQualifiedDtoNameForQualifiedEntityName(filterEntity);
+			for (IDto dto : items) {
+				String dtoName = dto.getClass().getName();
+				// Excluding not existing entities within the filters in
+				// UserAccountFilter
+				if (!dtoName.equals(entityDtoName)) {
+					break;
+				} else {
+					// Preselection of the invers checkbox
+					boolean inversValue = accountFilterDto.getInvers();
+					if (filterCheckInvers.getValue() != inversValue) {
+						filterCheckInvers.setValue(inversValue);
+					}
+					// Identify the entity candidates comparing their ID with
+					// the persisted ID within the filter in UserAccountFilter
+					Object idValue = DtoUtils.getValue(dto,
+							getIdName(entityValue));
+					// In case that the id is a Integer it has to be transformed
+					// into String to be compare with the id of the filter.
+					if (idValue instanceof Integer) {
+						idValue = String.valueOf(idValue);
+					}
+					if (filterId.equals(idValue)) {
+						selectedFilters.add(dto);
+					}
+				}
+			}
+			System.out.println();
+		}
+		// preseletion of the filter
+		filterField.setValue(selectedFilters);
+	}
+
+	/**
+	 * Gets the filter id.
+	 *
+	 * @param filter
+	 *            the filter
+	 * @return the filter id
+	 */
+	private String getFilterId(String filter) {
+		String[] splittedFilter = filter.split(FILTER_DELIMITER);
+		if (splittedFilter.length > 1) {
+			return splittedFilter[1];
+		}
+		return "";
+	}
+
+	/**
+	 * Gets the filter entity.
+	 *
+	 * @param filter
+	 *            the filter
+	 * @return the filter entity
+	 */
+	private String getFilterEntity(String filter) {
+		String[] splittedFilter = filter.split(FILTER_DELIMITER);
+		if (splittedFilter.length > 0) {
+			return splittedFilter[0];
+		}
+		return "";
+	}
+
+	/**
+	 * Gets the filters.
+	 *
+	 * @return the filters
+	 */
+	private Collection<UserAccountFilterDto> getFilters() {
+		// UserAccount
+		UserAccountDto user = (UserAccountDto) userField.getValue();
+		// create UserAccountDTOService
+		IDTOServiceWithMutablePersistence<UserAccountFilterDto> service = (IDTOServiceWithMutablePersistence<UserAccountFilterDto>) DtoServiceAccess
+				.getService(UserAccountFilterDto.class);
+		// find all useraccountfilter elements with the reference to the
+		// providing user account id.
+		ILFilter filter = null;
+		if (user != null) {
+			Equal idCompareFilter = new LCompare.Equal("id", user.getId());
+			filter = new LJoinFilter("userAccount", idCompareFilter);
+		}
+		Collection<UserAccountFilterDto> userAccountFilters = service
+				.find(new Query(filter));
+
+		return userAccountFilters;
+	}
+
+	/**
+	 * Update user account filter table.
+	 */
+	private void updateUserAccountFilterTable() {
+		// UserAccountDto user = (UserAccountDto) userField.getValue();
+		// JvmType type = getJvmTypeFromUserDto(user);
+		EntityManager em = emf.createEntityManager();
+		// create a new transaction
+		em.getTransaction().begin();
+
+		// Native - Solution
+		// nativeDeleteAndUpdate(em);
+
+		// CriteriaBuilder - Solution
+		criteriaDeleteAndUpdate(em);
+
+		// JPQL - Solution
+		// jpqlDeleteAnUpdate(em);
+
+		em.getTransaction().commit();
+		em.close();
+	}
+
+	/**
+	 * Jpql delete an update.
+	 *
+	 * @param em
+	 *            the em
+	 */
+	@SuppressWarnings("unused")
+	private void jpqlDeleteAnUpdate(EntityManager em) {
+		// ########## NOT EXISTING. This are only not working tests.
+		// javax.persistence.Query query =
+		// em.createQuery("FROM CCNG.USER_ACCOUNT_FILTER AS u WHERE u.USER_ACCOUNT_ID = '"
+		// + ((UserAccountDto)userField.getValue()).getId() + "'");
+		// javax.persistence.Query query =
+		// em.createQuery("SELECT filter.filter FROM CCNG.USER_ACCOUNT_FILTER filter");
+		// javax.persistence.Query query =
+		// em.createNativeQuery("SELECT ID FROM CCNG.USER_ACCOUNT_FILTER WHERE USER_ACCOUNT_ID = '"
+		// + ((UserAccountDto)userField.getValue()).getId() + "'");
+		// for (Object resultElement : query.getResultList()) {
+		// System.out.println("resultElement: " + resultElement);
+		// } ;
+	}
+
+	/**
+	 * Criteria delete and update.
+	 *
+	 * @param em
+	 *            the em
+	 */
+	private void criteriaDeleteAndUpdate(EntityManager em) {
+		UserAccountDto user = (UserAccountDto) userField.getValue();
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+
+		// delete all existing entries as prerequisite for the following update
+		// of the user account
+		// create delete criteria
+		CriteriaDelete<UserAccountFilter> delete = cb
+				.createCriteriaDelete(UserAccountFilter.class);
+		// set the root class
+		Root<UserAccountFilter> userAccountFilterRootDelete = delete
+				.from(UserAccountFilter.class);
+		Join<UserAccountFilter, UserAccount> uaJoin = userAccountFilterRootDelete
+				.join("userAccount", JoinType.LEFT);
+		// set where clause
+		Predicate cbEqualId = cb.equal(uaJoin.get("id"), user.getId());
+		String likeString = EntityUtils.getFQNForLEntity((LEntity) entityField
+				.getValue()) + FILTER_DELIMITER + "%";
+		Predicate cbLikeEntity = cb.like(
+				userAccountFilterRootDelete.get("filter"), likeString);
+		delete.where(cb.and(cbEqualId, cbLikeEntity));
+
+		// perform delete
+		@SuppressWarnings("unused")
+		int deleteResult = em.createQuery(delete).executeUpdate();
+
+		// create an empty userAccount and set only the id.
+		UserAccountDtoMapper<UserAccountDto, UserAccount> userAccountMapper = new UserAccountDtoMapper<>();
+		UserAccount userAccount = userAccountMapper.createEntity();
+		userAccount.setId(user.getId());
+
+		UserAccountFilterDtoMapper<UserAccountFilterDto, UserAccountFilter> userAccountFilterMapper = new UserAccountFilterDtoMapper<>();
+
+		// creation of all the required data to insert
+		LEntity entityValue = ((LEntity) entityField.getValue());
+		EObject container = entityValue.eContainer();
+		if (container != null && container instanceof LPackage) {
+			LPackage pckg = (LPackage) container;
+			String pckgName = pckg.getName();
+			String fqn = pckgName + "." + entityValue.getName();
+			@SuppressWarnings("unchecked")
+			Collection<IDto> keys = (Collection<IDto>) filterField.getValue();
+
+			// add new entries for this user
+			for (IDto dto : keys) {
+				Object idValue = DtoUtils.getValue(dto, getIdName(entityValue));
+				String filterValue = fqn + FILTER_DELIMITER + idValue;
+				// create userAccountFilter entity
+				UserAccountFilter userAccountFilter = userAccountFilterMapper
+						.createEntity();
+				userAccountFilter.setId(java.util.UUID.randomUUID().toString());
+				userAccountFilter.setFilter(filterValue);
+				userAccountFilter.setInvers(filterCheckInvers.getValue());
+				userAccountFilter.setUserAccount(userAccount);
+				// persist the userAccountFilter entity
+				em.persist(userAccountFilter);
+			}
+			Notification.show("SAVED", "The " + keys.size()
+					+ " filter were successfully saved.",
+					Notification.Type.HUMANIZED_MESSAGE);
+		}
+
+	}
+
+	/**
+	 * Native delete and update.
+	 *
+	 * @param em
+	 *            the em
+	 */
+	@SuppressWarnings("unused")
+	private void nativeDeleteAndUpdate(EntityManager em) {
+		UserAccountDto user = (UserAccountDto) userField.getValue();
+		// NativeQuery - Solution
+		// delete all existing entries for the updating user account
+		javax.persistence.Query query = em
+				.createNativeQuery("DELETE FROM CCNG.USER_ACCOUNT_FILTER WHERE USER_ACCOUNT_ID = '"
+						+ user.getId() + "'");
+		int deleteResult = query.executeUpdate();
+
+		// creation of all the required data to insert
+		LEntity entityValue = ((LEntity) entityField.getValue());
+		EObject container = entityValue.eContainer();
+		if (container != null && container instanceof LPackage) {
+			LPackage pckg = (LPackage) container;
+			String pckgName = pckg.getName();
+			String fqn = pckgName + "." + entityValue.getName();
+			@SuppressWarnings("unchecked")
+			Collection<IDto> keys = (Collection<IDto>) filterField.getValue();
+
+			// add new entries for this user
+			for (IDto dto : keys) {
+				Object idValue = DtoUtils.getValue(dto, getIdName(entityValue));
+				String filterValue = fqn + ":" + idValue;
+				query = em
+						.createNativeQuery("INSERT INTO CCNG.USER_ACCOUNT_FILTER (ID, FILTER, USER_ACCOUNT_ID, INVERS) VALUES (sys_guid(), '"
+								+ filterValue
+								+ "', '"
+								+ user.getId()
+								+ "',  "
+								+ getInversValue(filterCheckInvers.getValue())
+								+ ")");
+				int updateResult = query.executeUpdate();
+				System.out.println();
+			}
+		}
+
+	}
+
+	/**
+	 * Gets the invers value.
+	 *
+	 * @param value
+	 *            the value
+	 * @return the invers value
+	 */
+	private int getInversValue(Boolean value) {
+		return value ? 1 : 0;
+	}
+
+	/**
+	 * Gets the id name.
+	 *
+	 * @param entity
+	 *            the entity
+	 * @return the id name
+	 */
+	//
+	private String getIdName(LEntity entity) {
+		for (LEntityAttribute attr : entity.getAllAttributes()) {
+			if (attr.isId() || attr.isUuid()) {
+				return attr.getName();
+			}
+		}
+		return "";
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.vaaclipse.publicapi.authentication.IUser.UserLocaleListener#localeChanged(java.util.Locale)
+	 */
+	@Override
+	public void localeChanged(Locale locale) {
+		userField.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "username_tip"));
+		entityField.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "entity_tip"));
+		filterCheckInvers.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "invers"));
+		filterCheckInvers.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "invers_tip"));
+		filterSelectAll.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "all"));
+		filterSelectAll.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "all_tip"));
+		filterSelectNone.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "none"));
+		filterSelectNone.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "none_tip"));
+		save.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "save"));
+		save.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "save_tip"));
+		filterField.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "data_tip"));
+	}
+
+	// --------------------------------------------------------
+
+}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/Welcome.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/Welcome.html
new file mode 100644
index 0000000..b55f7eb
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/Welcome.html
@@ -0,0 +1,37 @@
+<html>
+<head>
+	<title></title>
+</head>
+<body>
+<h1 border-image: none; text-align: center;">Welcome to OS.bee</h1>
+
+<ul>
+	<li><strong>OS.Bee&copy;</strong> is a Business Application Software Factory based on the <a href="https://eclipse.org/e4/" target="_blank">Eclipse&trade; E4 application model</a>, <a href="http://www.vaadin.com/" target="_blank">Vaadin&trade;</a> and heavy use of cross-referenced domain-specific languages defined with <a href="https://eclipse.org/Xtext/" target="_blank">Xtext&trade;</a> allowing you to solve all imaginable <em>business</em> use-cases. You can obtain <strong>OS.bee</strong> information and sources from <a href="www.osbee.org" target="_blank">OS.Bee repository</a>.</li>
+</ul>
+
+<ul>
+	<li>With this application you can study an example build from a set of bottom-up models using the OS.Bee&copy; factory</li>
+</ul>
+
+<h3>Product Philosophy</h3>
+
+<ul>
+</ul>
+
+<ul>
+	<li>In contrast to general-purpose programming languages like Java&trade; or C which is mainly applicable on any domain, a domain-specific language (DSL) is a programming language specialized to a particular application domain. A key part of the idea behind DSL is to allow a particular type of problem or solution of a specific domain to be expressed more clearly and more easily than an existing language would allow.</li>
+</ul>
+
+<ul>
+	<li>In other words a DSL shall simplify the wording of domain specific solutions, but shall be complex enough to give the DSL developer a tool at hand which is sharp enough to solve given problems. This is of course a tightrope walk and it needs long years of experience to be able to design an efficient DSL for complex domains like ERP, CRM and many other fields of application.</li>
+</ul>
+
+<ul>
+	<li>A possible solution to diminish complexity of an application field like an ERP is to subdivide a domain in sub-domains and to preserve their context and coherence. For example an ERP could be subdivided in three domains: UI, Web-services and database, facilitating the development of DSL for each (sub)domain matching the requirement of being simple and easy to understand to be used.</li>
+</ul>
+
+<ul>
+	<li>The innovative idea and sleight of hand of OS.bee is to have developed a DSL-architecture that allows to be applied on any business field preserving the paradigm of DSL-programming although the allover domain can be very complex. Even better it uses the DSL concept also to describe inter sub-domain and therefore inner-domain dependencies which can be used to evaluate information out of these interdependencies which can be used to design default (sub)models. For example OS.bee possesses a DSL describing an organigram an other describing authentication and authorization. Well it is typical in business that a person linked to a job in an organigram possesses authentication and authorization. This means that authentication and authorization can be derived from an organigramm and the same can be done analog between the corresponding DSL.</li>
+</ul>
+</body>
+</html>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java
new file mode 100644
index 0000000..c567a9d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java
@@ -0,0 +1,62 @@
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License v1.0       
+ *  which accompanies this distribution, and is available at                  
+ *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ */
+ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.welcome;
+
+import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import javax.inject.Inject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.MApplication;
+
+@SuppressWarnings("restriction")
+public class WelcomeView {
+
+	private Label label;
+	
+	@Inject
+	public WelcomeView(VerticalLayout parent, IEclipseContext context,
+			MApplication app) {
+		parent.addStyleName("os-welcome");
+		label = new Label("", ContentMode.HTML);
+		label.setSizeFull();
+		parent.addComponent(label);
+		parent.setMargin(true);
+		
+		label.setValue(readHTML());
+	}
+
+	private String readHTML() {
+		URL url = getClass().getResource("Welcome.html");
+
+		try {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(
+					url.openStream()));
+
+			StringBuilder builder = new StringBuilder();
+			while (reader.ready()) {
+				builder.append(reader.readLine());
+				builder.append("\n");
+			}
+			reader.close();
+			return builder.toString();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..1399839
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2015 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
+<!--# All rights reserved. This program and the accompanying materials -->
+<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# which accompanies this distribution, and is available at -->
+<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# -->
+<!--# Contributors: -->
+<!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
+<!--#======================================================================= -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.osbp.releng.maven</groupId>
+        <artifactId>org.eclipse.osbp.releng.maven.parent.tycho</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.eclipse.osbp.vaaclipse.addons.softwarefactory</groupId>
+    <artifactId>org.eclipse.osbp.vaaclipse.addons.softwarefactory.aggregator</artifactId>
+    <packaging>pom</packaging>
+
+    <url>${osbp.site.repository.url}</url>
+    <scm>
+        <url>${osbp.scm.url}</url>
+        <connection>${osbp.scm.connection}</connection>
+        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
+    <distributionManagement>
+        <site>
+            <id>gh-pages</id>
+            <name>osbp GitHub Pages</name>
+            <url>${distribution.site.url}</url>
+        </site>
+    </distributionManagement>
+
+    <modules>
+        <module>org.eclipse.osbp.vaaclipse.addons.softwarefactory</module>
+        <module>org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature</module>
+        <!--<module>org.eclipse.osbp.vaaclipse.addons.softwarefactory.p2</module>-->
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>build.p2</id>
+            <activation>
+                <property>
+                    <name>osbp.build.p2</name>
+                </property>
+            </activation>
+            <modules>
+                <!--<module>org.eclipse.osbp.vaaclipse.addons.softwarefactory.p2</module>-->
+            </modules>
+        </profile>
+    </profiles>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>target-platform-configuration</artifactId>
+                    <version>${tycho-version}</version>
+                    <configuration>
+                        <resolver>p2</resolver>
+                        <pomDependencies>consider</pomDependencies>
+                        <environments>
+                            <environment>
+                                <os>win32</os>
+                                <ws>win32</ws>
+                                <arch>x86_64</arch>
+                            </environment>
+                            <environment>
+                                <os>linux</os>
+                                <ws>gtk</ws>
+                                <arch>x86</arch>
+                            </environment>
+                            <environment>
+                                <os>linux</os>
+                                <ws>gtk</ws>
+                                <arch>x86_64</arch>
+                            </environment>
+                            <environment>
+                                <os>macosx</os>
+                                <ws>cocoa</ws>
+                                <arch>x86_64</arch>
+                            </environment>
+                        </environments>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>