From f11997e1ce300515016be55c5dcef8d52352af9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=A8=E5=8D=9A?= <panchenbo@uniontech.com>
Date: Tue, 23 Jun 2020 14:15:14 +0800
Subject: [PATCH] fix new function not found when Install

---
 src/pmdas/activemq/GNUmakefile     |  4 +++-
 src/pmdas/activemq/pmdaactivemq.pl | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pmdas/activemq/GNUmakefile b/src/pmdas/activemq/GNUmakefile
index da9c583..26bb78e 100644
--- a/src/pmdas/activemq/GNUmakefile
+++ b/src/pmdas/activemq/GNUmakefile
@@ -41,7 +41,9 @@ build-me: check_domain
 install install_pcp: default
 	$(INSTALL) -m 755 -d $(PMDADIR)
 	$(INSTALL) -m 755 Install Remove $(PMDADIR)
-	$(INSTALL) -m 644 pmda$(IAM).pl $(MODULES) $(PMDADIR)
+	$(INSTALL) -m 644 pmda$(IAM).pl $(PMDADIR)/pmda$(IAM).pl
+	$(INSTALL) -m 755 -d $(PMDADIR)/PCP
+	$(INSTALL) -m 644 $(MODULES) $(PMDADIR)/PCP
 	@$(INSTALL_MAN)
 else
 build-me:
diff --git a/src/pmdas/activemq/pmdaactivemq.pl b/src/pmdas/activemq/pmdaactivemq.pl
index 7f835aa..4b54516 100755
--- a/src/pmdas/activemq/pmdaactivemq.pl
+++ b/src/pmdas/activemq/pmdaactivemq.pl
@@ -49,16 +49,16 @@ my $jvm_garbage_collection_cluster = 5;
 for my $file (pmda_config('PCP_PMDAS_DIR') . '/activemq/activemq.conf', 'activemq.conf') {
     eval `cat $file` unless ! -f $file;
 }
-my $timesource = TimeSource->new;
-my $cache = Cache->new($timesource, $cache_time);
+my $timesource = PCP::TimeSource->new;
+my $cache = PCP::Cache->new($timesource, $cache_time);
 my $http_client = LWP::UserAgent->new;
 $http_client->agent('pmdaactivemq');
 $http_client->timeout($rest_timeout);
-my $rest_client = RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
-my $activemq = ActiveMQ->new($rest_client);
-my $jvm_memory = JVMMemory->new($rest_client);
-my $jvm_memory_pool = JVMMemoryPool->new($rest_client);
-my $jvm_garbage_collection = JVMGarbageCollection->new($rest_client);
+my $rest_client = PCP::RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
+my $activemq = PCP::ActiveMQ->new($rest_client);
+my $jvm_memory = PCP::JVMMemory->new($rest_client);
+my $jvm_memory_pool = PCP::JVMMemoryPool->new($rest_client);
+my $jvm_garbage_collection = PCP::JVMGarbageCollection->new($rest_client);
 
 my %queue_instances;
 
-- 
2.23.0

