QPID-1905 - Moved qmf agent code to java/management/agent where it belongs.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@785400 13f79535-47bb-0310-9956-ffa450edef68

32 files changed, 5 insertions, 6 deletions

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 5efdfdf29b..57f9e0484e 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -86,7 +86,7 @@ broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
 broker-plugins.libs=${common.libs} ${felix.libs} 
 management-client.libs=${jsp.libs} ${log4j} ${slf4j-log4j} ${slf4j-api} ${commons-pool} ${geronimo-servlet} ${muse.libs} ${javassist} ${xalan} ${mina-core} ${mina-filter-ssl}
 
-agent.libs=${client.libs} ${commons-logging}
+management-agent.libs=${client.libs} ${commons-logging} ${geronimo-jms}
 
 junit-toolkit.libs=${log4j} ${junit} ${slf4j-api}
 test.libs=${slf4j-log4j} ${junit-toolkit.libs}
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 530d220d54..beaaf7fed7 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -22,10 +22,10 @@
 
   <import file="common.xml"/>
 
-  <property name="modules.core"       value="junit-toolkit common broker client tools agent"/>
+  <property name="modules.core"       value="junit-toolkit common broker client tools"/>
   <property name="modules.examples"   value="client/example"/>
   <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
-  <property name="modules.management" value="management/common management/client management/eclipse-plugin"/>
+  <property name="modules.management" value="management/common management/client management/eclipse-plugin management/agent"/>
   <property name="modules.plugin"     value="broker-plugins"/>
   <property name="modules.management.tools" value="management/tools/qpid-cli"/>
   <property name="modules"            value="${modules.core}
diff --git a/qpid/java/agent/build.xml b/qpid/java/management/agent/build.xml
index b652b61c4b..a410c74c1f 100644
--- a/qpid/java/agent/build.xml
+++ b/qpid/java/management/agent/build.xml
@@ -20,9 +20,8 @@
  -->
 <project name="QMF Agent" default="build">
 
-    <property name="module.depends" value="common client jms"/>
-    <property name="module.main" value="org.apache.qpid.agent.Agent"/>
+    <property name="module.depends" value="common client"/>
 
-    <import file="../module.xml"/>
+    <import file="../../module.xml"/>
 
 </project>
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/Agent.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java
index 80348c52d9..80348c52d9 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/Agent.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/AgentException.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/AgentException.java
index ed189d2bc0..ed189d2bc0 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/AgentException.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/AgentException.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java
index a3528d9804..a3528d9804 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedEJB.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedEJB.java
index 4c5bc594d3..4c5bc594d3 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedEJB.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedEJB.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedObject.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedObject.java
index aa3bbf3894..aa3bbf3894 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedObject.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedObject.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedObjectBase.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedObjectBase.java
index 51789ae11f..51789ae11f 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedObjectBase.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedObjectBase.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedPOJO.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedPOJO.java
index 061334b252..061334b252 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/ManagedPOJO.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/ManagedPOJO.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFEvent.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFEvent.java
index 319c471445..319c471445 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFEvent.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFEvent.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFHide.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFHide.java
index f3824ff228..f3824ff228 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFHide.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFHide.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFObject.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFObject.java
index d737dbb852..d737dbb852 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFObject.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFObject.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFProperty.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFProperty.java
index f309fa95b5..f309fa95b5 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFProperty.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFProperty.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFSeeAlso.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFSeeAlso.java
index c14ea11ca4..c14ea11ca4 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFSeeAlso.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFSeeAlso.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFType.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFType.java
index 5d43276a55..5d43276a55 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/annotations/QMFType.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/annotations/QMFType.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
index aa84b9dd54..aa84b9dd54 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingException.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingException.java
index f8e436290c..f8e436290c 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingException.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingException.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingUtils.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingUtils.java
index 14f3fda0f1..14f3fda0f1 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/BindingUtils.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingUtils.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
index 3de978e34b..3de978e34b 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
index ef4abc743b..ef4abc743b 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ListBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ListBinding.java
index 0de8a07107..0de8a07107 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ListBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ListBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/MapBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/MapBinding.java
index 80889f3b4e..80889f3b4e 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/MapBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/MapBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/MethodBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/MethodBinding.java
index fc05c7393a..fc05c7393a 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/MethodBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/MethodBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ParameterBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ParameterBinding.java
index 7362976e0e..7362976e0e 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/ParameterBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ParameterBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/PropertyBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/PropertyBinding.java
index 22ad8cd8e4..22ad8cd8e4 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/PropertyBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/PropertyBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/QMFTypeBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/QMFTypeBinding.java
index 11ccf1b1a7..11ccf1b1a7 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/QMFTypeBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/QMFTypeBinding.java
diff --git a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/TypeBinding.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/TypeBinding.java
index 97ec943bfd..97ec943bfd 100644
--- a/qpid/java/agent/src/main/java/org/apache/qpid/agent/binding/TypeBinding.java
+++ b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/binding/TypeBinding.java
diff --git a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Crumpet.java b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Crumpet.java
index 67095c809b..67095c809b 100644
--- a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Crumpet.java
+++ b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Crumpet.java
diff --git a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Muppet.java b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Muppet.java
index f039ab9baa..f039ab9baa 100644
--- a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Muppet.java
+++ b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Muppet.java
diff --git a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Pikelet.java b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Pikelet.java
index f820fa6258..f820fa6258 100644
--- a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Pikelet.java
+++ b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Pikelet.java
diff --git a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Puppet.java b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Puppet.java
index bfd34840f8..bfd34840f8 100644
--- a/qpid/java/agent/src/test/java/org/apache/qpid/agent/Puppet.java
+++ b/qpid/java/management/agent/src/test/java/org/apache/qpid/agent/Puppet.java