Created attachment 1147741 [details]
duplicate EAP 7 entries in inventory

Description of problem:
Duplicate EAP 7 entries found when we update agent plugin from jon-eap-plugin-update03-CR01 to jon-plugin-pack-eap-3.3.0.GA-update-04(ER01)

Version-Release number of selected component (if applicable):
Version : 3.3.0.GA Update 05
Build Number : 4242930:1c9f74b
GWT Version : 2.5.0
SmartGWT Version : 3.0p

How reproducible:
always

Steps to Reproduce:
1. Install JON 3.3.5 GA with jon-eap-plugin-update03-CR01
2. Install EAP 7 server(JBEAP-7.0.0.CR1/jboss-eap-7.0.0.CR1.zip)
3. EAP 7 will be available in inventory page
4. Update plugins to jon-plugin-pack-eap-3.3.0.GA-update-04(ER01)
5. Force update agents
6. One more EAP 7 entry will be available on inventory page.

Actual results:
Duplicate entries found on Inventory page. 
Before plugin update:
--------------------
"Resource Type": "JBossAS7 Standalone Server" and "Description": "Standalone JBoss Enterprise Application Platform 6 server".

After plugin update:
--------------------
Another entry found with "Resource Type": "EAP7 Standalone Server" and "Description": "Standalone JBoss Enterprise Application Platform 7 server".

Expected results:
Should display only one entry

Additional info: screen shot is attached.

When we try to import EAP 7 discovered by old plugin getting the following exception, (this exception filling the agent.log)
-----------------------
2016-04-15 13:08:29,245 WARN  [InventoryManager.availability-1] (rhq.core.pc.inventory.AvailabilityExecutor)- Availability collection failed with exception on Resource[id=10838, uuid=dfd3a3d8-65df-4c12-aaed-5a81672cf9be, type={JBossAS7}JBossAS7 Standalone Server, key=hostConfig: /home/hudson/eap-servers/jboss-eap-7.0/standalone/configuration/standalone.xml, name=EAP (127.0.0.1:29990), parent=ca2.bc.jonqe.lab.eng.bos.redhat.com, version=EAP 7.0.0.GA], availability will be reported as DOWN, reason=Failed to start component for Resource[id=10838, uuid=dfd3a3d8-65df-4c12-aaed-5a81672cf9be, type={JBossAS7}JBossAS7 Standalone Server, key=hostConfig: /home/hudson/eap-servers/jboss-eap-7.0/standalone/configuration/standalone.xml, name=EAP (127.0.0.1:29990), parent=ca2.bc.jonqe.lab.eng.bos.redhat.com, version=EAP 7.0.0.GA] - The original product type discovered for this server was EAP, but the server is now reporting its product type is [JBoss EAP]
2016-04-15 13:08:42,941 INFO  [WorkerThread#0[10.16.23.112:52487]] (rhq.core.pc.inventory.InventoryManager)- Unable to connect to managed resource of type [JBossAS7 Standalone Server] using the specified connection properties.
org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException: Failed to start component for Resource[id=10838, uuid=dfd3a3d8-65df-4c12-aaed-5a81672cf9be, type={JBossAS7}JBossAS7 Standalone Server, key=hostConfig: /home/hudson/eap-servers/jboss-eap-7.0/standalone/configuration/standalone.xml, name=EAP (127.0.0.1:29990), parent=ca2.bc.jonqe.lab.eng.bos.redhat.com, version=EAP 7.0.0.GA] - The original product type discovered for this server was EAP, but the server is now reporting its product type is [JBoss EAP]
	at org.rhq.core.pc.inventory.InventoryManager.activateResource(InventoryManager.java:2282)
	at org.rhq.core.pc.inventory.InventoryManager.updatePluginConfiguration(InventoryManager.java:723)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:606)
	at org.rhq.enterprise.communications.command.impl.remotepojo.server.RemotePojoInvocationCommandService.execute(RemotePojoInvocationCommandService.java:184)
	at sun.reflect.GeneratedMethodAccessor74.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:606)
	at sun.reflect.misc.Trampoline.invoke(MethodUtil.java:75)
	at sun.reflect.GeneratedMethodAccessor60.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:606)
	at sun.reflect.misc.MethodUtil.invoke(MethodUtil.java:279)
	at com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:112)
	at com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:46)
	at com.sun.jmx.mbeanserver.MBeanIntrospector.invokeM(MBeanIntrospector.java:237)
	at com.sun.jmx.mbeanserver.PerInterface.invoke(PerInterface.java:138)
	at com.sun.jmx.mbeanserver.MBeanSupport.invoke(MBeanSupport.java:252)
	at com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.invoke(DefaultMBeanServerInterceptor.java:819)
	at com.sun.jmx.mbeanserver.JmxMBeanServer.invoke(JmxMBeanServer.java:801)
	at javax.management.MBeanServerInvocationHandler.invoke(MBeanServerInvocationHandler.java:292)
	at com.sun.proxy.$Proxy2.execute(Unknown Source)
	at org.rhq.enterprise.communications.command.server.CommandProcessor.handleIncomingInvocationRequest(CommandProcessor.java:290)
	at org.rhq.enterprise.communications.command.server.CommandProcessor.invoke(CommandProcessor.java:184)
	at org.jboss.remoting.ServerInvoker.invoke(ServerInvoker.java:967)
	at org.jboss.remoting.transport.socket.ServerThread.completeInvocation(ServerThread.java:798)
	at org.jboss.remoting.transport.socket.ServerThread.processInvocation(ServerThread.java:751)
	at org.jboss.remoting.transport.socket.ServerThread.dorun(ServerThread.java:586)
	at org.jboss.remoting.transport.socket.ServerThread.run(ServerThread.java:234)
--------------------