Author: tolusha Date: 2012-03-03 09:45:07 -0500 (Sat, 03 Mar 2012) New Revision: 5795 Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java ws/branches/2.2.6-GA-JBAS7/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java Log: EXOJCR-1777: patch applied Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -33,6 +33,7 @@ package org.exoplatform.common.http.client; import org.exoplatform.commons.utils.PrivilegedSystemHelper; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -433,7 +434,7 @@ try { String mname = list[idx]; - DefaultModuleList.addElement(Class.forName(mname)); + DefaultModuleList.addElement(Tools.forName(mname, HTTPConnection.class)); if (LOG.isDebugEnabled()) LOG.debug("added module " + list[idx]); @@ -1950,9 +1951,9 @@ try { if (raw) - removeModule(Class.forName(modules[idx])); + removeModule(Tools.forName(modules[idx], this)); else - addModule(Class.forName(modules[idx]), -1); + addModule(Tools.forName(modules[idx], this), -1); } catch (ClassNotFoundException cnfe) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -33,6 +33,7 @@ package org.exoplatform.common.http.client; import org.exoplatform.commons.utils.PrivilegedSystemHelper; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -168,7 +169,7 @@ // get the RedirectionModule class try { - redir_mod = Class.forName("HTTPClient.RedirectionModule"); + redir_mod = Tools.forName("HTTPClient.RedirectionModule", HttpURLConnection.class); } catch (ClassNotFoundException cnfe) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -20,6 +20,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types; import org.exoplatform.ws.frameworks.json.value.JsonValue; @@ -551,7 +552,7 @@ case CLASS : try { - return Class.forName(jsonValue.getStringValue()); + return Tools.forName(jsonValue.getStringValue(), ObjectBuilder.class); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -19,6 +19,7 @@ package org.exoplatform.services.rest.impl; import org.exoplatform.commons.utils.SecurityHelper; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.xml.InitParams; @@ -76,7 +77,7 @@ { public Class run() throws ClassNotFoundException { - return Thread.currentThread().getContextClassLoader().loadClass(injectAnnotationParameter.getValue()); + return Tools.loadClass(injectAnnotationParameter.getValue(), DependencySupplier.class); } }); } Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -19,6 +19,7 @@ package org.exoplatform.services.rest.impl; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -59,7 +60,7 @@ ValueParam v = i.next(); try { - emaps.add((Class<? extends ExceptionMapper<?>>)Class.forName(v.getValue())); + emaps.add((Class<? extends ExceptionMapper<?>>)Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.impl; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -66,7 +67,7 @@ ValueParam v = i.next(); try { - fs.add((Class<? extends RequestFilter>)Class.forName(v.getValue())); + fs.add((Class<? extends RequestFilter>)Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.impl; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -64,7 +65,7 @@ ValueParam v = i.next(); try { - fs.add((Class<? extends ResponseFilter>)Class.forName(v.getValue())); + fs.add((Class<? extends ResponseFilter>)Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.impl.method; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -65,7 +66,7 @@ ValueParam v = i.next(); try { - mifs.add((Class<? extends MethodInvokerFilter>)Class.forName(v.getValue())); + mifs.add((Class<? extends MethodInvokerFilter>)Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.impl.provider; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -61,7 +62,7 @@ ValueParam v = i.next(); try { - eps.add((Class<? extends EntityProvider>)Class.forName(v.getValue())); + eps.add((Class<? extends EntityProvider>)Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) { Modified: ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java =================================================================== --- ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java 2012-03-03 14:40:07 UTC (rev 5794) +++ ws/branches/2.2.6-GA-JBAS7/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java 2012-03-03 14:45:07 UTC (rev 5795) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.impl.provider; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -52,7 +53,6 @@ * @param params initialize parameters * @see InitParams */ - @SuppressWarnings("unchecked") public JAXBContextComponentPlugin(InitParams params) { if (params != null) @@ -63,7 +63,7 @@ ValueParam v = i.next(); try { - jcs.add(Class.forName(v.getValue())); + jcs.add(Tools.forName(v.getValue(), this)); } catch (ClassNotFoundException e) {