Author: jalkanen
Date: Sun Mar 30 03:35:37 2008
New Revision: 642702
URL: http://svn.apache.org/viewvc?rev=642702&view=rev
Log:
Removed JDK 1.4 dependency, simplified code.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java?rev=642702&r1=642701&r2=642702&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
Sun Mar 30 03:35:37 2008
@@ -59,24 +59,9 @@
public AdminBeanManager( WikiEngine engine )
{
- if( SystemUtils.isJavaVersionAtLeast(1.5f) )
- {
- log.info("Using JDK 1.5 Platform MBeanServer");
- m_mbeanServer = MBeanServerFactory15.getServer();
- }
- else
- {
- log.info("Finding a JDK 1.4 -compatible MBeanServer.");
- try
- {
- m_mbeanServer = MBeanServerFactory14.getServer();
- }
- catch( Exception e )
- {
- log.error("Unable to locate the JMX libraries from your
classpath. "+
- "Please make sure that \"jmxri.jar\" can be found in
your WEB-INF/lib directory.");
- }
- }
+ log.info("Using JDK 1.5 Platform MBeanServer");
+ m_mbeanServer = MBeanServerFactory15.getServer();
+
m_engine = engine;
if( m_mbeanServer != null )
@@ -260,37 +245,6 @@
}
return null;
- }
-
- /**
- * A JDK 1.4 version of something which gets us the MBeanServer. It
- * binds to the first server it can find.
- *
- * @author Janne Jalkanen
- *
- */
- private static final class MBeanServerFactory14
- {
- private MBeanServerFactory14()
- {}
-
- public static MBeanServer getServer()
- {
- MBeanServer server;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-
- if( servers == null || servers.size() == 0 )
- {
- log.info("Creating a new MBeanServer...");
- server = MBeanServerFactory.createMBeanServer(Release.APPNAME);
- }
- else
- {
- server = (MBeanServer)servers.get(0);
- }
-
- return server;
- }
}
/**
