diff --git a/driver-tests/demo/demoJbi/build.xml b/driver-tests/demo/demoJbi/build.xml
index d10480fbd..efffa9e3b 100755
--- a/driver-tests/demo/demoJbi/build.xml
+++ b/driver-tests/demo/demoJbi/build.xml
@@ -1,73 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
 <project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
-    <description>Builds, tests, and runs the project .</description>
     <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      pre-init:                 called before initialization of project properties 
-      post-init:                called after initialization of project properties 
-      pre-compile:              called before javac compilation 
-      post-compile:             called after javac compilation 
-      pre-compile-single:       called before javac compilation of single file
-      post-compile-single:      called after javac compilation of single file
-      pre-dist:                 called before jar building 
-      post-dist:                called after jar building 
-      post-clean:               called after cleaning build products 
-
-    Example of pluging an obfuscator after the compilation could look like 
-
-        <target name="post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Other way how to customize the build is by overriding existing main targets.
-    The target of interest are: 
-
-      init-macrodef-javac:    defines macro for javac compilation
-      init-macrodef-debug:    defines macro for class debugging
-      do-dist:                jar archive building
-      run:                    execution of project 
-      javadoc-build:          javadoc generation 
-
-    Example of overriding the target for project execution could look like 
-
-        <target name="run" depends="<PROJNAME>-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that overridden target depends on jar target and not only on 
-    compile target as regular run target does. Again, for list of available 
-    properties which you can use check the target you are overriding in 
-    nbproject/build-impl.xml file. 
-
-    -->
-    <target name="-check-netbeans-home">
-        <condition property="no.netbeans.home">
+    <target name="init-esb-ide" if="netbeans.home">
+        <property name="esb.netbeans.platform" value="${netbeans.home}"/>
+    </target>
+    <target name="init-esb-cli" unless="netbeans.home">
+        <property name="from.commandline" value="true"/>
+        <property name="netbeans.dir" value="${esb.netbeans.home}"/>
+        <property name="netbeans.user" value="${esb.netbeans.user}"/>
+        <property file="${basedir}/nbproject/private/private.properties"/>
+        <property name="esb.netbeans.platform" value="${esb.netbeans.home}/platform"/>
+    </target>
+    <target name="check-catd-context">
+        <condition property="no.catd.context">
             <not>
-                <isset property="netbeans.home"/>
+                <isset property="org.netbeans.modules.compapp.catd.context"/>
             </not>
         </condition>
     </target>
-    <target name="-init-caps" if="no.netbeans.home">
-        <property file="${basedir}/nbproject/private/private.properties"/>
-        <property name="netbeans.home" value="${caps.netbeans.home}/platform8"/>
-        <property name="netbeans.user" value="${caps.netbeans.user}"/>
-        <property name="from.commandline" value="true"/>
+    <target name="init-catd" if="no.catd.context">
+        <property name="org.netbeans.modules.compapp.catd.context" value=""/>
     </target>
-    <target name="pre-init" depends="-check-netbeans-home,-init-caps"/>
+    <target name="pre-init" depends="init-esb-ide,init-esb-cli,check-catd-context,init-catd"/>
 </project>
diff --git a/driver-tests/demo/demoJbi/nbproject/build-impl.xml b/driver-tests/demo/demoJbi/nbproject/build-impl.xml
index 2cae8f6fb..44531b2ae 100755
--- a/driver-tests/demo/demoJbi/nbproject/build-impl.xml
+++ b/driver-tests/demo/demoJbi/nbproject/build-impl.xml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-        *** GENERATED FROM project.xml - DO NOT EDIT  ***
-        ***         EDIT ../build.xml INSTEAD         ***
-
-        For the purpose of easier reading the script
-        is divided into following sections:
-
-        - initialization
-        - compilation
-        - dist
-        - execution
-        - debugging
-        - cleanup
-
+            *** GENERATED FROM project.xml - DO NOT EDIT ***
+            ***           EDIT ../build.xml INSTEAD      ***
         -->
 <project name="demoJbi-jbi-impl" default="build" basedir="..">
-    <target name="default" depends="dist" description="Build whole project."/>
-    <!-- 
-                INITIALIZATION SECTION 
+    <target name="default" depends="dist"/>
+    <!--
+                INITIALIZATION SECTION
             -->
     <target name="pre-init">
         <!-- Empty placeholder for easier customization. -->
@@ -36,21 +25,11 @@
         <property file="nbproject/project.properties"/>
     </target>
     <target name="do-init" depends="pre-init,init-private,init-userdir,init-user,init-project">
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
         <condition property="have.tests">
             <or>
                 <available file="${test.dir}"/>
             </or>
         </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
     </target>
     <target name="post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -70,17 +49,19 @@
             <pathelement location="${soa.module.install.dir}/org-netbeans-modules-compapp-projects-jbi.jar"/>
             <pathelement location="${soa.module.install.dir}/org-netbeans-modules-compapp-manager-jbi.jar"/>
             <pathelement location="${soa.module.install.dir}/org-netbeans-soa-libs-xmlbeans.jar"/>
-            <pathelement location="${soa.module.install.dir}/ext/jbi/jbi-admin-common.jar"/>
+            <pathelement location="${soa.module.install.dir}/ext/jbi-admin-common.jar"/>
             <pathelement location="${soa.module.install.dir}/../ant/nblib/org-netbeans-modules-compapp-projects-jbi.jar"/>
-            <pathelement location="${netbeans.home}/lib/org-openide-util.jar"/>
-            <pathelement location="${netbeans.home}/lib/org-openide-modules.jar"/>
-            <pathelement location="${netbeans.home}/modules/org-openide-options.jar"/>
-            <pathelement location="${netbeans.home}/modules/org-openide-text.jar"/>
-            <pathelement location="${netbeans.home}/modules/org-openide-loaders.jar"/>
-            <pathelement location="${netbeans.home}/modules/org-openide-nodes.jar"/>
-            <pathelement location="${netbeans.home}/modules/org-openide-dialogs.jar"/>
-            <pathelement location="${netbeans.home}/core/org-openide-filesystems.jar"/>
-            <pathelement location="${ide.module.install.dir}/modules/ext/xerces-2.8.0.jar"/>
+            <pathelement location="${esb.netbeans.platform}/lib/org-openide-util.jar"/>
+            <pathelement location="${esb.netbeans.platform}/lib/org-openide-util-lookup.jar"/>
+            <pathelement location="${esb.netbeans.platform}/lib/org-openide-modules.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-openide-options.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-openide-text.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-openide-loaders.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-openide-nodes.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-openide-dialogs.jar"/>
+            <pathelement location="${esb.netbeans.platform}/modules/org-netbeans-modules-keyring.jar"/>
+            <pathelement location="${esb.netbeans.platform}/core/org-openide-filesystems.jar"/>
+            <pathelement location="${ide.module.install.dir}/ext/xerces-2.8.0.jar"/>
             <pathelement location="${ide.module.install.dir}/ext/xml-commons-dom-ranges-1.0.b2.jar"/>
             <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-retriever.jar"/>
             <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-schema-model.jar"/>
@@ -91,12 +72,12 @@
             <pathelement location="${ide.module.install.dir}/org-netbeans-modules-editor-lib.jar"/>
             <pathelement location="${ide.module.install.dir}/org-netbeans-modules-editor-util.jar"/>
             <pathelement location="${ide.module.install.dir}/org-netbeans-modules-projectapi.jar"/>
-            <pathelement location="${ide.module.install.dir}/org-netbeans-modules-classfile.jar"/>
             <pathelement location="${ide.module.install.dir}/org-apache-xml-resolver.jar"/>
             <pathelement location="${xml.module.install.dir}/org-netbeans-modules-xml-wsdl-extensions.jar"/>
