From 7c67407908a4a8431b4b910a2e3a5dd86295eea3 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 23 Dec 2015 17:28:37 +0300
Subject: [PATCH] Attempt to build BPEL monitor console using Maven (sadly its
 code is not finished)...

---
 .../bpelmonitor-console/pom.xml               |  74 ++
 .../java/bpelmonitor/ApplicationBean1.java    |   0
 .../src/main}/java/bpelmonitor/BPList.java    |   5 +-
 .../main}/java/bpelmonitor/BpelMonitor.java   |   0
 .../src/main}/java/bpelmonitor/Dashboard.java |   1 +
 .../src/main}/java/bpelmonitor/Instances.java |   0
 .../main}/java/bpelmonitor/InstancesList.java |   1 +
 .../java/bpelmonitor/LeftNavigation.java      |   0
 .../java/bpelmonitor/ProcessMonitor.java      |   0
 .../main}/java/bpelmonitor/RequestBean1.java  |   0
 .../main}/java/bpelmonitor/SessionBean1.java  |  14 +-
 .../src/main}/java/bpelmonitor/TopFrame.java  |   0
 .../bpelmonitor/jbiruntime/BPELSERuntime.java |   0
 .../bpelmonitor/jbiruntime/JBIRuntime.java    |   0
 .../bpelmonitor/model/DashboardEntry.java     |   0
 .../bpelmonitor/model/InstanceFilter.java     |   0
 .../bpelmonitor/model/InstanceVariable.java   |   0
 .../bpelmonitor/model/ProcessInstance.java    |   0
 .../bpelmonitor/model/ServiceAssembly.java    |   0
 .../java/bpelmonitor/model/ServiceUnit.java   |   0
 .../src/main}/java/bpelmonitor/svg/SVG.java   |   0
 .../main}/java/bpelmonitor/util/Utility.java  |   0
 .../src/main}/resources/icons/INVOKE.png      | Bin
 .../src/main}/resources/icons/RECEIVE.png     | Bin
 .../src/main}/resources/icons/arrow-ff.gif    | Bin
 .../src/main}/resources/icons/arrow-first.gif | Bin
 .../src/main}/resources/icons/arrow-fr.gif    | Bin
 .../src/main}/resources/icons/arrow-last.gif  | Bin
 .../src/main}/resources/icons/arrow-next.gif  | Bin
 .../main}/resources/icons/arrow-previous.gif  | Bin
 .../src/main}/resources/icons/assign.png      | Bin
 .../src/main}/resources/icons/compensate.png  | Bin
 .../main}/resources/icons/compensatescope.png | Bin
 .../src/main}/resources/icons/elseif.png      | Bin
 .../src/main}/resources/icons/exit.png        | Bin
 .../src/main}/resources/icons/flow_end.png    | Bin
 .../src/main}/resources/icons/flow_start.png  | Bin
 .../src/main}/resources/icons/foreach_end.png | Bin
 .../main}/resources/icons/foreach_start.png   | Bin
 .../src/main}/resources/icons/if_end.png      | Bin
 .../src/main}/resources/icons/if_start.png    | Bin
 .../src/main}/resources/icons/invoke_1.png    | Bin
 .../src/main}/resources/icons/onalarm.png     | Bin
 .../src/main}/resources/icons/onevent.png     | Bin
 .../src/main}/resources/icons/onmessage.png   | Bin
 .../src/main}/resources/icons/pick_end.png    | Bin
 .../src/main}/resources/icons/pick_start.png  | Bin
 .../src/main}/resources/icons/process_end.png | Bin
 .../main}/resources/icons/process_start.png   | Bin
 .../src/main}/resources/icons/receive_1.png   | Bin
 .../main}/resources/icons/repeatuntil_end.png | Bin
 .../resources/icons/repeatuntil_start.png     | Bin
 .../src/main}/resources/icons/reply.png       | Bin
 .../src/main}/resources/icons/rethrow.png     | Bin
 .../src/main}/resources/icons/scope_end.png   | Bin
 .../src/main}/resources/icons/scope_start.png | Bin
 .../icons/scopecompensationhandler.png        | Bin
 .../resources/icons/scopeeventhandler.png     | Bin
 .../resources/icons/scopefaulthandler.png     | Bin
 .../icons/scopeterminationhandler.png         | Bin
 .../src/main}/resources/icons/throw.png       | Bin
 .../src/main}/resources/icons/wait.png        | Bin
 .../src/main}/resources/icons/while_end.png   | Bin
 .../src/main}/resources/icons/while_start.png | Bin
 .../src/main}/resources/stylesheet.css        |   0
 .../resources/svg/AsynchronousSample.svg      |   0
 .../svg/TravelReservationService.svg          |   0
 .../src/main/webapp}/BpelMonitor.jsp          |   0
 .../src/main/webapp}/Instances.jsp            |   0
 .../src/main/webapp}/LeftNavigation.jspf      |   0
 .../src/main/webapp}/ProcessMonitor.jsp       |   0
 .../src/main/webapp}/TopFrame.jspf            |   0
 .../src/main/webapp}/WEB-INF/faces-config.xml |   0
 .../src/main/webapp}/WEB-INF/sun-web.xml      |   0
 .../src/main/webapp}/WEB-INF/web.xml          |   0
 .../bpelmonitortool/monitor-console/build.xml |  71 --
 .../monitor-console/nbproject/ant-deploy.xml  |  60 --
 .../monitor-console/nbproject/build-impl.xml  | 821 ------------------
 .../nbproject/faces-config.NavData            |  25 -
 .../nbproject/genfiles.properties             |   8 -
 .../nbproject/project.properties              |  80 --
 .../monitor-console/nbproject/project.xml     |  48 -
 .../monitor-console/setup/sun-resources.xml   |  14 -
 .../monitor-console/src/conf/MANIFEST.MF      |   2 -
 84 files changed, 86 insertions(+), 1138 deletions(-)
 create mode 100644 ojc-core/bpelmonitortool/bpelmonitor-console/pom.xml
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/ApplicationBean1.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/BPList.java (96%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/BpelMonitor.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/Dashboard.java (99%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/Instances.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/InstancesList.java (94%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/LeftNavigation.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/ProcessMonitor.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/RequestBean1.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/SessionBean1.java (93%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/TopFrame.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/jbiruntime/BPELSERuntime.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/jbiruntime/JBIRuntime.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/DashboardEntry.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/InstanceFilter.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/InstanceVariable.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/ProcessInstance.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/ServiceAssembly.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/model/ServiceUnit.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/svg/SVG.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/src => bpelmonitor-console/src/main}/java/bpelmonitor/util/Utility.java (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/INVOKE.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/RECEIVE.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-ff.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-first.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-fr.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-last.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-next.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/arrow-previous.gif (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/assign.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/compensate.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/compensatescope.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/elseif.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/exit.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/flow_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/flow_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/foreach_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/foreach_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/if_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/if_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/invoke_1.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/onalarm.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/onevent.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/onmessage.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/pick_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/pick_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/process_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/process_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/receive_1.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/repeatuntil_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/repeatuntil_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/reply.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/rethrow.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scope_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scope_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scopecompensationhandler.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scopeeventhandler.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scopefaulthandler.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/scopeterminationhandler.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/throw.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/wait.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/while_end.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/icons/while_start.png (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/stylesheet.css (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/svg/AsynchronousSample.svg (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main}/resources/svg/TravelReservationService.svg (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/BpelMonitor.jsp (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/Instances.jsp (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/LeftNavigation.jspf (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/ProcessMonitor.jsp (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/TopFrame.jspf (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/WEB-INF/faces-config.xml (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/WEB-INF/sun-web.xml (100%)
 mode change 100755 => 100644
 rename ojc-core/bpelmonitortool/{monitor-console/web => bpelmonitor-console/src/main/webapp}/WEB-INF/web.xml (100%)
 mode change 100755 => 100644
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/build.xml
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/ant-deploy.xml
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/build-impl.xml
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/faces-config.NavData
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/genfiles.properties
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/project.properties
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/nbproject/project.xml
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/setup/sun-resources.xml
 delete mode 100755 ojc-core/bpelmonitortool/monitor-console/src/conf/MANIFEST.MF

diff --git a/ojc-core/bpelmonitortool/bpelmonitor-console/pom.xml b/ojc-core/bpelmonitortool/bpelmonitor-console/pom.xml
new file mode 100644
index 000000000..8b6279c65
--- /dev/null
+++ b/ojc-core/bpelmonitortool/bpelmonitor-console/pom.xml
@@ -0,0 +1,74 @@
+<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>
+  <groupId>open-jbi-components</groupId>
+  <artifactId>bpelmonitor-console</artifactId>
+  <packaging>war</packaging>
+  <version>3.0.6-SNAPSHOT</version>
+  <name>bpelmonitor-console</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+       <groupId>com.sun.faces</groupId>
+       <artifactId>jsf-api</artifactId>
+       <version>2.2.12</version>
+    </dependency>
+    <dependency>
+       <groupId>com.sun.faces</groupId>
+       <artifactId>jsf-impl</artifactId>
+       <version>2.2.12</version>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.rave.web.ui</groupId>
+        <artifactId>appbase</artifactId>
+        <version>1.0</version>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.jsfcl</groupId>
+        <artifactId>jsfcl</artifactId>
+        <version>1.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.icefaces</groupId>
+        <artifactId>icefaces</artifactId>
+        <version>1.8.2</version>
+    </dependency>
+    <dependency>
+        <groupId>org.icefaces</groupId>
+        <artifactId>icefaces-comps</artifactId>
+        <version>1.8.2</version>
+    </dependency>
+    <dependency>
+        <groupId>org.icefaces.jsf12</groupId>
+        <artifactId>icefaces-bm</artifactId>
+        <version>1.8.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.glassfish.admingui</groupId>
+        <artifactId>dataprovider</artifactId>
+        <version>3.0</version>
+    </dependency>
+    <dependency>
+        <groupId>open-esb</groupId>
+        <artifactId>jbi-admin-common</artifactId>
+        <version>1.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <finalName>bpelmonitor-console</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/ApplicationBean1.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/ApplicationBean1.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/ApplicationBean1.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/ApplicationBean1.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/BPList.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/BPList.java
old mode 100755
new mode 100644
similarity index 96%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/BPList.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/BPList.java
index 36722a569..8dd255c96
--- a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/BPList.java
+++ b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/BPList.java
@@ -6,9 +6,10 @@ package bpelmonitor;
 
 import bpelmonitor.jbiruntime.BPELSERuntime;
 import bpelmonitor.jbiruntime.JBIRuntime;
-import bpelmonitor.jbiruntime.ServiceAssembly;
-import bpelmonitor.jbiruntime.ServiceUnit;
 import com.icesoft.faces.component.tree.IceUserObject;
+import bpelmonitor.model.ServiceAssembly;
+import bpelmonitor.model.ServiceUnit;
+import bpelmonitor.model.DashboardEntry;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/BpelMonitor.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/BpelMonitor.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/BpelMonitor.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/BpelMonitor.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/Dashboard.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/Dashboard.java
old mode 100755
new mode 100644
similarity index 99%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/Dashboard.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/Dashboard.java
index f4b50b1a4..c37059051
--- a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/Dashboard.java
+++ b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/Dashboard.java
@@ -5,6 +5,7 @@
 package bpelmonitor;
 
 import bpelmonitor.jbiruntime.BPELSERuntime;
+import bpelmonitor.model.DashboardEntry;
 import com.icesoft.faces.component.ext.RowSelectorEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/Instances.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/Instances.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/Instances.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/Instances.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/InstancesList.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/InstancesList.java
old mode 100755
new mode 100644
similarity index 94%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/InstancesList.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/InstancesList.java
index 583dfc8c2..8cf8c0809
--- a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/InstancesList.java
+++ b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/InstancesList.java
@@ -5,6 +5,7 @@
 package bpelmonitor;
 
 import java.util.ArrayList;
+import bpelmonitor.model.ProcessInstance;
 
 /**
  *
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/LeftNavigation.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/LeftNavigation.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/LeftNavigation.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/LeftNavigation.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/ProcessMonitor.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/ProcessMonitor.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/ProcessMonitor.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/ProcessMonitor.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/RequestBean1.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/RequestBean1.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/RequestBean1.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/RequestBean1.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/SessionBean1.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/SessionBean1.java
old mode 100755
new mode 100644
similarity index 93%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/SessionBean1.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/SessionBean1.java
index eb3845630..1e1e51bac
--- a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/SessionBean1.java
+++ b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/SessionBean1.java
@@ -9,7 +9,7 @@ package bpelmonitor;
 import bpelmonitor.model.DashboardEntry;
 import bpelmonitor.model.InstanceFilter;
 import com.sun.rave.web.ui.appbase.AbstractSessionBean;
-import com.sun.sql.rowset.CachedRowSetXImpl;
+import com.sun.rowset.CachedRowSetImpl;
 import java.util.ArrayList;
 import javax.faces.FacesException;
 import javax.swing.tree.DefaultTreeModel;
@@ -47,22 +47,22 @@ public class SessionBean1 extends AbstractSessionBean {
         monitorbpelvariableRowSet.setCommand("SELECT ALL USR2.MONITORBPELVARIABLE.INSTANCEID, USR2.MONITORBPELVARIABLE.SCOPEID, USR2.MONITORBPELVARIABLE.VARID, USR2.MONITORBPELVARIABLE.VARNAME, USR2.MONITORBPELVARIABLE.ISFAULT, USR2.MONITORBPELVARIABLE.VARVALUE  FROM USR2.MONITORBPELVARIABLE WHERE USR2.MONITORBPELVARIABLE.INSTANCEID = ?");
         monitorbpelvariableRowSet.setTableName("MONITORBPELVARIABLE");
     }
-    private CachedRowSetXImpl monitorbpelinstanceRowSet = new CachedRowSetXImpl();
+    private CachedRowSetImpl monitorbpelinstanceRowSet = new CachedRowSetImpl();
 
-    public CachedRowSetXImpl getMonitorbpelinstanceRowSet() {
+    public CachedRowSetImpl getMonitorbpelinstanceRowSet() {
         return monitorbpelinstanceRowSet;
     }
 
-    public void setMonitorbpelinstanceRowSet(CachedRowSetXImpl crsxi) {
+    public void setMonitorbpelinstanceRowSet(CachedRowSetImpl crsxi) {
         this.monitorbpelinstanceRowSet = crsxi;
     }
-    private CachedRowSetXImpl monitorbpelvariableRowSet = new CachedRowSetXImpl();
+    private CachedRowSetImpl monitorbpelvariableRowSet = new CachedRowSetImpl();
 
-    public CachedRowSetXImpl getMonitorbpelvariableRowSet() {
+    public CachedRowSetImpl getMonitorbpelvariableRowSet() {
         return monitorbpelvariableRowSet;
     }
 
-    public void setMonitorbpelvariableRowSet(CachedRowSetXImpl crsxi) {
+    public void setMonitorbpelvariableRowSet(CachedRowSetImpl crsxi) {
         this.monitorbpelvariableRowSet = crsxi;
     }
     // </editor-fold>
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/TopFrame.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/TopFrame.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/TopFrame.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/TopFrame.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/jbiruntime/BPELSERuntime.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/jbiruntime/BPELSERuntime.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/jbiruntime/BPELSERuntime.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/jbiruntime/BPELSERuntime.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/jbiruntime/JBIRuntime.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/jbiruntime/JBIRuntime.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/jbiruntime/JBIRuntime.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/jbiruntime/JBIRuntime.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/DashboardEntry.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/DashboardEntry.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/DashboardEntry.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/DashboardEntry.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/InstanceFilter.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/InstanceFilter.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/InstanceFilter.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/InstanceFilter.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/InstanceVariable.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/InstanceVariable.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/InstanceVariable.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/InstanceVariable.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ProcessInstance.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ProcessInstance.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ProcessInstance.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ProcessInstance.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ServiceAssembly.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ServiceAssembly.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ServiceAssembly.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ServiceAssembly.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ServiceUnit.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ServiceUnit.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/model/ServiceUnit.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/model/ServiceUnit.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/svg/SVG.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/svg/SVG.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/svg/SVG.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/svg/SVG.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/util/Utility.java b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/util/Utility.java
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/src/java/bpelmonitor/util/Utility.java
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/java/bpelmonitor/util/Utility.java
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/INVOKE.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/INVOKE.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/INVOKE.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/INVOKE.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/RECEIVE.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/RECEIVE.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/RECEIVE.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/RECEIVE.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-ff.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-ff.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-ff.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-ff.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-first.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-first.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-first.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-first.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-fr.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-fr.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-fr.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-fr.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-last.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-last.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-last.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-last.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-next.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-next.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-next.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-next.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-previous.gif b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-previous.gif
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/arrow-previous.gif
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/arrow-previous.gif
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/assign.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/assign.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/assign.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/assign.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/compensate.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/compensate.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/compensate.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/compensate.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/compensatescope.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/compensatescope.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/compensatescope.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/compensatescope.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/elseif.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/elseif.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/elseif.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/elseif.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/exit.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/exit.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/exit.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/exit.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/flow_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/flow_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/flow_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/flow_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/flow_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/flow_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/flow_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/flow_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/foreach_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/foreach_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/foreach_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/foreach_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/foreach_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/foreach_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/foreach_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/foreach_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/if_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/if_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/if_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/if_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/if_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/if_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/if_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/if_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/invoke_1.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/invoke_1.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/invoke_1.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/invoke_1.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onalarm.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onalarm.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onalarm.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onalarm.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onevent.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onevent.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onevent.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onevent.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onmessage.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onmessage.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/onmessage.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/onmessage.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/pick_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/pick_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/pick_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/pick_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/pick_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/pick_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/pick_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/pick_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/process_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/process_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/process_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/process_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/process_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/process_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/process_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/process_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/receive_1.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/receive_1.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/receive_1.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/receive_1.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/repeatuntil_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/repeatuntil_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/repeatuntil_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/repeatuntil_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/repeatuntil_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/repeatuntil_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/repeatuntil_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/repeatuntil_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/reply.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/reply.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/reply.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/reply.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/rethrow.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/rethrow.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/rethrow.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/rethrow.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scope_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scope_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scope_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scope_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scope_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scope_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scope_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scope_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopecompensationhandler.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopecompensationhandler.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopecompensationhandler.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopecompensationhandler.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopeeventhandler.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopeeventhandler.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopeeventhandler.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopeeventhandler.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopefaulthandler.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopefaulthandler.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopefaulthandler.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopefaulthandler.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopeterminationhandler.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopeterminationhandler.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/scopeterminationhandler.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/scopeterminationhandler.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/throw.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/throw.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/throw.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/throw.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/wait.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/wait.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/wait.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/wait.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/while_end.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/while_end.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/while_end.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/while_end.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/icons/while_start.png b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/while_start.png
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/icons/while_start.png
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/icons/while_start.png
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/stylesheet.css b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/stylesheet.css
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/stylesheet.css
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/svg/AsynchronousSample.svg b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/svg/AsynchronousSample.svg
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/svg/AsynchronousSample.svg
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/svg/AsynchronousSample.svg
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/resources/svg/TravelReservationService.svg b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/svg/TravelReservationService.svg
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/resources/svg/TravelReservationService.svg
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/resources/svg/TravelReservationService.svg
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/BpelMonitor.jsp b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/BpelMonitor.jsp
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/BpelMonitor.jsp
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/BpelMonitor.jsp
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/Instances.jsp b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/Instances.jsp
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/Instances.jsp
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/Instances.jsp
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/LeftNavigation.jspf b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/LeftNavigation.jspf
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/LeftNavigation.jspf
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/LeftNavigation.jspf
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/ProcessMonitor.jsp b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/ProcessMonitor.jsp
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/ProcessMonitor.jsp
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/ProcessMonitor.jsp
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/TopFrame.jspf b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/TopFrame.jspf
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/TopFrame.jspf
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/TopFrame.jspf
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/faces-config.xml b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/faces-config.xml
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/faces-config.xml
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/sun-web.xml b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/sun-web.xml
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/sun-web.xml
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/sun-web.xml
diff --git a/ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/web.xml b/ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/web.xml
old mode 100755
new mode 100644
similarity index 100%
rename from ojc-core/bpelmonitortool/monitor-console/web/WEB-INF/web.xml
rename to ojc-core/bpelmonitortool/bpelmonitor-console/src/main/webapp/WEB-INF/web.xml
diff --git a/ojc-core/bpelmonitortool/monitor-console/build.xml b/ojc-core/bpelmonitortool/monitor-console/build.xml
deleted file mode 100755
index 06eed4925..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="monitor-console" default="default" basedir=".">
-    <description>Builds, tests, and runs the project monitor-console.</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-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-dist:                 called before archive building 
-      -post-dist:                called after archive building 
-      -post-clean:               called after cleaning build products 
-      -pre-run-deploy:           called before deploying
-      -post-run-deploy:          called after deploying
-
-    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-junit:   defines macro for junit execution
-      init-macrodef-debug:    defines macro for class debugging
-      do-dist:                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. 
-
-    -->
-</project>
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/ant-deploy.xml b/ojc-core/bpelmonitortool/monitor-console/nbproject/ant-deploy.xml
deleted file mode 100755
index 28ca9b4f5..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="-deploy-ant" basedir=".">
-    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <property file="${deploy.ant.properties.file}" />
-        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
-        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
-        <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
-    </target>
-    
-    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
-        <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
-        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
-        <!-- The doctype triggers resolution which can fail -->
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-        </replace>
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
-            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
-        </replace>
-        <xmlproperty file="${temp.sun.web}" validate="false">
-        </xmlproperty>    
-        <delete file="${temp.sun.web}"/>
-        <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
-    </target>
-    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
-        <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
-        <mkdir dir="${sjsas.resources.dir}"/>
-        <mkdir dir="${sjsas.resources.dir}/META-INF"/>
-        <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
-        <copy todir="${sjsas.resources.dir}/META-INF">
-            <fileset dir="${deploy.ant.resource.dir}"/>
-        </copy>
-        <jar destfile="${deploy.ant.archive}" update="true">
-            <fileset dir="${sjsas.resources.dir}"/>
-        </jar>
-        <delete dir="${sjsas.resources.dir}"/>
-    </target>
-    <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
-        <echo message="Deploying ${deploy.ant.archive}"/>
-        <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
-                 classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
-        <sun-appserv-deploy user="${sjsas.username}"
-                passwordfile="${sjsas.password.file}"
-                host="${sjsas.host}" port="${sjsas.port}"
-                file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
-        <delete file="${sjsas.password.file}"/>
-    </target>
-    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
-                 classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
-        <sun-appserv-undeploy user="${sjsas.username}"
-                passwordfile="${sjsas.password.file}"
-                host="${sjsas.host}" port="${sjsas.port}"
-                file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
-        <delete file="${sjsas.password.file}"/>
-    </target>
-</project>
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/build-impl.xml b/ojc-core/bpelmonitortool/monitor-console/nbproject/build-impl.xml
deleted file mode 100755
index f5f59cfb5..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/build-impl.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<?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
-        - javadoc
-        - junit compilation
-        - junit execution
-        - junit debugging
-        - cleanup
-
-        -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="monitor-console-impl">
-    <import file="ant-deploy.xml"/>
-    <target depends="dist,javadoc" description="Build whole project." name="default"/>
-    <!--
-                INITIALIZATION SECTION
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- 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"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <isfalse value="${javadoc.preview}"/>
-        </condition>
-        <property name="javac.compilerargs" value=""/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <condition property="no.dist.ear.dir">
-            <not>
-                <isset property="dist.ear.dir"/>
-            </not>
-        </condition>
-        <property name="build.web.excludes" value="${build.classes.excludes}"/>
-        <condition property="do.compile.jsps">
-            <istrue value="${compile.jsps}"/>
-        </condition>
-        <condition property="do.debug.server">
-            <or>
-                <not>
-                    <isset property="debug.server"/>
-                </not>
-                <istrue value="${debug.server}"/>
-                <and>
-                    <not>
-                        <istrue value="${debug.server}"/>
-                    </not>
-                    <not>
-                        <istrue value="${debug.client}"/>
-                    </not>
-                </and>
-            </or>
-        </condition>
-        <condition property="do.debug.client">
-            <istrue value="${debug.client}"/>
-        </condition>
-        <condition property="do.display.browser">
-            <istrue value="${display.browser}"/>
-        </condition>
-        <condition property="do.display.browser.debug">
-            <and>
-                <isset property="do.display.browser"/>
-                <not>
-                    <isset property="do.debug.client"/>
-                </not>
-            </and>
-        </condition>
-        <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
-        <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="do.war.package.with.custom.manifest">
-            <isset property="has.custom.manifest"/>
-        </condition>
-        <condition property="do.war.package.without.custom.manifest">
-            <not>
-                <isset property="has.custom.manifest"/>
-            </not>
-        </condition>
-        <condition property="do.tmp.war.package.with.custom.manifest">
-            <and>
-                <isset property="has.custom.manifest"/>
-                <isfalse value="${directory.deployment.supported}"/>
-            </and>
-        </condition>
-        <condition property="do.tmp.war.package.without.custom.manifest">
-            <and>
-                <not>
-                    <isset property="has.custom.manifest"/>
-                </not>
-                <isfalse value="${directory.deployment.supported}"/>
-            </and>
-        </condition>
-        <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
-        <condition else="" property="application.args.param" value="${application.args}">
-            <and>
-                <isset property="application.args"/>
-                <not>
-                    <equals arg1="${application.args}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-        <property name="runmain.jvmargs" value=""/>
-    </target>
-    <target depends="init" name="-init-cos" unless="deploy.on.save">
-        <condition property="deploy.on.save" value="true">
-            <istrue value="${j2ee.deploy.on.save}"/>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="build.web.dir">Must set build.web.dir</fail>
-        <fail unless="build.generated.dir">Must set build.generated.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.war">Must set dist.war</fail>
-        <fail unless="j2ee.platform.classpath">
-The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
-Either open the project in the IDE and assign the server or setup the server classpath manually.
-For example like this:
-   ant -Duser.properties.file=&lt;path_to_property_file&gt; (where you put the property "j2ee.platform.classpath" in a .properties file)
-or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties file is used)
-                </fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${runmain.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" fork="true">
-                    <jvmarg line="${runmain.jvmargs}"/>
-                    <classpath>
-                        <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjsdebug">
-        <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute default="${client.url}" name="webUrl"/>
-            <sequential>
-                <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
-            <sequential>
-                <nbjpdaappreloaded/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
-            <attribute default="${application.args.param}" name="args"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg line="${runmain.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <arg line="@{args}"/>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-taskdefs">
-        <fail unless="libs.CopyLibs.classpath">
-The libs.CopyLibs.classpath property is not set up.
-This property must point to 
-org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at 
-&lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
-Either open the project in the IDE and make sure CopyLibs library
-exists or setup the property manually. For example like this:
- ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
-                </fail>
-        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
-    <!--
-                COMPILATION SECTION
-            -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
-    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
-    <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-copy-webdir">
-        <copy todir="${build.web.dir}">
-            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-        <copy todir="${build.web.dir}/WEB-INF">
-            <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
-        </copy>
-    </target>
-    <target name="-do-ws-compile"/>
-    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
-        <webproject2:javac destdir="${build.classes.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.custom.manifest" name="-copy-manifest">
-        <mkdir dir="${build.meta.inf.dir}"/>
-        <copy todir="${build.meta.inf.dir}">
-            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
-        <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
-            <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <webproject2:javac excludes="" includes="${javac.includes}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
-        <mkdir dir="${build.generated.dir}/src"/>
-        <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
-            <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir}"/>
-            <arg value="-d"/>
-            <arg file="${basedir}/${build.generated.dir}/src"/>
-            <arg value="-die1"/>
-            <arg value="-compilerSourceVM ${javac.source}"/>
-            <arg value="-compilerTargetVM ${javac.target}"/>
-            <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
-        </java>
-        <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
-    </target>
-    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
-        <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
-        <mkdir dir="${build.generated.dir}/src"/>
-        <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
-            <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir}"/>
-            <arg value="-d"/>
-            <arg file="${basedir}/${build.generated.dir}/src"/>
-            <arg value="-die1"/>
-            <arg value="-jspc.files"/>
-            <arg path="${jsp.includes}"/>
-            <arg value="-compilerSourceVM ${javac.source}"/>
-            <arg value="-compilerTargetVM ${javac.target}"/>
-            <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
-        </java>
-        <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
-            <customize>
-                <patternset includes="${javac.jsp.includes}"/>
-            </customize>
-        </webproject2:javac>
-    </target>
-    <target name="compile-single-jsp">
-        <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
-        <antcall target="-do-compile-single-jsp"/>
-    </target>
-    <!--
-                DIST BUILDING SECTION
-            -->
-    <target name="-pre-dist">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
-        <dirname file="${dist.war}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.war}">
-            <fileset dir="${build.web.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
-        <dirname file="${dist.war}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
-            <fileset dir="${build.web.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
-        <dirname file="${dist.war}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.war}">
-            <fileset dir="${build.web.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
-        <dirname file="${dist.war}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
-            <fileset dir="${build.web.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
-    <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${libs.jsf12-support-runtime-modified.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jsf12-support-runtime-modified.classpath" todir="${dist.ear.dir}"/>
-        <copyfiles files="${libs.icefaces-jsf12-bm.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.icefaces-jsf12-bm.classpath" todir="${dist.ear.dir}"/>
-        <copyfiles files="${libs.icefaces-jsf12-runtime-support.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.icefaces-jsf12-runtime-support.classpath" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.jbi-admin-common.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jbi-admin-common.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.icefaces-runtime-172.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <mkdir dir="${build.web.dir}/META-INF"/>
-        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.libs.jsf12-support-runtime-modified.classpath} ${manifest.libs.icefaces-jsf12-bm.classpath} ${manifest.libs.icefaces-jsf12-runtime-support.classpath} ${manifest.file.reference.jbi-admin-common.jar} "/>
-        </manifest>
-    </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${libs.jsf12-support-runtime-modified.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.icefaces-jsf12-bm.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.icefaces-jsf12-runtime-support.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jbi-admin-common.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.icefaces-runtime-172.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-    </target>
-    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
-        <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
-            <fileset dir="${build.web.dir}"/>
-        </jar>
-    </target>
-    <target name="-post-dist">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
-    <target depends="init,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
-    <!--
-                EXECUTION SECTION
-            -->
-    <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
-    <target name="-pre-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-post-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-pre-nbmodule-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
-    </target>
-    <target name="-post-nbmodule-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
-    </target>
-    <target name="-run-deploy-am">
-        <!-- Task to deploy to the Access Manager runtime. -->
-    </target>
-    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
-        <nbjpdaappreloaded/>
-    </target>
-    <target if="netbeans.home" name="-run-deploy-nb">
-        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
-    </target>
-    <target name="-init-deploy-ant" unless="netbeans.home">
-        <property name="deploy.ant.archive" value="${dist.war}"/>
-        <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
-        <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
-        <property name="deploy.ant.enabled" value="true"/>
-    </target>
-    <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
-    <target if="netbeans.home" name="-run-undeploy-nb">
-        <fail message="Undeploy is not supported from within the IDE"/>
-    </target>
-    <target depends="init,-pre-dist,dist,-post-dist" name="verify">
-        <nbverify file="${dist.war}"/>
-    </target>
-    <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
-    <target if="do.display.browser" name="-init-display-browser">
-        <condition property="do.display.browser.nb">
-            <isset property="netbeans.home"/>
-        </condition>
-        <condition property="do.display.browser.cl">
-            <isset property="deploy.ant.enabled"/>
-        </condition>
-    </target>
-    <target if="do.display.browser.nb" name="-display-browser-nb">
-        <nbbrowse url="${client.url}"/>
-    </target>
-    <target if="do.display.browser.cl" name="-get-browser" unless="browser">
-        <condition property="browser" value="rundll32">
-            <os family="windows"/>
-        </condition>
-        <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
-            <os family="windows"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/open">
-            <os family="mac"/>
-        </condition>
-        <property environment="env"/>
-        <condition property="browser" value="${env.BROWSER}">
-            <isset property="env.BROWSER"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/firefox">
-            <available file="/usr/bin/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/local/firefox/firefox">
-            <available file="/usr/local/firefox/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/mozilla">
-            <available file="/usr/bin/mozilla"/>
-        </condition>
-        <condition property="browser" value="/usr/local/mozilla/mozilla">
-            <available file="/usr/local/mozilla/mozilla"/>
-        </condition>
-        <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
-            <available file="/usr/sfw/lib/firefox/firefox"/>
-        </condition>
-        <condition property="browser" value="/opt/csw/bin/firefox">
-            <available file="/opt/csw/bin/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
-            <available file="/usr/sfw/lib/mozilla/mozilla"/>
-        </condition>
-        <condition property="browser" value="/opt/csw/bin/mozilla">
-            <available file="/opt/csw/bin/mozilla"/>
-        </condition>
-    </target>
-    <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
-        <fail unless="browser">
-                    Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
-                </fail>
-        <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
-        <echo>Launching ${browse.url}</echo>
-        <exec executable="${browser}" spawn="true">
-            <arg line="${browser.args} ${browse.url}"/>
-        </exec>
-    </target>
-    <target depends="init,-init-cos,compile-single" name="run-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <webproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                DEBUGGING SECTION
-            -->
-    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
-        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true"/>
-        <antcall target="connect-debugger"/>
-        <antcall target="debug-display-browser"/>
-        <antcall target="connect-client-debugger"/>
-    </target>
-    <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
-        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
-            <classpath>
-                <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
-            </classpath>
-            <sourcepath>
-                <path path="${web.docbase.dir}"/>
-            </sourcepath>
-        </nbjpdaconnect>
-    </target>
-    <target if="do.display.browser.debug" name="debug-display-browser">
-        <nbbrowse url="${client.url}"/>
-    </target>
-    <target if="do.debug.client" name="connect-client-debugger">
-        <webproject1:nbjsdebugstart webUrl="${client.url}"/>
-    </target>
-    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <webproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <webproject1:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <webproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                JAVADOC SECTION
-            -->
-    <target depends="init" name="javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                
-                JUNIT COMPILATION SECTION
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
-        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                
-                JUNIT EXECUTION SECTION
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <webproject2:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <webproject2:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                
-                JUNIT DEBUGGING SECTION
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <!-- must exist, otherwise the XML formatter would fail -->
-        <mkdir dir="${build.test.results.dir}"/>
-        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </webproject1:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                
-                CLEANUP SECTION
-            -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="do-clean">
-        <condition property="build.dir.to.clean" value="${build.web.dir}">
-            <isset property="dist.ear.dir"/>
-        </condition>
-        <property name="build.dir.to.clean" value="${build.web.dir}"/>
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-        </delete>
-        <delete dir="${build.dir}"/>
-        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target depends="do-clean" if="status.clean-failed" name="check-clean">
-        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
-    </target>
-    <target depends="init" if="netbeans.home" name="undeploy-clean">
-        <nbundeploy failOnError="false" startServer="false"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/faces-config.NavData b/ojc-core/bpelmonitortool/monitor-console/nbproject/faces-config.NavData
deleted file mode 100755
index 8b9f68169..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/faces-config.NavData
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scene Scope="All Faces Configurations" version="2">
-    <Scope Scope="Faces Configuration Only">
-        <Node id="ProcessMonitor.iface" x="580" y="125" zoom="true"/>
-        <Node id="BpelMonitor.jsp" x="113" y="151" zoom="true"/>
-        <Node id="BpelMonitor.iface" x="598" y="362" zoom="true"/>
-        <Node id="ProcessMonitor.jsp" x="110" y="392" zoom="true"/>
-    </Scope>
-    <Scope Scope="Project">
-        <Node id="ProcessMonitor.iface" x="580" y="125" zoom="true"/>
-        <Node id="BpelMonitor.jsp" x="113" y="151" zoom="false"/>
-        <Node id="BpelMonitor.iface" x="598" y="362" zoom="false"/>
-        <Node id="resources/svg/AsynchronousSample.svg" x="20" y="623" zoom="false"/>
-        <Node id="ProcessMonitor.jsp" x="110" y="392" zoom="false"/>
-        <Node id="resources/svg/TravelReservationService.svg" x="4" y="693" zoom="true"/>
-    </Scope>
-    <Scope Scope="All Faces Configurations">
-        <Node id="ProcessMonitor.iface" x="294" y="27" zoom="true"/>
-        <Node id="Instances.jsp" x="511" y="164" zoom="true"/>
-        <Node id="BpelMonitor.jsp" x="48" y="148" zoom="true"/>
-        <Node id="BpelMonitor.iface" x="498" y="403" zoom="true"/>
-        <Node id="ProcessMonitor.jsp" x="72" y="412" zoom="true"/>
-        <Node id="Instances.iface" x="47" y="229" zoom="true"/>
-    </Scope>
-</Scene>
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/genfiles.properties b/ojc-core/bpelmonitortool/monitor-console/nbproject/genfiles.properties
deleted file mode 100755
index 6ee491b19..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=691d0d72
-build.xml.script.CRC32=bfef43c0
-build.xml.stylesheet.CRC32=c0ebde35
-# 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=691d0d72
-nbproject/build-impl.xml.script.CRC32=02420f2f
-nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/project.properties b/ojc-core/bpelmonitortool/monitor-console/nbproject/project.properties
deleted file mode 100755
index 085d3817f..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/project.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-build.classes.excludes=**/*.java,**/*.form
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-build.web.dir=${build.dir}/web
-build.web.excludes=${build.classes.excludes}
-client.urlPart=BpelMonitor.iface
-compile.jsps=false
-conf.dir=${source.root}/conf
-debug.classpath=${build.classes.dir}:${javac.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-display.browser=true
-dist.dir=dist
-dist.ear.war=${dist.dir}/${war.ear.name}
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.war=${dist.dir}/${war.name}
-excludes=
-file.reference.jbi-admin-common.jar=../glassfish-v2.1/jbi/lib/jbi-admin-common.jar
-includes=**
-j2ee.deploy.on.save=true
-j2ee.platform=1.5
-j2ee.server.type=J2EE
-jar.compress=false
-javac.classpath=\
-    ${libs.icefaces-jsf12-designtime-172.classpath}:\
-    ${libs.jsf12-support-runtime-modified.classpath}:\
-    ${libs.icefaces-jsf12-bm.classpath}:\
-    ${libs.icefaces-jsf12-runtime-support.classpath}:\
-    ${file.reference.jbi-admin-common.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.debug=true
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.preview=true
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-persistence.xml.dir=${conf.dir}
-platform.active=default_platform
-resource.dir=setup
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
-source.encoding=UTF-8
-source.root=src
-src.dir=${source.root}/java
-test.src.dir=test
-war.content.additional=\
-    ${libs.exceptionhandler-runtime.classpath}:\
-    ${libs.icefaces-runtime-172.classpath}
-war.ear.name=monitor-console.war
-war.name=monitor-console.war
-web.docbase.dir=web
-webinf.dir=web/WEB-INF
diff --git a/ojc-core/bpelmonitortool/monitor-console/nbproject/project.xml b/ojc-core/bpelmonitortool/monitor-console/nbproject/project.xml
deleted file mode 100755
index 0fea7c287..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/nbproject/project.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.web.project</type>
-    <configuration>
-        <creator-data xmlns="http://www.sun.com/creator/ns" jsf.pagebean.package="bpelmonitor" jsf.project.version="4.0" jsf.startPage="BpelMonitor.jsp"/>
-        <data xmlns="http://www.netbeans.org/ns/web-project/3">
-            <name>monitor-console</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries>
-                <library>
-                    <file>${libs.icefaces-jsf12-designtime-172.classpath}</file>
-                </library>
-                <library>
-                    <file>${libs.jsf12-support-runtime-modified.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.icefaces-jsf12-bm.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.icefaces-jsf12-runtime-support.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${file.reference.jbi-admin-common.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-            </web-module-libraries>
-            <web-module-additional-libraries>
-                <library>
-                    <file>${libs.exceptionhandler-runtime.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.icefaces-runtime-172.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-            </web-module-additional-libraries>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/ojc-core/bpelmonitortool/monitor-console/setup/sun-resources.xml b/ojc-core/bpelmonitortool/monitor-console/setup/sun-resources.xml
deleted file mode 100755
index 4fc59ffd2..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/setup/sun-resources.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Resource Definitions //EN" "http://www.sun.com/software/appserver/dtds/sun-resources_1_3.dtd">
-<resources>
-  <jdbc-resource enabled="true" jndi-name="jdbc/USR2_ApacheDerby" object-type="user" pool-name="derby_net_bpelseDB_usr2Pool"/>
-  <jdbc-connection-pool allow-non-component-callers="false" associate-with-thread="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" connection-leak-reclaim="false" connection-leak-timeout-in-seconds="0" connection-validation-method="auto-commit" datasource-classname="org.apache.derby.jdbc.ClientDataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="true" lazy-connection-association="false" lazy-connection-enlistment="false" match-connections="false" max-connection-usage-count="0" max-pool-size="32" max-wait-time-in-millis="60000" name="derby_net_bpelseDB_usr2Pool" non-transactional-connections="false" pool-resize-quantity="2" res-type="javax.sql.DataSource" statement-timeout-in-seconds="-1" steady-pool-size="8" validate-atmost-once-period-in-seconds="0" wrap-jdbc-objects="false">
-    <property name="User" value="usr2"/>
-    <property name="Password" value="pass2"/>
-    <property name="serverName" value="localhost"/>
-    <property name="PortNumber" value="1527"/>
-    <property name="DatabaseName" value="bpelseDB"/>
-    <property name="URL" value="jdbc:derby://localhost:1527/bpelseDB"/>
-    <property name="driverClass" value="org.apache.derby.jdbc.ClientDriver"/>
-  </jdbc-connection-pool>
-</resources>
diff --git a/ojc-core/bpelmonitortool/monitor-console/src/conf/MANIFEST.MF b/ojc-core/bpelmonitortool/monitor-console/src/conf/MANIFEST.MF
deleted file mode 100755
index 59499bce4..000000000
--- a/ojc-core/bpelmonitortool/monitor-console/src/conf/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-