diff --git a/.classpath b/.classpath index 4b738f9c83b..a6b26c8e0fb 100644 --- a/.classpath +++ b/.classpath @@ -89,15 +89,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/LICENSE b/LICENSE index ece47d5451d..282c3fe131b 100644 --- a/LICENSE +++ b/LICENSE @@ -75,15 +75,15 @@ framework/base/lib/scripting/jansi-1.2.1.jar framework/base/lib/xmlrpc-client-3.1.2.jar framework/base/lib/xmlrpc-common-3.1.2.jar framework/base/lib/xmlrpc-server-3.1.2.jar -framework/catalina/lib/tomcat-7.0.57-catalina-ha.jar -framework/catalina/lib/tomcat-7.0.57-catalina-tribes.jar -framework/catalina/lib/tomcat-7.0.57-catalina.jar -framework/catalina/lib/tomcat-7.0.57-jasper.jar -framework/catalina/lib/tomcat-7.0.57-tomcat-api.jar -framework/catalina/lib/tomcat-7.0.57-tomcat-coyote.jar -framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar -framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar -framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar +framework/catalina/lib/tomcat-7.0.59-catalina-ha.jar +framework/catalina/lib/tomcat-7.0.59-catalina-tribes.jar +framework/catalina/lib/tomcat-7.0.59-catalina.jar +framework/catalina/lib/tomcat-7.0.59-jasper.jar +framework/catalina/lib/tomcat-7.0.59-tomcat-api.jar +framework/catalina/lib/tomcat-7.0.59-tomcat-coyote.jar +framework/catalina/lib/tomcat-7.0.59-tomcat-util.jar +framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli.jar +framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli-adapters.jar framework/entity/lib/commons-dbcp2-2.1.jar framework/entity/lib/jdbc/derby-10.11.1.1.jar framework/service/lib/axiom-api-1.2.9.jar diff --git a/framework/catalina/lib/tomcat-7.0.57-catalina-ha.jar b/framework/catalina/lib/tomcat-7.0.59-catalina-ha.jar similarity index 81% rename from framework/catalina/lib/tomcat-7.0.57-catalina-ha.jar rename to framework/catalina/lib/tomcat-7.0.59-catalina-ha.jar index e36cd98c62d..dd0d854ea8c 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-catalina-ha.jar and b/framework/catalina/lib/tomcat-7.0.59-catalina-ha.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-catalina-tribes.jar b/framework/catalina/lib/tomcat-7.0.59-catalina-tribes.jar similarity index 86% rename from framework/catalina/lib/tomcat-7.0.57-catalina-tribes.jar rename to framework/catalina/lib/tomcat-7.0.59-catalina-tribes.jar index 53897c4610a..e959bf8652a 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-catalina-tribes.jar and b/framework/catalina/lib/tomcat-7.0.59-catalina-tribes.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-catalina.jar b/framework/catalina/lib/tomcat-7.0.59-catalina.jar similarity index 78% rename from framework/catalina/lib/tomcat-7.0.57-catalina.jar rename to framework/catalina/lib/tomcat-7.0.59-catalina.jar index b93055d1d8b..6de1cbe4c21 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-catalina.jar and b/framework/catalina/lib/tomcat-7.0.59-catalina.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-jasper.jar b/framework/catalina/lib/tomcat-7.0.59-jasper.jar similarity index 87% rename from framework/catalina/lib/tomcat-7.0.57-jasper.jar rename to framework/catalina/lib/tomcat-7.0.59-jasper.jar index 427e0cc42a5..13d82fea0a1 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-jasper.jar and b/framework/catalina/lib/tomcat-7.0.59-jasper.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-tomcat-api.jar b/framework/catalina/lib/tomcat-7.0.59-tomcat-api.jar similarity index 80% rename from framework/catalina/lib/tomcat-7.0.57-tomcat-api.jar rename to framework/catalina/lib/tomcat-7.0.59-tomcat-api.jar index 046917466d5..9eea1c71312 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-tomcat-api.jar and b/framework/catalina/lib/tomcat-7.0.59-tomcat-api.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-tomcat-coyote.jar b/framework/catalina/lib/tomcat-7.0.59-tomcat-coyote.jar similarity index 76% rename from framework/catalina/lib/tomcat-7.0.57-tomcat-coyote.jar rename to framework/catalina/lib/tomcat-7.0.59-tomcat-coyote.jar index e2886ad37c2..078ff4c4f75 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-tomcat-coyote.jar and b/framework/catalina/lib/tomcat-7.0.59-tomcat-coyote.jar differ diff --git a/framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar b/framework/catalina/lib/tomcat-7.0.59-tomcat-util.jar similarity index 90% rename from framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar rename to framework/catalina/lib/tomcat-7.0.59-tomcat-util.jar index 4f92cd8548b..8243771ba2b 100644 Binary files a/framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar and b/framework/catalina/lib/tomcat-7.0.59-tomcat-util.jar differ diff --git a/framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar b/framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli-adapters.jar similarity index 92% rename from framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar rename to framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli-adapters.jar index 1eedbfc5d29..3b3af73690b 100644 Binary files a/framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar and b/framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli-adapters.jar differ diff --git a/framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar b/framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli.jar similarity index 80% rename from framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar rename to framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli.jar index b09bf783dc7..8a3f323298a 100644 Binary files a/framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar and b/framework/catalina/lib/tomcat-extras-7.0.59-tomcat-juli.jar differ