-            <pathelement location="${java.module.install.dir}/ext/jaxws21/api/jaxb-api.jar"/>
-            <pathelement location="${java.module.install.dir}/ext/jaxws21/jaxb-impl.jar"/>
-            <pathelement location="${java.module.install.dir}/ext/jaxws21/activation.jar"/>
+            <pathelement location="${ide.module.install.dir}/ext/jaxb/api/jaxb-api.jar"/>
+            <pathelement location="${ide.module.install.dir}/ext/jaxb/jaxb-impl.jar"/>
+            <pathelement location="${ide.module.install.dir}/ext/jaxb/activation.jar"/>
+            <pathelement location="${java.module.install.dir}/org-netbeans-modules-classfile.jar"/>
             <pathelement location="${enterprise.module.install.dir}/org-netbeans-modules-j2eeserver.jar"/>
             <pathelement location="${enterprise.module.install.dir}/ext/jsr88javax.jar"/>
         </path>
@@ -121,9 +102,9 @@
                 COMPILATION SECTION
             -->
     <target name="deps-jar" depends="init" unless="${no.dependencies}">
-        <ant target="dist_se" inheritall="false" antfile="${project.demoBpel}/build.xml"/>
-        <basename property="demoBpel.su.name" file="${project.demoBpel}"/>
-        <unzip src="${reference.demoBpel.dist_se}" dest="${src.dir}/../jbiServiceUnits/${demoBpel.su.name}">
+        <ant target="dist_se" inheritall="false" antfile="${project.demoTestBPEL}/build.xml"/>
+        <property name="demoTestBPEL.su.name" value="demoTestBPEL"/>
+        <unzip src="${reference.demoTestBPEL.dist_se}" dest="${src.dir}/../jbiServiceUnits/${demoTestBPEL.su.name}">
             <patternset>
                 <include name="**/*.wsdl"/>
                 <include name="**/*.WSDL"/>
@@ -133,11 +114,12 @@
                 <include name="META-INF/catalog.xml"/>
             </patternset>
         </unzip>
-        <property name="demoBpel.su.dir" value="${src.dir}/../jbiServiceUnits/${demoBpel.su.name}"/>
-        <move file="${demoBpel.su.dir}/META-INF/jbi.xml" todir="${demoBpel.su.dir}"/>
-        <move todir="${src.dir}/../jbiServiceUnits/META-INF/${demoBpel.su.name}">
-            <fileset dir="${demoBpel.su.dir}/META-INF"/>
+        <property name="demoTestBPEL.su.dir" value="${src.dir}/../jbiServiceUnits/${demoTestBPEL.su.name}"/>
+        <move file="${demoTestBPEL.su.dir}/META-INF/jbi.xml" todir="${demoTestBPEL.su.dir}"/>
+        <move todir="${src.dir}/../jbiServiceUnits/META-INF/${demoTestBPEL.su.name}">
+            <fileset dir="${demoTestBPEL.su.dir}/META-INF"/>
         </move>
+        <copy todir="${build.dir}" file="${reference.demoTestBPEL.dist_se}"/>
     </target>
     <target name="deps-javaee-jar" depends="init" unless="${no.dependencies}"/>
     <target name="pre-pre-compile" depends="init,deps-jar">
@@ -148,13 +130,13 @@
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="library-inclusion-in-archive" depends="compile">
-        <unjar dest="${build.classes.dir}" src="${reference.demoBpel.dist_se}"/>
+        <unjar dest="${build.classes.dir}" src="${reference.demoTestBPEL.dist_se}"/>
     </target>
     <target name="library-inclusion-in-manifest" depends="compile">
-        <basename property="included.lib.reference.demoBpel.dist_se" file="${reference.demoBpel.dist_se}"/>
-        <copy todir="${build.classes.dir}" file="${reference.demoBpel.dist_se}"/>
+        <basename property="included.lib.reference.demoTestBPEL.dist_se" file="${reference.demoTestBPEL.dist_se}"/>
+        <copy todir="${build.classes.dir}" file="${reference.demoTestBPEL.dist_se}"/>
         <manifest file="${build.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${included.lib.reference.demoBpel.dist_se}"/>
+            <attribute name="Class-Path" value="${included.lib.reference.demoTestBPEL.dist_se}"/>
         </manifest>
     </target>
     <target name="do-compile" depends="init,deps-jar,pre-pre-compile,pre-compile"/>
@@ -162,7 +144,7 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="compile" depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project."/>
+    <target name="compile" depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile"/>
     <target name="pre-compile-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -178,7 +160,7 @@
     <!--
                 DIST BUILDING SECTION
             -->
-    <target name="jbi-build" depends="init,init-deploy,deps-jar, deps-javaee-jar" description="Build Service Assembly.">
+    <target name="jbi-build" depends="init,init-deploy,deps-jar,deps-javaee-jar">
         <mkdir dir="${src.dir}"/>
         <copy todir="${src.dir}/../jbiServiceUnits" overwrite="true">
             <fileset dir="${src.dir}"/>
@@ -186,7 +168,7 @@
         <mkdir dir="${build.dir}/META-INF"/>
         <jar compress="true" jarfile="${build.dir}/BCDeployment.jar">
             <fileset dir="${src.dir}/../jbiServiceUnits">
-                <exclude name="META-INF/*/catalog.xml"/>
+                <exclude name="**/catalog.xml"/>
                 <exclude name="**/jbi.xml"/>
             </fileset>
         </jar>
@@ -194,28 +176,36 @@
         <delete file="${build.dir}/BCDeployment.jar"/>
         <dirname property="dist.jar.dir" file="${dist.jar}"/>
         <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.jar}">
+        <jar compress="${jar.compress}" jarfile="${dist.jar}" filesetmanifest="merge">
             <fileset dir="${build.dir}" excludes="jar/*"/>
         </jar>
     </target>
-    <target name="jbi-clean-build" depends="init,init-deploy,clean,jbi-build" description="Clean and Build Service Assembly."/>
-    <target name="dist" depends="jbi-build" description="Build distribution (JAR)."/>
+    <target name="jbi-clean-build" depends="init,init-deploy,clean,jbi-build"/>
+    <target name="dist" depends="jbi-build"/>
     <!--
                 EXECUTION SECTION
             -->
-    <target name="run" depends="jbi-build,run-jbi-deploy" description="Deploy to server."/>
-    <target name="init-deploy">
+    <target name="run" depends="jbi-build,run-jbi-deploy"/>
+    <target name="init-deploy" depends="init-server-password">
         <property name="include.jar.manifest" value=""/>
     </target>
+    <target name="init-server-password" unless="server.password">
+        <property name="server.password" value=""/>
+    </target>
     <target name="run-jbi-deploy" depends="jbi-build">
         <property name="j2ee.server.instance" value=""/>
         <loadproperties srcFile="${basedir}/nbproject/private/private.properties"/>
-        <jbi-deploy-service-assembly serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/>
+        <jbi-deploy-service-assembly serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}" password="${server.password}"/>
     </target>
-    <target name="undeploy" depends="init">
+    <target name="run-jbi-deploy-without-build" depends="init,init-deploy">
         <property name="j2ee.server.instance" value=""/>
         <loadproperties srcFile="${basedir}/nbproject/private/private.properties"/>
-        <jbi-deploy-service-assembly undeployServiceAssembly="true" serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/>
+        <jbi-deploy-service-assembly serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}" password="${server.password}"/>
+    </target>
+    <target name="undeploy" depends="init,init-server-password">
+        <property name="j2ee.server.instance" value=""/>
+        <loadproperties srcFile="${basedir}/nbproject/private/private.properties"/>
+        <jbi-deploy-service-assembly undeployServiceAssembly="true" serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}" password="${server.password}"/>
     </target>
     <target name="-pre-debug">
         <property name="inDebug" value="true"/>
@@ -228,20 +218,20 @@
     <!--
                 DEBUGGING SECTION
             -->
