You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/09/13 06:29:26 UTC
svn commit: r442835 - in /shale/framework/trunk:
shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/ shale-core/pom.xml
shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
Author: craigmcc
Date: Tue Sep 12 21:29:25 2006
New Revision: 442835
URL: http://svn.apache.org/viewvc?view=rev&rev=442835
Log:
Eliminate direct dependency on Commons BeanUtils in shale-core.
SHALE-280
Modified:
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/ (props changed)
shale/framework/trunk/shale-core/pom.xml
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
Propchange: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 12 21:29:25 2006
@@ -0,0 +1 @@
+.LCKcontext.xml~
Modified: shale/framework/trunk/shale-core/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/pom.xml?view=diff&rev=442835&r1=442834&r2=442835
==============================================================================
--- shale/framework/trunk/shale-core/pom.xml (original)
+++ shale/framework/trunk/shale-core/pom.xml Tue Sep 12 21:29:25 2006
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
</dependency>
Modified: shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java?view=diff&rev=442835&r1=442834&r2=442835
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java (original)
+++ shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java Tue Sep 12 21:29:25 2006
@@ -31,7 +31,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.chain.Catalog;
import org.apache.commons.chain.CatalogFactory;
import org.apache.commons.chain.Command;
@@ -211,7 +210,7 @@
// Clean up subordinate libraries as needed
CatalogFactory.clear();
- PropertyUtils.clearDescriptors();
+ cleanup();
LogFactory.release(Thread.currentThread().getContextClassLoader());
}
@@ -329,6 +328,27 @@
// --------------------------------------------------------- Private Methods
+
+
+ /**
+ * <p>Clean up the Commons BeanUtils library if it has been loaded.</p>
+ */
+ private void cleanup() {
+
+ try {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = ShaleApplicationFilter.class.getClassLoader();
+ }
+ Class clazz = loader.loadClass("org.apache.commons.beanutils.PropertyUtils");
+ Method method = clazz.getMethod("clearDescriptors", (Class[]) null);
+ method.invoke(null, (Object[]) null);
+ } catch (Exception e) {
+ ; // Swallow and ignore any exceptions
+ }
+
+ }
+
/**