modules/enterprise/agent/ant-run.xml | 5 ++-- modules/enterprise/agent/pom.xml | 12 +++++++--- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 2 - modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java | 3 -- pom.xml | 7 ++--- 5 files changed, 17 insertions(+), 12 deletions(-)
New commits: commit 56ab4fb0d3770635d8863a899789893fec0fe679 Author: John Mazzitelli mazz@redhat.com Date: Wed Sep 26 07:40:17 2012 -0400
fix the agent's libraries
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml index 587a9e9..04d01be 100644 --- a/modules/enterprise/agent/ant-run.xml +++ b/modules/enterprise/agent/ant-run.xml @@ -46,9 +46,10 @@ Ant Script that provides ways to package the Agent. <include name="commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar" /> <include name="dom4j/dom4j/1.6/dom4j-1.6.jar" /> <include name="oswego-concurrent/concurrent/${concurrent.version}/concurrent-${concurrent.version}.jar" /> - <include name="jboss/jboss-common/${jboss-common.version}/jboss-common-${jboss-common.version}.jar" /> - <include name="jboss/jboss-jmx/${jboss.version}/jboss-jmx-${jboss.version}.jar" /> + <include name="org/jboss/jboss-common-core/${jboss-common-core.version}/jboss-common-core-${jboss-common-core.version}.jar" /> + <include name="jboss/jboss-jmx/${jboss-jmx.version}/jboss-jmx-${jboss-jmx.version}.jar" /> <include name="jboss/jboss-remoting/${jboss-remoting.version}/jboss-remoting-${jboss-remoting.version}.jar" /> + <include name="org/jboss/logging/jboss-logging/${jboss-logging.version}/jboss-logging-${jboss-logging.version}.jar" /> <include name="jboss/jboss-serialization/${jboss-serialization.version}/jboss-serialization-${jboss-serialization.version}.jar" /> <include name="org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" /> <include name="org/rhq/rhq-enterprise-agent/${project.version}/rhq-enterprise-agent-${project.version}.jar" /> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index e882eba..7d7b55b 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -95,7 +95,12 @@ <artifactId>jboss-remoting</artifactId> </dependency>
- <!-- I think we are taking this whole jar for a single util method --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>${jboss-logging.version}</version> <!-- just using the one that is also used by AS7 --> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> @@ -167,9 +172,10 @@ Build-Number=${buildNumber} <property name="project.version" value="${project.version}" /> <property name="concurrent.version" value="${concurrent.version}" /> <property name="getopt.version" value="${getopt.version}" /> - <property name="jboss.version" value="${jboss.version}" /> - <property name="jboss-common.version" value="${jboss-common.version}" /> + <property name="jboss-jmx.version" value="${jboss-jmx.version}" /> + <property name="jboss-common-core.version" value="${jboss-common-core.version}" /> <property name="jboss-remoting.version" value="${jboss-remoting.version}" /> + <property name="jboss-logging.version" value="${jboss-logging.version}" /> <property name="jboss-serialization.version" value="${jboss-serialization.version}" /> <property name="sigar.version" value="${sigar.version}" /> <property name="jaxb-api.version" value="${jaxb-api.version}" /> diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index cc761e4..6c01d67 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -70,7 +70,6 @@ import org.apache.log4j.xml.DOMConfigurator; import org.jboss.remoting.invocation.NameBasedInvocation; import org.jboss.remoting.security.SSLSocketBuilder; import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker; -import org.jboss.util.StringPropertyReplacer;
import org.rhq.core.clientapi.server.bundle.BundleServerService; import org.rhq.core.clientapi.server.configuration.ConfigurationServerService; @@ -101,6 +100,7 @@ import org.rhq.core.pc.plugin.FileSystemPluginFinder; import org.rhq.core.pc.util.LoggingThreadFactory; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; +import org.rhq.core.util.StringPropertyReplacer; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.stream.StreamUtil; import org.rhq.enterprise.agent.AgentRestartCounter.AgentRestartReason; diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java index 1b12888..2c866a2 100644 --- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java +++ b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java @@ -39,8 +39,7 @@ import java.util.prefs.Preferences; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
-import org.jboss.util.StringPropertyReplacer; - +import org.rhq.core.util.StringPropertyReplacer; import org.rhq.core.util.stream.StreamUtil; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; diff --git a/pom.xml b/pom.xml index f29c87f..76272e0 100644 --- a/pom.xml +++ b/pom.xml @@ -64,9 +64,6 @@ overall JBoss AS Server version. Meaning, the AS provides these libs. When the Server version is changed the versions of each of these should be validated and updated as needed.
- <jboss-common.version>1.2.1.GA</jboss-common.version> - <jboss-remoting.version>2.2.2.SP8</jboss-remoting.version> - <jboss-serialization.version>1.0.3.GA</jboss-serialization.version> <jboss-javassist.version>3.9.0.GA</jboss-javassist.version> --> <jboss.version>7.1.1.Final</jboss.version> @@ -92,11 +89,13 @@ <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <jboss-ejb3-ext-api.version>2.0.0</jboss-ejb3-ext-api.version> <picketbox.version>4.0.7.Final</picketbox.version> + <jboss-logging.version>3.1.0.GA</jboss-logging.version>
- <!-- Not Provided --> + <!-- Not Provided - some of these are needed by the agent --> <jboss-annotations.version>4.2.3.GA</jboss-annotations.version> <jboss-cache.version>1.4.1.SP9</jboss-cache.version> <jboss-jmx.version>4.2.3.GA</jboss-jmx.version> + <jboss-common.version>1.2.1.GA</jboss-common.version> <!-- note this is the old commons we used, not the newer commons-core --> <jboss-remoting.version>2.2.2.SP8</jboss-remoting.version> <jboss-serialization.version>1.0.3.GA</jboss-serialization.version> <jboss-system.version>4.2.3.GA</jboss-system.version>
rhq-commits@lists.fedorahosted.org