From 92532db6de9e536926387d327b45c65f8cb168a2 Mon Sep 17 00:00:00 2001
From: Elaine Tan <etan@trekglobal.com>
Date: Wed, 31 Jul 2013 15:31:58 +0800
Subject: [PATCH] IDEMPIERE-840 Improvement to Request model class - combine
 the requestservice.xml and requesteventhandler.xml into one. Use class name
 as the pid.

---
 org.adempiere.base/OSGI-INF/metatype/metatype.xml      |  6 +++---
 org.adempiere.base/OSGI-INF/requesteventhandler.xml    | 10 +++++++---
 org.adempiere.base/OSGI-INF/requestservice.xml         | 10 ----------
 org.adempiere.base/build.properties                    |  1 -
 .../adempiere/base/event/RequestPropertyService.java   |  3 +--
 5 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 org.adempiere.base/OSGI-INF/requestservice.xml

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
 	
-	<OCD description="Request Service" name="Request Service" id="org.adempiere.base.event.request.service">   
+	<OCD description="Request Service" name="Request Service" id="org.adempiere.base.event.RequestEventHandler">   
     	<AD name="Ignore Request Types"  id="ignoreRequestTypes" required="true" type="String" default=""/>   
 	</OCD>
 	
-	<Designate pid="org.adempiere.base.event.request.service">
-    	<Object ocdref="org.adempiere.base.event.request.service"/>
+	<Designate pid="org.adempiere.base.event.RequestEventHandler">
+    	<Object ocdref="org.adempiere.base.event.RequestEventHandler"/>
 	</Designate>
   
 </metatype:MetaData>
\ 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.event.RequestEventHandler">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="org.adempiere.base.event.RequestEventHandler">
    <implementation class="org.adempiere.base.event.RequestEventHandler"/>
    <reference bind="bindEventManager" cardinality="1..1" interface="org.adempiere.base.event.IEventManager" name="IEventManager" policy="static" unbind="unbindEventManager"/>
-</scr:component>
-
+   <service>
+      <provide interface="org.osgi.service.cm.ManagedService"/>
+      <provide interface="org.adempiere.base.event.RequestEventHandler"/>
+   </service>
+   <property name="service.pid" type="String" value="org.adempiere.base.event.RequestEventHandler"/>
+</scr:component>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="org.adempiere.base.event.request.service">
-   <implementation class="org.adempiere.base.event.RequestEventHandler"/>
-   <property name="service.ranking" type="Integer" value="1"/>
-   <service>
-      <provide interface="org.osgi.service.cm.ManagedService"/>
-      <provide interface="org.adempiere.base.event.RequestEventHandler"/>
-   </service>
-   <property name="service.pid" type="String" value="org.adempiere.base.event.request.service"/>
-</scr:component>
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<String, Object> map = new Hashtable<String, Object>();
 						map.put(RequestEventHandler.IGNORE_REQUEST_TYPES, ignoreRequesTypes);