-    <target name="debug" description="Debug project in IDE." depends="run,-pre-debug" if="netbeans.home"/>
+    <target name="debug" depends="run,-pre-debug" if="esb.netbeans.platform"/>
     <target name="pre-debug-fix" depends="init">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
     </target>
-    <target name="do-debug-fix" if="netbeans.home" depends="init,pre-debug-fix,compile-single">
+    <target name="do-debug-fix" if="esb.netbeans.platform" depends="init,pre-debug-fix,compile-single">
         <j2seproject:nbjpdareload xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
     </target>
-    <target name="debug-fix" if="netbeans.home" depends="init,pre-debug-fix,do-debug-fix"/>
+    <target name="debug-fix" if="esb.netbeans.platform" depends="init,pre-debug-fix,do-debug-fix"/>
     <!--
                 CLEANUP SECTION
             -->
     <target name="deps-clean" depends="init" unless="${no.dependencies}">
-        <ant target="clean" inheritall="false" antfile="${project.demoBpel}/build.xml"/>
+        <ant target="clean" inheritall="false" antfile="${project.demoTestBPEL}/build.xml"/>
     </target>
     <target name="do-clean" depends="init">
         <delete dir="${build.dir}"/>
@@ -252,52 +242,69 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="clean" depends="init,deps-clean,do-clean,post-clean" description="Clean build products."/>
-    <target name="jbi-clean-config" depends="init,clear-casa,jbi-clean-build" description="Clean service assembly."/>
+    <target name="clean" depends="init,deps-clean,do-clean,post-clean"/>
+    <target name="jbi-clean-config" depends="init,clear-casa,jbi-clean-build"/>
     <target name="clear-casa">
         <delete file="${source.root}/conf/${jbi.service-assembly.id}.casa"/>
         <delete file="${src.dir}/${jbi.service-assembly.id}.wsdl"/>
     </target>
     <!--
                 JUNIT EXECUTION SECTION
-                ======================= 
             -->
     <target name="-pre-test-run" if="have.tests" depends="init">
         <mkdir dir="${test.results.dir}"/>
         <path id="unit.test.classpath">
             <pathelement path="${soa.module.install.dir}/org-netbeans-modules-compapp-manager-jbi.jar"/>
             <pathelement path="${soa.module.install.dir}/org-netbeans-modules-compapp-projects-jbi.jar"/>
-            <pathelement path="${soa.module.install.dir}/ext/jbi/jbi-admin-common.jar"/>
-            <pathelement path="${soa.module.install.dir}/ext/jbi/catd.jar"/>
+            <pathelement path="${soa.module.install.dir}/ext/jbi-admin-common.jar"/>
+            <pathelement path="${soa.module.install.dir}/ext/catd.jar"/>
             <pathelement path="${java.module.install.dir}/ext/junit-3.8.2.jar"/>
             <pathelement path="${java.module.install.dir}/ext/jaxws21/api/saaj-api.jar"/>
             <pathelement path="${java.module.install.dir}/ext/jaxws21/saaj-impl.jar"/>
             <pathelement path="${java.module.install.dir}/ext/jaxws21/FastInfoset.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-lib.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-deprecated-pre65formatting.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-util.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-lib2.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-indent.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-plain.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-plain-lib.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-settings.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-settings-storage.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-lexer.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-core.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-lexer.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-text.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-xdm.jar"/>
             <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-xam.jar"/>
-            <pathelement path="${netbeans.home}/lib/org-openide-modules.jar"/>
-            <pathelement path="${netbeans.home}/lib/org-openide-util.jar"/>
-            <pathelement path="${netbeans.home}/modules/org-openide-options.jar"/>
-            <pathelement path="${netbeans.home}/modules/org-openide-text.jar"/>
-            <pathelement path="${netbeans.home}/modules/org-openide-loaders.jar"/>
-            <pathelement path="${netbeans.home}/modules/org-openide-nodes.jar"/>
-            <pathelement path="${netbeans.home}/modules/org-netbeans-modules-editor-mimelookup.jar"/>
-            <pathelement path="${netbeans.home}/core/org-openide-filesystems.jar"/>
+            <pathelement path="${ide.module.install.dir}/org-netbeans-modules-csl-api.jar"/>
+            <pathelement path="${ide.module.install.dir}/ext/jaxb/activation.jar"/>
+            <pathelement path="${esb.netbeans.platform}/lib/org-openide-modules.jar"/>
+            <pathelement path="${esb.netbeans.platform}/lib/org-openide-util.jar"/>
+            <pathelement path="${esb.netbeans.platform}/lib/org-openide-util-lookup.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-awt.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-options.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-text.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-loaders.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-nodes.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-netbeans-modules-editor-mimelookup.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-netbeans-modules-editor-mimelookup-impl.jar"/>
+            <pathelement path="${esb.netbeans.platform}/core/org-openide-filesystems.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-netbeans-modules-keyring.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/org-openide-dialogs.jar"/>
+            <pathelement path="${esb.netbeans.platform}/modules/ext/jna-3.0.9.jar"/>
         </path>
     </target>
-    <target name="-do-test-run" if="netbeans.home+have.tests" depends="init,-pre-test-run">
-        <junit showoutput="true" fork="yes" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+    <target name="-do-test-run" if="have.tests" depends="init,-pre-test-run,init-server-password">
+        <junit showoutput="true" fork="yes" dir="${basedir}" tempdir="${java.io.tmpdir}" failureproperty="tests.failed" errorproperty="tests.failed">
             <classpath refid="unit.test.classpath"/>
+            <jvmarg value="-Xmx256m"/>
             <sysproperty key="NetBeansUserDir" value="${netbeans.user}"/>
+            <sysproperty key="ServerPassword" value="${server.password}"/>
+            <sysproperty key="java.awt.headless" value="${java.awt.headless}"/>
+            <sysproperty key="GenerateATSOutput" value="${generate.ats.output}"/>
+            <sysproperty key="org.netbeans.modules.compapp.catd.context" value="${org.netbeans.modules.compapp.catd.context}"/>
             <test name="org.netbeans.modules.compapp.catd.ConfiguredTest" haltonfailure="no" todir="${test.results.dir}"/>
             <syspropertyset>
                 <propertyref prefix="test-sys-prop."/>
@@ -307,11 +314,16 @@
             <formatter type="xml"/>
         </junit>
     </target>
-    <target name="-do-single-test-run" if="netbeans.home+have.tests" depends="init,-pre-test-run">
-        <junit showoutput="true" fork="yes" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+    <target name="-do-single-test-run" if="have.tests" depends="init,-pre-test-run,init-server-password">
+        <junit showoutput="true" fork="yes" dir="${basedir}" tempdir="${java.io.tmpdir}" failureproperty="tests.failed" errorproperty="tests.failed">
             <classpath refid="unit.test.classpath"/>
+            <jvmarg value="-Xmx256m"/>
             <sysproperty key="NetBeansUserDir" value="${netbeans.user}"/>
+            <sysproperty key="ServerPassword" value="${server.password}"/>
+            <sysproperty key="java.awt.headless" value="${java.awt.headless}"/>
+            <sysproperty key="GenerateATSOutput" value="${generate.ats.output}"/>
             <sysproperty key="inDebug" value="${inDebug}"/>
+            <sysproperty key="org.netbeans.modules.compapp.catd.context" value="${org.netbeans.modules.compapp.catd.context}"/>
             <test name="org.netbeans.modules.compapp.catd.ConfiguredTest" haltonfailure="no" todir="${test.results.dir}"/>
             <syspropertyset>
                 <propertyref prefix="test-sys-prop."/>
@@ -328,13 +340,13 @@
         <fail if="tests.failed">Some tests failed; see details above.</fail>
     </target>
     <target name="test-report" if="have.tests" depends="init"/>
