[jboss-cvs] JBossAS SVN: r95976 - trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-11-03 15:32:25 -0500 (Tue, 03 Nov 2009)
New Revision: 95976

Added:
   trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SecurityActions.java
Modified:
   trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
   trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
   trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java
Log:
[JBAS-7426] Use the TCCL for loading notifications.xml and attributes.xml

Modified: trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
===================================================================
--- trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java	2009-11-03 20:30:52 UTC (rev 95975)
+++ trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java	2009-11-03 20:32:25 UTC (rev 95976)
@@ -369,7 +369,7 @@
       try
       {
          // locate resource
-         is = getClass().getResourceAsStream(resourceName);
+         is = SecurityActions.getThreadContextClassLoaderResource(resourceName);
          
          // create unmarshaller
          Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();

Copied: trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SecurityActions.java (from rev 95975, branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SecurityActions.java)
===================================================================
--- trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SecurityActions.java	                        (rev 0)
+++ trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SecurityActions.java	2009-11-03 20:32:25 UTC (rev 95976)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jmx.adaptor.snmp.agent;
+
+import java.io.InputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * SecurityActions
+ * 
+ * Package-private class to encapsulate secure methods.
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+class SecurityActions
+{
+
+   //-------------------------------------------------------------------------------------||
+   // Constructor ------------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * No instantiation
+    */
+   private SecurityActions()
+   {
+      throw new UnsupportedOperationException("No instances permitted");
+   }
+
+   //-------------------------------------------------------------------------------------||
+   // Functional Methods -----------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * Returns an {@link InputStream} to the ClassLoadder resource
+    * (using the TCCL) denoted by the specified name
+    * 
+    * @param resourceName
+    * @throws IllegalArgumentException If the specified name could not be found/loaded by the TCCL
+    */
+   static InputStream getThreadContextClassLoaderResource(final String resourceName) throws IllegalArgumentException
+   {
+      final ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+      {
+         @Override
+         public ClassLoader run()
+         {
+            return Thread.currentThread().getContextClassLoader();
+         }
+      });
+      final InputStream in = cl.getResourceAsStream(resourceName);
+      if (in == null)
+      {
+         throw new IllegalStateException("Cannot locate classloader resource \"" + resourceName + "\" using " + cl);
+      }
+      return in;
+   }
+
+}

Modified: trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
===================================================================
--- trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java	2009-11-03 20:30:52 UTC (rev 95975)
+++ trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java	2009-11-03 20:32:25 UTC (rev 95976)
@@ -235,19 +235,7 @@
       {
          // locate managers.xml
          final String resName = this.managersResName;
-         final ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
-         {
-            @Override
-            public ClassLoader run()
-            {
-               return Thread.currentThread().getContextClassLoader();
-            }
-         });
-         is = cl.getResourceAsStream(resName);
-         if (is == null)
-         {
-            throw new IllegalStateException("Cannot locate classloader resource: " + resName);
-         }
+         is = SecurityActions.getThreadContextClassLoaderResource(resName);
          
          // create unmarshaller
          Unmarshaller unmarshaller = UnmarshallerFactory.newInstance()

Modified: trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java
===================================================================
--- trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java	2009-11-03 20:30:52 UTC (rev 95975)
+++ trunk/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java	2009-11-03 20:32:25 UTC (rev 95976)
@@ -20,6 +20,8 @@
 package org.jboss.jmx.adaptor.snmp.agent;
 
 import java.io.InputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -145,7 +147,8 @@
       try
       {
          // locate notifications.xml
-         is = this.getClass().getResourceAsStream(notificationMapResName);
+         final String resName = notificationMapResName;
+         is = SecurityActions.getThreadContextClassLoaderResource(resName);
          
          // create unmarshaller
          Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();