diff --git a/applications/accounting/build.xml b/applications/accounting/build.xml
index cf659171b5..c6c12b7b04 100644
--- a/applications/accounting/build.xml
+++ b/applications/accounting/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -101,6 +102,11 @@ under the License.
+
+
+
+
+
diff --git a/applications/content/build.xml b/applications/content/build.xml
index 27eaad7256..cd42c5d776 100644
--- a/applications/content/build.xml
+++ b/applications/content/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -95,6 +96,11 @@ under the License.
+
+
+
+
+
diff --git a/applications/ecommerce/build.xml b/applications/ecommerce/build.xml
index c512455584..51585ca558 100644
--- a/applications/ecommerce/build.xml
+++ b/applications/ecommerce/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/humanres/build.xml b/applications/humanres/build.xml
index 4f49c233b9..b8e98c0f7c 100644
--- a/applications/humanres/build.xml
+++ b/applications/humanres/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -88,6 +89,11 @@ under the License.
+
+
+
+
+
diff --git a/applications/manufacturing/build.xml b/applications/manufacturing/build.xml
index 8d74c9a7a7..8b98ef53ed 100644
--- a/applications/manufacturing/build.xml
+++ b/applications/manufacturing/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/marketing/build.xml b/applications/marketing/build.xml
index 617632c4b7..accb0f0a20 100644
--- a/applications/marketing/build.xml
+++ b/applications/marketing/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/order/build.xml b/applications/order/build.xml
index 2595d39440..f32e977000 100644
--- a/applications/order/build.xml
+++ b/applications/order/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/party/build.xml b/applications/party/build.xml
index c68c7b8a01..948e11990c 100644
--- a/applications/party/build.xml
+++ b/applications/party/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/pos/build.xml b/applications/pos/build.xml
index 1fe23c150f..8a5f119ef6 100644
--- a/applications/pos/build.xml
+++ b/applications/pos/build.xml
@@ -1,16 +1,18 @@
-
@@ -23,6 +25,7 @@
+
@@ -91,6 +94,11 @@
+
+
+
+
+
diff --git a/applications/product/build.xml b/applications/product/build.xml
index af1086267c..86b7b1d587 100644
--- a/applications/product/build.xml
+++ b/applications/product/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/securityext/build.xml b/applications/securityext/build.xml
index 111f854d07..f7db148407 100644
--- a/applications/securityext/build.xml
+++ b/applications/securityext/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/applications/workeffort/build.xml b/applications/workeffort/build.xml
index d9c3ed7757..5a22fe6f47 100644
--- a/applications/workeffort/build.xml
+++ b/applications/workeffort/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/framework/appserver/build.xml b/framework/appserver/build.xml
index 4e30b0897e..4ac62698f8 100644
--- a/framework/appserver/build.xml
+++ b/framework/appserver/build.xml
@@ -1,6 +1,5 @@
+
+
+
+
+
diff --git a/framework/base/build.xml b/framework/base/build.xml
index f416e33db4..c5ca523c98 100644
--- a/framework/base/build.xml
+++ b/framework/base/build.xml
@@ -24,6 +24,7 @@ under the License.
+
@@ -100,6 +101,14 @@ under the License.
+
+
+
+
+
+
+
+
diff --git a/framework/base/src/start/org/ofbiz/base/start/Start.mf b/framework/base/src/start/org/ofbiz/base/start/Start.mf
index 333312f2c0..56b6139d36 100644
--- a/framework/base/src/start/org/ofbiz/base/start/Start.mf
+++ b/framework/base/src/start/org/ofbiz/base/start/Start.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
-Implementation-Title: "OFBiz Startup"
-Implementation-Vendor: "The Open For Business Project"
+Implementation-Title: "Apache OFBiz Startup"
+Implementation-Vendor: "The Apache Open For Business Project"
Main-Class: org.ofbiz.base.start.Start
diff --git a/framework/catalina/build.xml b/framework/catalina/build.xml
index 4c674f918c..dc78723cde 100644
--- a/framework/catalina/build.xml
+++ b/framework/catalina/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -84,6 +85,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/common/build.xml b/framework/common/build.xml
index 9da0a00ee6..b3d2dc9b97 100644
--- a/framework/common/build.xml
+++ b/framework/common/build.xml
@@ -26,6 +26,7 @@ under the License.
+
@@ -88,6 +89,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/datafile/build.xml b/framework/datafile/build.xml
index 3a4528c0c6..d4aa452d83 100644
--- a/framework/datafile/build.xml
+++ b/framework/datafile/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -81,6 +82,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/entity/build.xml b/framework/entity/build.xml
index e10aae1e28..6131efd015 100644
--- a/framework/entity/build.xml
+++ b/framework/entity/build.xml
@@ -26,6 +26,7 @@ under the License.
+
@@ -85,6 +86,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/entityext/build.xml b/framework/entityext/build.xml
index 86eb37c51e..d672477570 100644
--- a/framework/entityext/build.xml
+++ b/framework/entityext/build.xml
@@ -26,6 +26,7 @@ under the License.
+
@@ -86,6 +87,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/example/build.xml b/framework/example/build.xml
index 1130db1b6a..738bad244b 100644
--- a/framework/example/build.xml
+++ b/framework/example/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -87,6 +88,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/geronimo/build.xml b/framework/geronimo/build.xml
index 027af6ba1a..336b1905f1 100644
--- a/framework/geronimo/build.xml
+++ b/framework/geronimo/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -83,6 +84,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/guiapp/build.xml b/framework/guiapp/build.xml
index 72c62a3551..7c5ff7554d 100644
--- a/framework/guiapp/build.xml
+++ b/framework/guiapp/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -87,6 +88,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/jetty/build.xml b/framework/jetty/build.xml
index 35197fb788..f75d2fed79 100644
--- a/framework/jetty/build.xml
+++ b/framework/jetty/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -83,6 +84,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/minilang/build.xml b/framework/minilang/build.xml
index 72b75ca204..e0d998fd4f 100644
--- a/framework/minilang/build.xml
+++ b/framework/minilang/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -85,6 +86,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/security/build.xml b/framework/security/build.xml
index 99c1542b47..1af3d2f111 100644
--- a/framework/security/build.xml
+++ b/framework/security/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -82,6 +83,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/service/build.xml b/framework/service/build.xml
index abe6342950..07785c84b2 100644
--- a/framework/service/build.xml
+++ b/framework/service/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -85,6 +86,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/shark/build.xml b/framework/shark/build.xml
index 4b1bdf363c..230ab04393 100644
--- a/framework/shark/build.xml
+++ b/framework/shark/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -90,6 +91,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/testtools/build.xml b/framework/testtools/build.xml
index 65cf370d11..4c7e0804cf 100644
--- a/framework/testtools/build.xml
+++ b/framework/testtools/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -85,6 +86,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/webapp/build.xml b/framework/webapp/build.xml
index 300927e4d3..61547ac2ee 100644
--- a/framework/webapp/build.xml
+++ b/framework/webapp/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -90,6 +91,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/webtools/build.xml b/framework/webtools/build.xml
index 34bea14cd4..3f30873848 100644
--- a/framework/webtools/build.xml
+++ b/framework/webtools/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -91,6 +92,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/widget/build.xml b/framework/widget/build.xml
index 80e46f3a17..62bfa5ee51 100644
--- a/framework/widget/build.xml
+++ b/framework/widget/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -90,6 +91,11 @@ under the License.
+
+
+
+
+
diff --git a/framework/workflow/build.xml b/framework/workflow/build.xml
index 6fb68df7e2..909535f599 100644
--- a/framework/workflow/build.xml
+++ b/framework/workflow/build.xml
@@ -25,6 +25,7 @@ under the License.
+
@@ -85,6 +86,11 @@ under the License.
+
+
+
+
+