-    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
-    <target name="test" depends="init,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
-    <target name="test-single" depends="init,-pre-test-run,-do-single-test-run,test-report,-post-single-test-run,-test-browse" description="Run unit tests."/>
-    <target name="debug-single" depends="init,-pre-test-run,-pre-debug,-do-single-test-run,-post-debug,test-report,-post-single-test-run,-test-browse" description="Debug unit tests."/>
+    <target name="-test-browse" if="have.tests" depends="init"/>
+    <target name="test" depends="init,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse"/>
+    <target name="test-single" depends="init,-pre-test-run,-do-single-test-run,test-report,-post-single-test-run,-test-browse"/>
+    <target name="debug-single" depends="init,-pre-test-run,-pre-debug,-do-single-test-run,-post-debug,test-report,-post-single-test-run,-test-browse"/>
     <target name="-post-unit-test-run" if="have.tests+tests.failed" depends="init,-pre-test-run,-do-test-run">
         <echo>Some tests failed; see details above.</echo>
     </target>
-    <target name="unit-test" depends="init,-pre-test-run,-do-test-run,test-report,-post-unit-test-run,-test-browse" description="Run unit tests in a batch."/>
-    <target name="jbi-unit-test" depends="run,unit-test,undeploy" description="build, deploy, test, and undeploy."/>
+    <target name="unit-test" depends="init,-pre-test-run,-do-test-run,test-report,-post-unit-test-run,-test-browse"/>
+    <target name="jbi-unit-test" depends="run,unit-test,undeploy"/>
 </project>
diff --git a/driver-tests/demo/demoJbi/nbproject/genfiles.properties b/driver-tests/demo/demoJbi/nbproject/genfiles.properties
index 965eb8048..45b164201 100755
--- a/driver-tests/demo/demoJbi/nbproject/genfiles.properties
+++ b/driver-tests/demo/demoJbi/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d9b22e17
-build.xml.script.CRC32=6c3edb79
-build.xml.stylesheet.CRC32=73a3a752
+build.xml.data.CRC32=4de3b64a
+build.xml.script.CRC32=a694843e
+build.xml.stylesheet.CRC32=d41de91a@6.9
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d9b22e17
-nbproject/build-impl.xml.script.CRC32=018f93b5
-nbproject/build-impl.xml.stylesheet.CRC32=b3f2f6d2
+nbproject/build-impl.xml.data.CRC32=4de3b64a
+nbproject/build-impl.xml.script.CRC32=0e2b8553
+nbproject/build-impl.xml.stylesheet.CRC32=72a3e64a@6.9
diff --git a/driver-tests/demo/demoJbi/nbproject/project.properties b/driver-tests/demo/demoJbi/nbproject/project.properties
index 41e01a2d7..84693f03a 100755
--- a/driver-tests/demo/demoJbi/nbproject/project.properties
+++ b/driver-tests/demo/demoJbi/nbproject/project.properties
@@ -27,15 +27,16 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-jbi.content.additional=${reference.demoBpel.dist_se}
+jbi.content.additional=${reference.demoTestBPEL.dist_se}
 jbi.content.component=sun-bpel-engine
 jbi.service-assembly.description=Represents this Service Assembly
 jbi.service-assembly.id=demoJbi
 jbi.service-unit.description=Represents this Service Unit
 meta.inf=${source.root}/conf
 platform.active=default_platform
-project.demoBpel=../demoBpel
-reference.demoBpel.dist_se=${project.demoBpel}/build/SEDeployment.jar
+project.demoTestBPEL=../demoTestBPEL
+reference.demoTestBPEL.dist_se=${project.demoTestBPEL}/build/SEDeployment.jar
+resource.demoTestBPEL=${project.demoTestBPEL}/setup
 source.encoding=windows-1252
 source.root=src
 src.build.dir=${source.root}/jbiServiceUnits
diff --git a/driver-tests/demo/demoJbi/nbproject/project.xml b/driver-tests/demo/demoJbi/nbproject/project.xml
index a8104d345..f437d93f2 100755
--- a/driver-tests/demo/demoJbi/nbproject/project.xml
+++ b/driver-tests/demo/demoJbi/nbproject/project.xml
@@ -5,11 +5,11 @@
         <data xmlns="http://www.netbeans.org/ns/j2ee-jbi/1">
             <name>demoJbi</name>
             <minimum-ant-version>1.6</minimum-ant-version>
-            <included-library>reference.demoBpel.dist_se</included-library>
+            <included-library>reference.demoTestBPEL.dist_se</included-library>
         </data>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
             <reference>
-                <foreign-project>demoBpel</foreign-project>
+                <foreign-project>demoTestBPEL</foreign-project>
                 <artifact-type>CAPS.asa:sun-bpel-engine</artifact-type>
                 <script>build.xml</script>
                 <target>dist_se</target>
diff --git a/driver-tests/demo/demoJbi/src/conf/AssemblyInformation.xml b/driver-tests/demo/demoJbi/src/conf/AssemblyInformation.xml
index 878f16424..177574e97 100755
--- a/driver-tests/demo/demoJbi/src/conf/AssemblyInformation.xml
+++ b/driver-tests/demo/demoJbi/src/conf/AssemblyInformation.xml
@@ -7,11 +7,11 @@
         </identification>
         <service-unit>
             <identification>
-                <name>demoJbi-demoBpel</name>
-                <description>This represents the Application Sub-Assembly</description>
+                <name>demoJbi-demoTestBPEL</name>
+                <description>Represents this Service Unit</description>
             </identification>
             <target>
-                <artifacts-zip>demoBpel.jar</artifacts-zip>
+                <artifacts-zip>demoTestBPEL.jar</artifacts-zip>
                 <component-name>sun-bpel-engine</component-name>
             </target>
         </service-unit>
@@ -145,5 +145,45 @@
                 <component-name>sun-snmp-binding</component-name>
             </target>
         </service-unit>
+        <service-unit>
+            <identification>
+                <name>demoJbi-sun-scheduler-binding</name>
+                <description>Represents this Service Unit</description>
+            </identification>
+            <target>
+                <artifacts-zip>sun-scheduler-binding.jar</artifacts-zip>
+                <component-name>sun-scheduler-binding</component-name>
+            </target>
+        </service-unit>
+        <service-unit>
+            <identification>
+                <name>demoJbi-sun-rest-binding</name>
+                <description>Represents this Service Unit</description>
+            </identification>
+            <target>
+                <artifacts-zip>sun-rest-binding.jar</artifacts-zip>
+                <component-name>sun-rest-binding</component-name>
+            </target>
+        </service-unit>
+        <service-unit>
+            <identification>
+                <name>demoJbi-sun-database-binding</name>
+                <description>Represents this Service Unit</description>
+            </identification>
+            <target>
+                <artifacts-zip>sun-database-binding.jar</artifacts-zip>
+                <component-name>sun-database-binding</component-name>
+            </target>
+        </service-unit>
+        <service-unit>
+            <identification>
+                <name>demoJbi-sun-ldap-binding</name>
+                <description>Represents this Service Unit</description>
+            </identification>
+            <target>
+                <artifacts-zip>sun-ldap-binding.jar</artifacts-zip>
+                <component-name>sun-ldap-binding</component-name>
+            </target>
+        </service-unit>
     </service-assembly>
 </jbi>
