You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2007/12/07 00:33:44 UTC
svn commit: r601914 - in /beehive/trunk:
controls/src/runtime/org/apache/beehive/controls/runtime/assembly/
controls/src/runtime/org/apache/beehive/controls/runtime/bean/
controls/src/runtime/org/apache/beehive/controls/runtime/generator/
netui/src/cor...
Author: crogers
Date: Thu Dec 6 15:33:40 2007
New Revision: 601914
URL: http://svn.apache.org/viewvc?rev=601914&view=rev
Log:
BEEHIVE-1209 - change ClassLoader.loadClass() to 3 arg version of Class.forName() for Java 6
Tests: controls BVT, netui BVT (WinXP passed)
Modified:
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java Thu Dec 6 15:33:40 2007
@@ -73,7 +73,7 @@
try
{
// Create the requested ControlAssemblyContext.Factory
- Class factoryClass = cl.loadClass( factoryName );
+ Class factoryClass = Class.forName(factoryName, false, cl);
ControlAssemblyContext.Factory factory = (ControlAssemblyContext.Factory)factoryClass.newInstance();
// Iterate over control types
@@ -82,7 +82,7 @@
{
// Search for applicable ControlAssemblers as specified on the control impls
String cImpl = controlTypeToImpl.get( ct );
- Class cImplClass = cl.loadClass( cImpl );
+ Class cImplClass = Class.forName(cImpl, false, cl);
ControlImplementation a = (ControlImplementation)cImplClass.getAnnotation(ControlImplementation.class);
if ( a == null )
@@ -95,7 +95,7 @@
ControlAssembler assembler = assemblerClass.newInstance();
Set<String> clients = controlTypeToClients.get( ct );
ControlAssemblyContext cac = factory.newInstance(
- cl.loadClass(ct), null, clients, moduleRoot, moduleName, srcOutputRoot );
+ Class.forName(ct, false, cl), null, clients, moduleRoot, moduleName, srcOutputRoot );
assembler.assemble( cac );
}
}
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java Thu Dec 6 15:33:40 2007
@@ -238,8 +238,8 @@
{
try
{
- Class initClass = _implClass.getClassLoader().loadClass(
- _implClass.getName() + "Initializer");
+ Class initClass = Class.forName(_implClass.getName() + "Initializer",
+ false, _implClass.getClassLoader());
_implInitializer = (ImplInitializer)initClass.newInstance();
}
catch (Exception e)
@@ -275,7 +275,7 @@
try
{
- _implClass = _controlIntf.getClassLoader().loadClass(implBinding);
+ _implClass = Class.forName(implBinding, false, _controlIntf.getClassLoader());
//
// Validate that the specified implementation class has an @ControlImplementation
@@ -976,7 +976,7 @@
{
try
{
- i = (Interceptor) getControlService( getControlBeanContext().getClassLoader().loadClass( n ), null );
+ i = (Interceptor) getControlService(Class.forName(n, false, getControlBeanContext().getClassLoader()), null );
}
catch ( Exception e )
{
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java Thu Dec 6 15:33:40 2007
@@ -985,7 +985,7 @@
{
ClassLoader loader = getExternalClassLoader();
- Class checkerClass = loader.loadClass( checkerName );
+ Class checkerClass = Class.forName(checkerName, false, loader);
if ( !ControlChecker.class.isAssignableFrom(checkerClass) )
{
_ap.printError( intfDecl, "control.interface.illegal.checker", intfDecl.getSimpleName(), checkerName );
Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java Thu Dec 6 15:33:40 2007
@@ -41,7 +41,7 @@
try
{
- Class actualFactoryType = cl.loadClass( className );
+ Class actualFactoryType = Class.forName(className, false, cl);
if ( ! factoryType.isAssignableFrom( actualFactoryType ) )
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Thu Dec 6 15:33:40 2007
@@ -1847,7 +1847,7 @@
if ( className != null )
{
- pageServletClass = cl.loadClass( className );
+ pageServletClass = Class.forName(className, false, cl);
if ( Servlet.class.isAssignableFrom( pageServletClass ) )
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java Thu Dec 6 15:33:40 2007
@@ -225,7 +225,7 @@
try
{
- Class handlerClass = cl.loadClass( className );
+ Class handlerClass = Class.forName(className, false, cl);
if ( ! baseClassOrInterface.isAssignableFrom( handlerClass ) )
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java Thu Dec 6 15:33:40 2007
@@ -128,7 +128,7 @@
try
{
- Class interceptorClass = cl.loadClass( className );
+ Class interceptorClass = Class.forName(className, false, cl);
if ( ! baseClassOrInterface.isAssignableFrom( interceptorClass ) )
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java Thu Dec 6 15:33:40 2007
@@ -181,11 +181,11 @@
{
synchronized ( this )
{
- return _pageFlowClassLoader.loadClass( className );
+ return Class.forName(className, false, _pageFlowClassLoader);
}
}
- return DiscoveryUtils.getClassLoader().loadClass( className );
+ return Class.forName(className, false, DiscoveryUtils.getClassLoader());
}
public URL getResource(String name)
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java Thu Dec 6 15:33:40 2007
@@ -210,7 +210,7 @@
try
{
- Class formatterClass = cl.loadClass( className );
+ Class formatterClass = Class.forName(className, false, cl);
if ( ! TemplatedURLFormatter.class.isAssignableFrom( formatterClass ) )
{
_log.error( "The templated-url-formatter-class, " + className
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java Thu Dec 6 15:33:40 2007
@@ -67,7 +67,7 @@
// create an instance of the def template formatter class
ClassLoader cl = DiscoveryUtils.getClassLoader();
try {
- Class rendererClass = cl.loadClass(className);
+ Class rendererClass = Class.forName(className, false, cl);
if (!TreeRenderer.class.isAssignableFrom(rendererClass)) {
_log.error("The tree renderer class, " + className
+ ", does not extend TreeRenderer.");
Modified: beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java (original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java Thu Dec 6 15:33:40 2007
@@ -46,7 +46,7 @@
//
// See if our helper interface is in the common classloader.
//
- DiscoveryUtils.getClassLoader().loadClass( HELPER_INTERFACE_CLASSNAME );
+ Class.forName(HELPER_INTERFACE_CLASSNAME, false, DiscoveryUtils.getClassLoader());
}
catch ( ClassNotFoundException e )
{
Modified: beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java (original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java Thu Dec 6 15:33:40 2007
@@ -46,7 +46,7 @@
//
// See if our helper interface is in the common classloader.
//
- DiscoveryUtils.getClassLoader().loadClass( HELPER_INTERFACE_CLASSNAME );
+ Class.forName(HELPER_INTERFACE_CLASSNAME, false, DiscoveryUtils.getClassLoader());
}
catch ( ClassNotFoundException e )
{
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java Thu Dec 6 15:33:40 2007
@@ -175,7 +175,7 @@
+ ": " + className );
}
- Class implementorClass = classLoader.loadClass( className );
+ Class implementorClass = Class.forName(className, false, classLoader);
if ( interfaceType.isAssignableFrom( implementorClass ) )
{
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java Thu Dec 6 15:33:40 2007
@@ -200,7 +200,7 @@
String className = "org.apache.beehive.netui.util.logging.internal.Log4JLogger";
try {
- Class logDelegateClass = Logger.class.getClassLoader().loadClass(className);
+ Class logDelegateClass = Class.forName(className, false, Logger.class.getClassLoader());
Method method = logDelegateClass.getMethod("getInstance", new Class[] {Class.class});
return (Log)method.invoke(null, new Object[] {loggerClient});
}