diff --git a/org.adempiere.base/OSGI-INF/metatype/metatype.xml b/org.adempiere.base/OSGI-INF/metatype/metatype.xml
index e8c7360b9f..3fa5b331c1 100644
--- a/org.adempiere.base/OSGI-INF/metatype/metatype.xml
+++ b/org.adempiere.base/OSGI-INF/metatype/metatype.xml
@@ -1,12 +1,12 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/org.adempiere.base/OSGI-INF/requesteventhandler.xml b/org.adempiere.base/OSGI-INF/requesteventhandler.xml
index c30b1cc2fd..f3d44317f0 100644
--- a/org.adempiere.base/OSGI-INF/requesteventhandler.xml
+++ b/org.adempiere.base/OSGI-INF/requesteventhandler.xml
@@ -1,6 +1,10 @@
-
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/org.adempiere.base/OSGI-INF/requestservice.xml b/org.adempiere.base/OSGI-INF/requestservice.xml
deleted file mode 100644
index f471c6518d..0000000000
--- a/org.adempiere.base/OSGI-INF/requestservice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 965833233d..ba576364dc 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -29,7 +29,6 @@ bin.includes = META-INF/,\
OSGI-INF/defaultpaymentprocessorfactory.xml,\
OSGI-INF/broadcastutil.xml,\
OSGI-INF/requesteventhandler.xml,\
- OSGI-INF/requestservice.xml,\
OSGI-INF/requestpropertyservice.xml,\
schema/
output.base.jar = build/
diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java b/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java
index 1a5bcd5666..77a83920d0 100644
--- a/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java
+++ b/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java
@@ -23,7 +23,6 @@ import java.util.Hashtable;
import java.util.Properties;
import java.util.logging.Level;
-import org.adempiere.base.event.RequestEventHandler;
import org.compiere.util.CLogger;
import org.compiere.util.Ini;
import org.compiere.util.Util;
@@ -65,7 +64,7 @@ public class RequestPropertyService {
String ignoreRequesTypes = p.getProperty(RequestEventHandler.IGNORE_REQUEST_TYPES);
if (!Util.isEmpty(ignoreRequesTypes)) {
- Configuration configuration = service.getConfiguration("org.adempiere.base.event.request.service");
+ Configuration configuration = service.getConfiguration(RequestEventHandler.class.getName());
if (configuration.getProperties() == null) {
Dictionary map = new Hashtable();
map.put(RequestEventHandler.IGNORE_REQUEST_TYPES, ignoreRequesTypes);