diff --git a/driver-tests/demo/demoJbi/src/conf/BindingComponentInformation.xml b/driver-tests/demo/demoJbi/src/conf/BindingComponentInformation.xml
index c1494fad7..6ee5c9aa0 100755
--- a/driver-tests/demo/demoJbi/src/conf/BindingComponentInformation.xml
+++ b/driver-tests/demo/demoJbi/src/conf/BindingComponentInformation.xml
@@ -1,39 +1,82 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component-info-list>
-<component-info>
-<description>File Binding</description>
-<name>sun-file-binding</name>
-<state>Installed</state>
-<type>binding</type>
-<xmlns>http://schemas.sun.com/jbi/wsdl-extensions/file/</xmlns>
-</component-info>
-<component-info>
-<description>JMS Binding</description>
-<name>sun-jms-binding</name>
-<state>Installed</state>
-<type>binding</type>
-<xmlns>http://schemas.sun.com/jbi/wsdl-extensions/jms/</xmlns>
-</component-info>
-<component-info>
-<description>FTP Binding</description>
-<name>sun-ftp-binding</name>
-<state>Installed</state>
-<type>binding</type>
-<xmlns>http://schemas.sun.com/jbi/wsdl-extensions/ftp/</xmlns>
-</component-info>
-<component-info>
-<description>HTTP Soap Binding to send SOAP messages e.g. to and from BPEL service engine.</description>
-<name>sun-http-binding</name>
-<state>Installed</state>
-<type>binding</type>
-<xmlns>http://schemas.xmlsoap.org/wsdl/http/</xmlns>
-<xmlns>http://schemas.xmlsoap.org/wsdl/soap/</xmlns>
-</component-info>
-<component-info>
-<description>SNMP Binding</description>
-<name>sun-snmp-binding</name>
-<state>Installed</state>
-<type>Binding</type>
-<xmlns>http://schemas.sun.com/jbi/wsdl-extensions/snmp/</xmlns>
-</component-info>
+    <component-info>
+        <description>HL7 Binding</description>
+        <name>sun-hl7-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/hl7/</xmlns>
+    </component-info>
+    <component-info>
+        <description>File Binding</description>
+        <name>sun-file-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/file/</xmlns>
+    </component-info>
+    <component-info>
+        <description>JMS Binding</description>
+        <name>sun-jms-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/jms/</xmlns>
+    </component-info>
+    <component-info>
+        <description>FTP Binding</description>
+        <name>sun-ftp-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/ftp/</xmlns>
+    </component-info>
+    <component-info>
+        <description>Email Binding</description>
+        <name>sun-email-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/email/</xmlns>
+    </component-info>
+    <component-info>
+        <description>HTTP Soap Binding to send SOAP messages e.g. to and from BPEL service engine.</description>
+        <name>sun-http-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.xmlsoap.org/wsdl/http/</xmlns>
+        <xmlns>http://schemas.xmlsoap.org/wsdl/soap/</xmlns>
+        <xmlns>http://schemas.xmlsoap.org/wsdl/soap12/</xmlns>
+    </component-info>
+    <component-info>
+        <description>SNMP Binding</description>
+        <name>sun-snmp-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/snmp/</xmlns>
+    </component-info>
+    <component-info>
+        <description>Scheduler Binding</description>
+        <name>sun-scheduler-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/scheduler/</xmlns>
+    </component-info>
+    <component-info>
+        <description>REST Binding</description>
+        <name>sun-rest-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/rest/</xmlns>
+    </component-info>
+    <component-info>
+        <description>Database binding</description>
+        <name>sun-database-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/jdbc/</xmlns>
+    </component-info>
+    <component-info>
+        <description>LDAP binding</description>
+        <name>sun-ldap-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+        <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/ldap/</xmlns>
+    </component-info>
 </component-info-list>
diff --git a/driver-tests/demo/demoJbi/src/conf/ComponentInformation.xml b/driver-tests/demo/demoJbi/src/conf/ComponentInformation.xml
index 068713bae..837f88350 100755
--- a/driver-tests/demo/demoJbi/src/conf/ComponentInformation.xml
+++ b/driver-tests/demo/demoJbi/src/conf/ComponentInformation.xml
@@ -1,135 +1,177 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component-info-list>
-<component-info>
-<description>This is a workflow service engine.</description>
-<name>sun-workflow-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>JDBC binding</description>
-<name>sun-jdbc-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>This is a iep service engine.</description>
-<name>sun-iep-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>HL7 Binding</description>
-<name>sun-hl7-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>SMTP Binding</description>
-<name>sun-smtp-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>File Binding</description>
-<name>sun-file-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>JMS Binding</description>
-<name>sun-jms-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>This is a script service engine.</description>
-<name>sun-script-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>Java EE service engine.</description>
-<name>JavaEEServiceEngine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>This is a sql service engine.</description>
-<name>sun-sql-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>MSMQ Binding</description>
-<name>sun-msmq-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>FTP Binding</description>
-<name>sun-ftp-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>SAP Binding</description>
-<name>sun-sap-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>Email Binding</description>
-<name>sun-email-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>This is a bpel service engine.</description>
-<name>sun-bpel-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>HTTP Soap Binding to send SOAP messages e.g. to and from BPEL service engine.</description>
-<name>sun-http-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>This is a xslt service engine.</description>
-<name>sun-xslt-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>MQ Binding</description>
-<name>sun-webspheremq-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>DCOM Binding</description>
-<name>sun-dcom-binding</name>
-<state>Installed</state>
-<type>binding</type>
-</component-info>
-<component-info>
-<description>Java EE service engine.</description>
-<name>sun-javaee-engine</name>
-<state>Installed</state>
-<type>engine</type>
-</component-info>
-<component-info>
-<description>SNMP Binding</description>
-<name>sun-snmp-binding</name>
-<state>Installed</state>
-<type>Binding</type>
-</component-info>
-<component-info>
-<description>This is a etl service engine.</description>
-<name>sun-etl-engine</name>
-<state>Installed</state>
-<type>Engine</type>
-</component-info>
+    <component-info>
+        <description>This is a workflow service engine.</description>
+        <name>sun-workflow-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>JDBC binding</description>
+        <name>sun-jdbc-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a iep service engine.</description>
+        <name>sun-iep-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>HL7 Binding</description>
+        <name>sun-hl7-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>SMTP Binding</description>
+        <name>sun-smtp-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>File Binding</description>
+        <name>sun-file-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>JMS Binding</description>
+        <name>sun-jms-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a script service engine.</description>
+        <name>sun-script-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>Java EE service engine.</description>
+        <name>JavaEEServiceEngine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>This is a sql service engine.</description>
+        <name>sun-sql-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>MSMQ Binding</description>
+        <name>sun-msmq-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>FTP Binding</description>
+        <name>sun-ftp-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>SAP Binding</description>
+        <name>sun-sap-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>Email Binding</description>
+        <name>sun-email-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a bpel service engine.</description>
+        <name>sun-bpel-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>HTTP Soap Binding to send SOAP messages e.g. to and from BPEL service engine.</description>
+        <name>sun-http-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a xslt service engine.</description>
+        <name>sun-xslt-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>MQ Binding</description>
+        <name>sun-webspheremq-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>DCOM Binding</description>
+        <name>sun-dcom-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>Java EE service engine.</description>
+        <name>sun-javaee-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>SNMP Binding</description>
+        <name>sun-snmp-binding</name>
+        <state>Installed</state>
+        <type>binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a etl service engine.</description>
+        <name>sun-etl-engine</name>
+        <state>Installed</state>
+        <type>engine</type>
+    </component-info>
+    <component-info>
+        <description>This is a workflow service engine.</description>
+        <name>sun-wlm-engine</name>
+        <state>Installed</state>
+        <type>Engine</type>
+    </component-info>
+    <component-info>
+        <description>Scheduler Binding</description>
+        <name>sun-scheduler-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a edm service engine.</description>
+        <name>sun-edm-engine</name>
+        <state>Installed</state>
+        <type>Engine</type>
+    </component-info>
+    <component-info>
+        <description>REST Binding</description>
+        <name>sun-rest-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+    </component-info>
+    <component-info>
+        <description>Database binding</description>
+        <name>sun-database-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+    </component-info>
+    <component-info>
+        <description>This is a pojo service engine.</description>
+        <name>sun-pojo-engine</name>
+        <state>Installed</state>
+        <type>Engine</type>
+    </component-info>
+    <component-info>
+        <description>LDAP binding</description>
+        <name>sun-ldap-binding</name>
+        <state>Installed</state>
+        <type>Binding</type>
+    </component-info>
 </component-info-list>
