[exo-jcr-commits] exo-jcr SVN: r5419 - in ws/branches/2.3.x: exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Jan 4 06:48:56 EST 2012
Author: tolusha
Date: 2012-01-04 06:48:55 -0500 (Wed, 04 Jan 2012)
New Revision: 5419
Modified:
ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java
ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java
ws/branches/2.3.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java
ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java
Log:
EXOJCR-1580: Make eXo JCR supports JBoss AS7
Modified: ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java
===================================================================
--- ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -33,6 +33,7 @@
package org.exoplatform.common.http.client;
import org.exoplatform.commons.utils.PrivilegedSystemHelper;
+import org.exoplatform.commons.utils.ClassLoading;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -429,7 +430,7 @@
try
{
String mname = list[idx];
- DefaultModuleList.addElement(Class.forName(mname));
+ DefaultModuleList.addElement(ClassLoading.forName(mname, HTTPConnection.class));
if (log.isDebugEnabled())
log.debug("added module " + list[idx]);
@@ -1924,9 +1925,9 @@
try
{
if (raw)
- removeModule(Class.forName(modules[idx]));
+ removeModule(ClassLoading.forName(modules[idx], this));
else
- addModule(Class.forName(modules[idx]), -1);
+ addModule(ClassLoading.forName(modules[idx], this), -1);
}
catch (ClassNotFoundException cnfe)
{
Modified: ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java
===================================================================
--- ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -33,6 +33,7 @@
package org.exoplatform.common.http.client;
import org.exoplatform.commons.utils.PrivilegedSystemHelper;
+import org.exoplatform.commons.utils.ClassLoading;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -162,7 +163,7 @@
// get the RedirectionModule class
try
{
- redir_mod = Class.forName("HTTPClient.RedirectionModule");
+ redir_mod = ClassLoading.forName("HTTPClient.RedirectionModule", HttpURLConnection.class);
}
catch (ClassNotFoundException cnfe)
{
Modified: ws/branches/2.3.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java
===================================================================
--- ws/branches/2.3.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.ws.frameworks.json.impl;
+import org.exoplatform.commons.utils.ClassLoading;
import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types;
import org.exoplatform.ws.frameworks.json.value.JsonValue;
@@ -487,7 +488,7 @@
case CLASS :
try
{
- return Class.forName(jsonValue.getStringValue());
+ return ClassLoading.forName(jsonValue.getStringValue(), ObjectBuilder.class);
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -19,6 +19,7 @@
package org.exoplatform.services.rest.impl;
import org.exoplatform.commons.utils.SecurityHelper;
+import org.exoplatform.commons.utils.ClassLoading;
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 ClassLoading.loadClass(injectAnnotationParameter.getValue(), DependencySupplier.class);
}
});
}
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ExceptionMapperComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -19,6 +19,7 @@
package org.exoplatform.services.rest.impl;
+import org.exoplatform.commons.utils.ClassLoading;
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<?>>)ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestFilterComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.rest.impl;
+import org.exoplatform.commons.utils.ClassLoading;
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>)ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResponseFilterComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.rest.impl;
+import org.exoplatform.commons.utils.ClassLoading;
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>)ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/MethodInvokerFilterComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.rest.impl.method;
+import org.exoplatform.commons.utils.ClassLoading;
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>)ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/EntityProviderComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.rest.impl.provider;
+import org.exoplatform.commons.utils.ClassLoading;
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>)ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
Modified: ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java 2012-01-04 11:44:01 UTC (rev 5418)
+++ ws/branches/2.3.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBContextComponentPlugin.java 2012-01-04 11:48:55 UTC (rev 5419)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.rest.impl.provider;
+import org.exoplatform.commons.utils.ClassLoading;
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(ClassLoading.forName(v.getValue(), this));
}
catch (ClassNotFoundException e)
{
More information about the exo-jcr-commits
mailing list