Classloader issues when running in a web container

Closes #66.
dadoonet · Mar 3, 2015 · e88e520 · e88e520
1 parent bb5ab83
commit e88e520
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ Versions
 
 |   spring-elasticsearch  | elasticsearch |   Spring     | Release date |
 |:-----------------------:|:-------------:|:------------:|:------------:|
+|           1.4.2         |      1.4      |    4.1.4     |  2015-03-03  |
 |           1.4.1         |      1.4      |    4.1.4     |  2015-02-28  |
 |           1.4.0         |      1.4      |    4.1.4     |  2015-01-03  |
 |           1.3.0         |      1.3      |    4.0.6     |  2014-09-01  |
@@ -44,7 +45,7 @@ Import spring-elasticsearch in you project `pom.xml` file:
 <dependency>
   <groupId>fr.pilato.spring</groupId>
   <artifactId>spring-elasticsearch</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 	<properties>
 		<spring.version>4.1.4.RELEASE</spring.version>
 		<elasticsearch.version>1.4.4</elasticsearch.version>
-		<beyonder.version>1.4.0</beyonder.version>
+		<beyonder.version>1.4.1</beyonder.version>
 		<log4j.version>2.1</log4j.version>
 		<commons.io.version>2.4</commons.io.version>
 	</properties>
@@ -60,7 +60,6 @@
 		<url>scm:git:git@github.com:dadoonet/spring-elasticsearch.git</url>
 		<connection>scm:git:git@github.com:dadoonet/spring-elasticsearch.git</connection>
 		<developerConnection>scm:git:git@github.com:dadoonet/spring-elasticsearch.git</developerConnection>
-      <tag>HEAD</tag>
   </scm>
 
 	<issueManagement>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -3,10 +3,18 @@
           xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
 
     <body>
-        <release date="2015-02-01" description="February 2015 Release" version="1.5.0">
+        <release date="2015-03-03" description="1.4 bug fix" version="1.4.2">
+            <action issue="66" dev="dadoonet" type="fix">
+                Classloader issues when running in a web container.
+            </action>
+        </release>
+        <release date="2015-02-28" description="February 2015 Release" version="1.4.1">
             <action issue="61" dev="dadoonet" type="update">
                 [maven] changes:mail plugin uses `announcement.vm` file.
             </action>
+            <action issue="62" dev="dadoonet" type="update">
+                Move to Elasticsearch Beyonder project.
+            </action>
         </release>
         <release date="2015-01-03" description="January 2015 Release" version="1.4.0">
             <action issue="53" dev="dadoonet" type="update">

diff --git a/src/main/java/fr/pilato/spring/elasticsearch/ElasticsearchAbstractClientFactoryBean.java b/src/main/java/fr/pilato/spring/elasticsearch/ElasticsearchAbstractClientFactoryBean.java
@@ -33,6 +33,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Proxy;
+import java.net.URISyntaxException;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -418,11 +419,11 @@ private void computeMappings() {
 				}
 
 				mappings = autoMappings.toArray(new String[autoMappings.size()]);
-			} catch (IOException e) {
+			} catch (IOException|URISyntaxException e) {
 				logger.debug("Automatic discovery does not succeed for finding json files in classpath under " + classpathRoot + ".");
 				logger.trace(e);
-			}
-		}
+            }
+        }
 	}
 
 	/**
@@ -445,11 +446,11 @@ private void computeTemplates() {
 				}
 
 				templates = autoTemplates.toArray(new String[autoTemplates.size()]);
-			} catch (IOException e) {
+			} catch (IOException|URISyntaxException e) {
 				logger.debug("Automatic discovery does not succeed for finding json files in classpath under " + classpathRoot + ".");
 				logger.trace(e);
-			}
-		}
+            }
+        }
 	}
 
 	/**