diff --git a/driver-tests/demo/demoJbi/src/conf/demoJbi.casa b/driver-tests/demo/demoJbi/src/conf/demoJbi.casa
index 34aa498f6..8dd4ed015 100755
--- a/driver-tests/demo/demoJbi/src/conf/demoJbi.casa
+++ b/driver-tests/demo/demoJbi/src/conf/demoJbi.casa
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="http://www.seebeyond.com/eInsight/TestBpel" xmlns:ns2="http://stc.com/TestBpel" xmlns:xlink="http://www.w3.org/2000/xlink">
+<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="http://stc.com/TestBpel" xmlns:ns2="http://www.seebeyond.com/eInsight/TestBpel" xmlns:xlink="http://www.w3.org/2000/xlink">
     <endpoints>
-        <endpoint display-name="sa" endpoint-name="server_myRole" file-path="TestBpel.bpel" interface-name="ns2:TestBpel" name="endpoint1" process-name="TestBpel" service-name="ns1:sa"/>
-        <endpoint endpoint-name="port" interface-name="ns2:TestBpel" name="endpoint2" service-name="ns2:TestBpelService"/>
+        <endpoint endpoint-name="port" interface-name="ns1:TestBpel" name="endpoint1" service-name="ns1:TestBpelService"/>
+        <endpoint display-name="sa" endpoint-name="server_myRole" file-path="TestBpel.bpel" interface-name="ns1:TestBpel" name="endpoint2" process-name="TestBpel" service-name="ns2:sa"/>
     </endpoints>
     <service-units>
-        <service-engine-service-unit artifacts-zip="demoBpel.jar" component-name="sun-bpel-engine" defined="true" description="This represents the Application Sub-Assembly" internal="true" name="demoJbi-demoBpel" unit-name="demoBpel" unknown="false" x="-1" y="-1">
-            <provides endpoint="endpoint1"/>
+        <service-engine-service-unit artifacts-zip="demoTestBPEL.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="demoJbi-demoTestBPEL" unit-name="demoTestBPEL" unknown="false" x="148" y="99">
+            <provides endpoint="endpoint2"/>
         </service-engine-service-unit>
         <binding-component-service-unit artifacts-zip="sun-http-binding.jar" component-name="sun-http-binding" description="Represents this Service Unit" name="demoJbi-sun-http-binding" unit-name="sun-http-binding">
             <ports>
-                <port x="0" y="-1">
-                    <link xlink:href="../jbiServiceUnits/demoBpel/TestBpel.wsdl#xpointer(/definitions/service[@name='TestBpelService']/port[@name='port'])" xlink:type="simple"/>
-                    <consumes endpoint="endpoint2"/>
-                    <provides endpoint="endpoint2"/>
+                <port x="67" y="39">
+                    <link xlink:href="../jbiServiceUnits/demoTestBPEL/TestBpel.wsdl#xpointer(/definitions/service[@name='TestBpelService']/port[@name='port'])" xlink:type="simple"/>
+                    <consumes endpoint="endpoint1"/>
+                    <provides endpoint="endpoint1"/>
                 </port>
             </ports>
         </binding-component-service-unit>
     </service-units>
     <connections>
-        <connection consumer="endpoint2" provider="endpoint1" state="unchanged"/>
+        <connection consumer="endpoint1" provider="endpoint2" state="unchanged"/>
     </connections>
     <porttypes>
-        <link xlink:href="../jbiServiceUnits/demoBpel/TestBpel.wsdl#xpointer(/definitions/portType[@name='TestBpel'])" xlink:type="simple"/>
+        <link xlink:href="../jbiServiceUnits/demoTestBPEL/TestBpel.wsdl#xpointer(/definitions/portType[@name='TestBpel'])" xlink:type="simple"/>
     </porttypes>
     <bindings>
-        <link xlink:href="../jbiServiceUnits/demoBpel/TestBpel.wsdl#xpointer(/definitions/binding[@name='Binding'])" xlink:type="simple"/>
+        <link xlink:href="../jbiServiceUnits/demoTestBPEL/TestBpel.wsdl#xpointer(/definitions/binding[@name='Binding'])" xlink:type="simple"/>
     </bindings>
     <services>
-        <link xlink:href="../jbiServiceUnits/demoBpel/TestBpel.wsdl#xpointer(/definitions/service[@name='TestBpelService'])" xlink:type="simple"/>
+        <link xlink:href="../jbiServiceUnits/demoTestBPEL/TestBpel.wsdl#xpointer(/definitions/service[@name='TestBpelService'])" xlink:type="simple"/>
     </services>
     <regions>
         <region name="WSDL Endpoints" width="150"/>
