geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r405564 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent: .classpath META-INF/MANIFEST.MF build.properties pom.xml src/org/apache/geronimo/st/jmxagent/JMXAgent.java
Date Tue, 09 May 2006 23:02:08 GMT
Author: sppatel
Date: Tue May  9 16:02:05 2006
New Revision: 405564

URL: http://svn.apache.org/viewcvs?rev=405564&view=rev
Log:
rid of dup jars, set provider classloader

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/build.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/src/org/apache/geronimo/st/jmxagent/JMXAgent.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/.classpath
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/.classpath?rev=405564&r1=405563&r2=405564&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/.classpath
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/.classpath
Tue May  9 16:02:05 2006
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/mx4j-remote-3.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mx4j-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.mortbay.jetty-5.1.10.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mx4j-tools-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hessian-3.0.8.jar"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/META-INF/MANIFEST.MF?rev=405564&r1=405563&r2=405564&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/META-INF/MANIFEST.MF
Tue May  9 16:02:05 2006
@@ -14,14 +14,12 @@
  org.eclipse.jem.util,
  org.eclipse.emf.ecore,
  org.apache.geronimo.st.core,
- org.eclipse.wst.server.core
+ org.eclipse.wst.server.core,
+ org.apache.geronimo.runtime.common
 Eclipse-AutoStart: true
 Export-Package: 
  org.apache.geronimo.st.jmxagent
-Bundle-ClassPath: lib/mx4j-remote-3.0.1.jar,
- lib/mx4j-3.0.1.jar,
- lib/org.mortbay.jetty-5.1.10.jar,
+Bundle-ClassPath: lib/org.mortbay.jetty-5.1.10.jar,
  lib/mx4j-tools-3.0.1.jar,
  lib/hessian-3.0.8.jar,
- lib/geronimo-servlet_2.4_spec-1.0.jar,
- lib/commons-logging-1.0.4.jar
+ lib/geronimo-servlet_2.4_spec-1.0.jar

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/build.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/build.properties?rev=405564&r1=405563&r2=405564&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/build.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/build.properties
Tue May  9 16:02:05 2006
@@ -1,3 +1,8 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
-               lib/commons-logging-1.0.4.jar
+               lib/,\
+               plan.xml
+src.includes = .classpath,\
+               .options,\
+               pom.xml,\
+               src/

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml?rev=405564&r1=405563&r2=405564&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml
Tue May  9 16:02:05 2006
@@ -54,16 +54,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>mx4j</groupId>
-                                    <artifactId>mx4j-remote</artifactId>
-                                    <version>3.0.1</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
-                                    <artifactId>mx4j</artifactId>
-                                    <version>3.0.1</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>mx4j</groupId>
                                     <artifactId>mx4j-tools</artifactId>
                                     <version>3.0.1</version>
                                 </artifactItem>
@@ -76,11 +66,6 @@
                            			<groupId>org.apache.geronimo.devtools</groupId>
             						<artifactId>config-store-service</artifactId>
             						<version>${configStoreServiceVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-logging</groupId>
-                                    <artifactId>commons-logging</artifactId>
-                                    <version>1.0.4</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>lib</outputDirectory>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/src/org/apache/geronimo/st/jmxagent/JMXAgent.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/src/org/apache/geronimo/st/jmxagent/JMXAgent.java?rev=405564&r1=405563&r2=405564&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/src/org/apache/geronimo/st/jmxagent/JMXAgent.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/src/org/apache/geronimo/st/jmxagent/JMXAgent.java
Tue May  9 16:02:05 2006
@@ -17,6 +17,8 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
@@ -50,16 +52,18 @@
 	private void init() {
 		try {
 			url = new JMXServiceURL("hessian", null, DEFAULT_PORT, "/hessian");
+			loadBean(ConfigurationStoreResolver.class.getName(), "ConfigStoreResolver:name=resolver");
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
-		}
-		loadBean(ConfigurationStoreResolver.class.getName(), "ConfigStoreResolver:name=resolver");
+		} 
 	}
 
 	public void start() throws IOException {
 		if (connectorServer == null) {
 			init();
-			connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, null, getServer());
+			Map env = new HashMap();
+			env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, this.getClass().getClassLoader());
+			connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, env, getServer());
 		}
 
 		if (!connectorServer.isActive()) {



Mime
View raw message