diff --git a/driver-tests/demo/demoTestBPEL/build.xml b/driver-tests/demo/demoTestBPEL/build.xml
new file mode 100644
index 000000000..5f35df21a
--- /dev/null
+++ b/driver-tests/demo/demoTestBPEL/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
+    <import file="nbproject/build-impl.xml"/>
+    <target name="init-esb-cli" unless="netbeans.home">
+        <property name="from.commandline" value="true"/>
+        <property name="netbeans.dir" value="${esb.netbeans.home}"/>
+        <property name="netbeans.user" value="${esb.netbeans.user}"/>
+        <property file="${basedir}/nbproject/private/private.properties"/>
+        <path id="path.classpath">
+            <pathelement location="${netbeans.dir}/soa/ant/nblib/org-netbeans-modules-bpel-project.jar"/>
+        </path>
+        <taskdef name="copy-path-properties" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliCopyPathFileTask">
+            <classpath refid="path.classpath"/>
+        </taskdef>
+        <copy-path-properties nbprojectDirectory="${basedir}/nbproject"/>
+        <property file="${basedir}/nbproject/path.properties"/>
+        <path id="ant.project.classpath">
+            <pathelement path="${netbeans.classpath}"/>
+        </path>
+    </target>
+    <target name="pre-init" depends="init-esb-cli"/>
+</project>
diff --git a/driver-tests/demo/demoTestBPEL/catalog.xml b/driver-tests/demo/demoTestBPEL/catalog.xml
new file mode 100644
index 000000000..1a17205ac
--- /dev/null
+++ b/driver-tests/demo/demoTestBPEL/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+    <nextCatalog catalog="nbproject/private/retriever/catalog.xml"/>
+</catalog>
diff --git a/nbbuild/antsrc/com/sun/caps/ant/taskdefs/SetProjectPrivate.java b/nbbuild/antsrc/com/sun/caps/ant/taskdefs/SetProjectPrivate.java
index a062e537c..daaca4bb1 100755
--- a/nbbuild/antsrc/com/sun/caps/ant/taskdefs/SetProjectPrivate.java
+++ b/nbbuild/antsrc/com/sun/caps/ant/taskdefs/SetProjectPrivate.java
@@ -64,7 +64,7 @@ public class SetProjectPrivate extends Ant {
     private String   rootDir;
     private boolean  reset = false;
     private boolean  clean = false;
-    private String[] caps_build_properties = { "caps.alaska.root",
+    /*private String[] caps_build_properties = { "caps.alaska.root",
                                                "caps.netbeans.home",
                                                "caps.netbeans.user",
                                                "caps.appserver.home",
@@ -72,6 +72,15 @@ public class SetProjectPrivate extends Ant {
                                                "j2ee.platform.classpath",
                                                "j2ee.platform.wsimport.classpath",
                                                "j2ee.platform.wsgen.classpath"
+    };*/
+	
+	private String[] caps_build_properties = { "enterprise.module.install.dir",
+                                               "ide.module.install.dir",
+											   "netbeans.user",
+                                               "j2ee.server.instance",
+                                               "java.module.install.dir",
+                                               "soa.module.install.dir",
+                                               "xml.module.install.dir"
     };
 
     public SetProjectPrivate () {
@@ -227,7 +236,7 @@ public class SetProjectPrivate extends Ant {
                addSystemProperty(caps_build_properties[i], p);
             }
 
-            addUserProperty(userprop, p);
+            //addUserProperty(userprop, p);
 
             out = new BufferedOutputStream(new FileOutputStream(file));
             p.store(out,"");
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 763d93427..997969069 100755
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -110,8 +110,8 @@
     </target>
 
    <target name="start-server-windows" depends="check-os" if="is-windows">
-        <echo>Starting server on Windows</echo>
         <property file="caps.build.properties"/>
+        <echo>Starting server on Windows at ${caps.appserver.home}</echo>
         <exec executable="cmd" spawn="true">
             <arg value="/c ${caps.appserver.home}/bin/asadmin start-domain domain1"/>
         </exec>
@@ -628,7 +628,8 @@
     </target>
 
     <target name="test-for-driver-test" depends="print-time, init, init-test, start-server">
-        <property file="${caps.build.properties}"/>
+        <!--<property file="${caps.build.properties}"/>-->
+		<property file="caps.build.properties"/>
         <for-each-driver-test logdir="${env.BUILD_OUTPUT_HOME}/drivertest/deploy" prefix="deploy" startdir=".." target="jbi-unit-test" locations="${caps.jbi.tests}" inheritAll="false"/>
     </target>
 
diff --git a/nbbuild/caps.build.properties b/nbbuild/caps.build.properties
index 00228771b..438097631 100755
--- a/nbbuild/caps.build.properties
+++ b/nbbuild/caps.build.properties
@@ -2,12 +2,20 @@
 #                      the target netbens installation, and 
 #                      the target app server installation 
 
-caps.alaska.root=@alaska_root@
-caps.appserver.home=@SRCROOT@/glassfish
-caps.jbi.home=@SRCROOT@/glassfish/jbi
-caps.netbeans.home=@SRCROOT@/nb_all/nbbuild/netbeans
-caps.netbeans.user=C:/Documents and Settings/vchellasamy/.netbeans/5.5
-caps.jbicomps.home=@jbicomps_home@
+caps.alaska.root=E:\\git-repos\\open-esb\\openesb-components
+caps.appserver.home=C:\\OpenESB-v2.3-b96\\glassfish
+caps.jbi.home=C:\\OpenESB-v2.3-b96\\glassfish\\jbi
+caps.netbeans.home=C:\\OpenESB-v2.3-b96\\netbeans
+caps.netbeans.user=C:\\OpenESB-v2.3-b96\\.netbeans\\openesb
+caps.jbicomps.home=E:\\git-repos\\open-esb\\openesb-components
 j2ee.platform.classpath=${caps.appserver.home}/lib/javaee.jar:${caps.appserver.home}/lib/jsf-impl.jar:${caps.appserver.home}/lib/activation.jar:${caps.appserver.home}/lib/appserv-tags.jar:${caps.appserver.home}/lib/mail.jar:${caps.appserver.home}/lib/appserv-jstl.jar:${caps.appserver.home}/lib/webservices-tools.jar:${caps.appserver.home}/lib/webservices-rt.jar
 j2ee.platform.wsimport.classpath=${caps.appserver.home}/lib/webservices-tools.jar:${caps.appserver.home}/lib/webservices-rt.jar:${caps.appserver.home}/lib/webservices.jar:${caps.appserver.home}/lib/tools.jar:${caps.appserver.home}/lib/appserv-jstl.jar:${caps.appserver.home}/lib/javaee.jar:${caps.appserver.home}/lib/appserv-ws.jar:${caps.appserver.home}/lib/mail.jar:${caps.appserver.home}/lib/activation.jar
 j2ee.platform.wsgen.classpath=${caps.appserver.home}/lib/webservices-tools.jar:${caps.appserver.home}/lib/webservices-rt.jar:${caps.appserver.home}/lib/tools.jar:${caps.appserver.home}/lib/appserv-jstl.jar:${caps.appserver.home}/lib/javaee.jar:${caps.appserver.home}/lib/appserv-ws.jar:${caps.appserver.home}/lib/mail.jar:${caps.appserver.home}/lib/activation.jar
+
+enterprise.module.install.dir=C:\\OpenESB-v2.3-b96\\netbeans\\enterprise\\modules
+ide.module.install.dir=C:\\OpenESB-v2.3-b96\\netbeans\\ide\\modules
+j2ee.server.instance=[C:\\OpenESB-v2.3-b96\\glassfish]deployer:Sun:AppServer::localhost:4848
+java.module.install.dir=C:\\OpenESB-v2.3-b96\\netbeans\\java\\modules
+netbeans.user=C:\\OpenESB-v2.3-b96\\.netbeans\\openesb
+soa.module.install.dir=C:\\OpenESB-v2.3-b96\\netbeans\\soa\\modules
+xml.module.install.dir=C:\\OpenESB-v2.3-b96\\netbeans\\soa\\modules
diff --git a/nbbuild/caps.jbi.tests b/nbbuild/caps.jbi.tests
index 71c9ade4d..1f7113acb 100755
--- a/nbbuild/caps.jbi.tests
+++ b/nbbuild/caps.jbi.tests
@@ -5,135 +5,4 @@
 
 caps.jbi.tests=\
   driver-tests/demo/demoJbi, \
-  driver-tests/bpelse/assign/AssignJbi, \
-  driver-tests/bpelse/assign/DataTypeApp, \
-  driver-tests/bpelse/assign/predicatesJBI, \
-  driver-tests/bpelse/assign/AssignNamespacesJBI,\
-  driver-tests/bpelse/assign/CopyByValue/CopyByValueJbi, \
-  driver-tests/bpelse/assign/ActivateBilling_Simple_CA,\
-  driver-tests/bpelse/assign/AssignSelectionFailureJBI,\
-  driver-tests/bpelse/assign/VariablePropertyTest/conditionProjJBI,\
-  driver-tests/bpelse/assign/VariablePropertyTest/FromToPropertySpecJBI,\
-  driver-tests/bpelse/assign/VariablePropertyTest/VariablePropertyJBI,\
-  driver-tests/bpelse/assign/VariablePropertyTest/BooleanCopyJBI,\
-  driver-tests/bpelse/assign/VariablePropertyTest/QualifiedQueryJBI,\
-  driver-tests/bpelse/benchamark/BenchmarkJbi, \
-  driver-tests/bpelse/faulthandling/FaultHandlingJbi, \
-  driver-tests/bpelse/faulthandling/StandardFaultsJbi, \
-  driver-tests/bpelse/faulthandling/SystemFaultsJbi, \
-  driver-tests/bpelse/ScopeTermination/ScopeTerminationJbi, \
-  driver-tests/bpelse/TerminationHandler/TerminationHandlerJbi, \
-  driver-tests/bpelse/compensation/NestedScopeJBI, \
-  driver-tests/bpelse/compensation/IterativeScopesJBI, \
-  driver-tests/bpelse/exit/ExitJbi, \
-  driver-tests/bpelse/foreach-bpel20/ForEachJbi, \
-  driver-tests/bpelse/eventHandlers/onEventJBI, \
-  driver-tests/bpelse/eventHandlers/onAlarmJbi, \
-  driver-tests/bpelse/xsddatatypes/XSDDataTypesJbi, \
-  driver-tests/bpelse/while/WhileJbi, \
-  driver-tests/bpelse/empty/EmptyJbi,\
-  driver-tests/bpelse/correlation/correlationJBI,\
-  driver-tests/bpelse/correlation/CorrelationOnePropJBI,\
-  driver-tests/bpelse/correlation/CorrelationTwoPropJBI,\
-  driver-tests/bpelse/correlation/FlowAsStartActivityJBI,\
-  driver-tests/bpelse/correlation/MatchingInstanceTwoCorrJBI,\
-  driver-tests/bpelse/correlation/ThreeCorrSetsJbi,\
-  driver-tests/bpelse/flow/FlowJbi, \
-  driver-tests/bpelse/if/ifJbi, \
-  driver-tests/bpelse/wait/WaitForJbi, \
-  driver-tests/bpelse/repeatuntil/RepeatuntilJbi, \
-  driver-tests/bpelse/xpathfunctions/XPathFunctionsJbi, \
-  driver-tests/bpelse/xpathfunctions/XSDFunctionsJBI,\
-  driver-tests/bpelse/MessageExchange/MessageExchangeJbi, \
-  driver-tests/bpelse/misc/MiscJbi, \
-  driver-tests/bpelse/pick/PickJbi, \
-  driver-tests/bpelse/samples/samplesJBI, \
-  driver-tests/bpelse/samples/SampleProjectsMultiDepJBI, \
-  driver-tests/bpelse/blueprints/bp1/BluePrint1Application, \
-  driver-tests/bpelse/blueprints/bp2/BluePrint2Application, \
-  driver-tests/bpelse/blueprints/bp3/BluePrint3Application, \
-  driver-tests/bpelse/blueprints/bp4/BluePrint4Application, \
-  driver-tests/bpelse/blueprints/bp5/BluePrint5Application, \
-  driver-tests/bpelse/implementMultiOperations/MultipleBPELsJBI,\
-  driver-tests/bpelse/implementMultiOperations/OneBPELJBI,\
-  driver-tests/bpelse/SchemaElemDecl/BPwithNestedElemQualCompApp,\
-  driver-tests/bpelse/SchemaElemDecl/BPwithNestedElemCompApp,\
-  driver-tests/bpelse/SchemaElemDecl/BPwithMsgElemQualCompApp,\
-  driver-tests/bpelse/SchemaElemDecl/BPwithMsgElemCompApp,\
-  driver-tests/bpelse/SchemaElemDecl/BPwithElemRefCompApp,\
-  driver-tests/bpelse/JavaEEIntegration/DirectElem/DirectElemJBI,\
-  driver-tests/bpelse/JavaEEIntegration/InOnlyMultipleBPJava/InOnlyBPJavaEEJBI,\
-  driver-tests/bpelse/JavaEEIntegration/JavaEEToBP/FaultTest/caGreetService, \
-  driver-tests/bpelse/JavaEEIntegration/TwoWayEjbToBP/TwoWayJBI, \
-  driver-tests/bpelse/JavaEEIntegration/JavaEEToBP/ProdMngmntSamples/CreditApplicationProcessorApplication, \
-  driver-tests/bpelse/xslt/InOutBPXSLT/InOutCompAppProj,\
-  driver-tests/bpelse/PartnerLinks/OneBPJBI,\
-  driver-tests/bpelse/PartnerLinks/TwoBPsJBI,\
-  driver-tests/bpelse/PartnerLinks/PLTLocalNamespaceJBI,\
-  driver-tests/bpelse/dynamicpartnerlink/SyncSampleEPRLiteralJBI,\
-  driver-tests/bpelse/dynamicpartnerlink/SyncSampleEPRAssignJBI,\
-  driver-tests/bpelse/dynamicpartnerlink/sendCallBackInfoJBI,\
-  driver-tests/bpelse/systemicqualities/Redelivery/RedirectOnFailureJBI,\
-  driver-tests/recovery/CorrelationSampleJBI,\
-  driver-tests/httpsoapbc/HttpSoapBCTests/HttpSoapBCJbi, \
-  driver-tests/httpsoapbc/xslt/HelloJbi, \
-  driver-tests/httpsoapbc/i18n/HttpSoapBCJbi, \
-  driver-tests/httpsoapbc/siebel/siebelAccountCompositeApp, \
-  driver-tests/httpsoapbc/siebel/siebelAccountUpdateCompositeApp, \
-  driver-tests/httpsoapbc/siebel/siebelAccountDeleteCompositeApp, \
-  driver-tests/httpsoapbc/siebel/siebelAccountInsertCompositeApp, \
-  driver-tests/httpsoapbc/siebel/siebelContactQueryCompositeApp, \
-  driver-tests/httpsoapbc/siebel/siebelContactUpdateCompositeApp, \
-  driver-tests/httpsoapbc/CustomerScenarios/GM/ProcessLoanApp, \
-  driver-tests/httpsoapbc/urlrewriting/URLRewritingJbi, \
-  driver-tests/smtpbc/SMTPBCTests/INOUTTestJBI, \
-  driver-tests/smtpbc/SMTPBCTests/OneWayTestJBI, \
-  driver-tests/smtpbc/SMTPBCTests/SMTPEncTestJBI, \
-  driver-tests/smtpbc/SMTPBCTests/ccBccmailJbi, \
-  driver-tests/smtpbc/SMTPBCTests/contentNosubjectJbi, \
-  driver-tests/smtpbc/SMTPBCTests/SMTPJavaEESEOutboundJbi, \
-  driver-tests/smtpbc/SMTPBCTests/SMTPInboundEJBJbi2, \
-  driver-tests/jmsbc/JMSBCTests/JMSBCJbi, \
-  driver-tests/jmsbc/JMSBCTests/JMSBCXAXsltJbi, \
-  driver-tests/jmsbc/JMSBCTests/JMSBCjavaeeSETestJbi, \
-  driver-tests/filebc/FileBCTests/FileBCJbi, \
-  driver-tests/ftpbc/FTPBCTests/DownloaderCompApp, \
-  driver-tests/ftpbc/FTPBCTests/Download_Keep_Remote_Name_CompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDuke_EBCDIC_2_UTF8_CompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeEncoderMsgTypeCompApp, \
-  driver-tests/ftpbc/FTPBCTests/OnDemandGetCompApp, \
-  driver-tests/ftpbc/FTPBCTests/OnDemandReceiveCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeEncoderMsgTypeCompApp, \
-  driver-tests/ftpbc/FTPBCTests/DownloaderUsingTransferCompApp, \
-  driver-tests/ftpbc/FTPBCTests/GreeterGreeteeCompApp, \
-  driver-tests/ftpbc/FTPBCTests/GreeterGreeteeUseTransCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeCompApplication, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeNonCorrelateCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeWithComplexInOutCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeUsingEncoderCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeUsingTransferNonCorrelateCompApp, \
-  driver-tests/ftpbc/FTPBCTests/StockQuoteCompApp, \
-  driver-tests/ftpbc/FTPBCTests/UploaderCompApp, \
-  driver-tests/ftpbc/FTPBCTests/UploaderUsingTransferCompApp, \
-  driver-tests/ftpbc/FTPBCTests/UpXSLT_DownXSLT_CompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeEncoderMsgTypeCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeXSDMsgTypeCompApp, \
-  driver-tests/ftpbc/FTPBCTests/HelloDukeXSDTransTypeCompApp, \
-  driver-tests/mqbc/MQBCTests/MQBCJbi, \
-  driver-tests/jdbcbc/Derby/InsertJbi, \
-  driver-tests/jdbcbc/Derby/UpdateJbi, \
-  driver-tests/jdbcbc/Derby/DeleteJbi, \
-  driver-tests/iepse/tests/jbi, \
-  driver-tests/iepse/usecases/RfidTheftDetection/jbi, \
-  driver-tests/iepse/usecases/IEP-EJBInterOp/Iep-EjbInterOpCompositeApp, \
-  driver-tests/xsltse/requestReply/RequestReplyXsltJbi, \
-  driver-tests/xsltse/filterRequestReply/FilterReplyXsltJbi, \
-  driver-tests/xsltse/filterOneWay/FilterOneWayXsltJbi, \
-  driver-tests/encoder/EncoderTests/TestCustomEncoderApp, \
-  driver-tests/encoder/EncoderTests/TestHL7EncoderApp, \
-  driver-tests/preservecomment/httpBCbpelSE, \
-  driver-tests/sapbc/SAPBCTests/SAPBCJbi,
-
-#  driver-tests/mqbc/MQBCTests/CaMqInOutJ2eeSe, \
-#  driver-tests/httpsoapbc/i18n/I18nJbi, \
-
+  driver-tests/bpelse/assign/AssignJbi