From d7bf1a3eb3ed40f6159aea621ca8d2895f01adbd Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 14 Nov 2007 18:00:28 +0000 Subject: QPID-685 : Update to address dependency issues and update the NOTICE file. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@594992 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/pom.xml | 49 +++++++++---- .../apache/qpid/server/filter/XPathExpression.java | 29 ++++---- java/client/pom.xml | 22 ------ java/common/pom.xml | 12 ---- java/management/eclipse-plugin/pom.xml | 6 -- java/resources/NOTICE | 82 ++++++---------------- 6 files changed, 70 insertions(+), 130 deletions(-) (limited to 'java') diff --git a/java/broker/pom.xml b/java/broker/pom.xml index a7e22bf8d0..914a272571 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -49,12 +49,6 @@ log4j - - org.slf4j - slf4j-api - 1.4.0 - - org.slf4j slf4j-log4j12 @@ -64,11 +58,47 @@ commons-cli commons-cli + + + commons-logging + commons-logging + + commons-configuration commons-configuration + + + javax.servlet + servlet-api + + + dom4j + dom4j + + + commons-beanutils + commons-beanutils + + + commons-beanutils + commons-beanutils-core + + + commons-digester + commons-digester + + + xerces + xercesImpl + + + xml-apis + xml-apis + + @@ -82,13 +112,6 @@ junit test - - - org.easymock - easymockclassextension - test - - diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java index 2fdea208f2..f5454afae5 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java +++ b/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java @@ -20,27 +20,26 @@ package org.apache.qpid.server.filter; // Based on like named file from r450141 of the Apache ActiveMQ project // -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.server.queue.AMQMessage; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + /** * Used to evaluate an XPath Expression in a JMS selector. */ public final class XPathExpression implements BooleanExpression { - private static final Log log = LogFactory.getLog(XPathExpression.class); + private static final Logger log = Logger.getLogger(XPathExpression.class); private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.qpid.server.filter.XPathEvaluatorClassName"; private static final String DEFAULT_EVALUATOR_CLASS_NAME=XalanXPathEvaluator.class.getName(); - + private static final Constructor EVALUATOR_CONSTRUCTOR; - + static { - String cn = System.getProperty(EVALUATOR_SYSTEM_PROPERTY, DEFAULT_EVALUATOR_CLASS_NAME); + String cn = System.getProperty(EVALUATOR_SYSTEM_PROPERTY, DEFAULT_EVALUATOR_CLASS_NAME); Constructor m = null; try { try { @@ -66,14 +65,14 @@ public final class XPathExpression implements BooleanExpression { } return c.getConstructor(new Class[]{String.class}); } - + private final String xpath; private final XPathEvaluator evaluator; - + static public interface XPathEvaluator { public boolean evaluate(AMQMessage message) throws AMQException; - } - + } + XPathExpression(String xpath) { this.xpath = xpath; this.evaluator = createEvaluator(xpath); @@ -112,7 +111,7 @@ public final class XPathExpression implements BooleanExpression { public String toString() { return "XPATH "+ConstantExpression.encodeString(xpath); } - + /** * @param message * @return true if the expression evaluates to Boolean.TRUE. @@ -121,7 +120,7 @@ public final class XPathExpression implements BooleanExpression { public boolean matches(AMQMessage message) throws AMQException { Object object = evaluate(message); - return object!=null && object==Boolean.TRUE; + return object!=null && object==Boolean.TRUE; } } diff --git a/java/client/pom.xml b/java/client/pom.xml index db8bcff660..0f0757e9a3 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -69,18 +69,8 @@ commons-lang - - org.apache.mina - mina-filter-ssl - - - org.slf4j - slf4j-log4j12 - 1.4.0 - test - org.apache.qpid @@ -88,18 +78,6 @@ test - - junit - junit - test - - - - org.easymock - easymockclassextension - test - - uk.co.thebadgerset junit-toolkit diff --git a/java/common/pom.xml b/java/common/pom.xml index e4c3acf99d..b08982fde3 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -99,18 +99,6 @@ - - commons-configuration - commons-configuration - - - - commons-cli - commons-cli - - - - org.slf4j slf4j-api diff --git a/java/management/eclipse-plugin/pom.xml b/java/management/eclipse-plugin/pom.xml index 2d076a9235..7b3da3b1cf 100644 --- a/java/management/eclipse-plugin/pom.xml +++ b/java/management/eclipse-plugin/pom.xml @@ -54,12 +54,6 @@ - - com.ibm.icu - com.ibm.icu - 3.4.4 - compile - org.eclipse.jface org.eclipse.jface diff --git a/java/resources/NOTICE b/java/resources/NOTICE index f62ec14896..8100c0ab4b 100644 --- a/java/resources/NOTICE +++ b/java/resources/NOTICE @@ -10,96 +10,54 @@ This product includes software developed at Apache Software Foundation (http://www.apache.org/) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Unnamed - relaxngDatatype:relaxngDatatype:jar:20020414 (http://sourceforge.net/projects/relaxng) -License: BSD License (http://www.opensource.org/licenses/bsd-license.php) - -This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - isorelax:isorelax:jar:20020414 -License: MIT license (http://www.opensource.org/licenses/mit-license.html) - This product includes/uses software, SLF4J API Module (http://www.slf4j.org), developed by QOS.ch (http://www.qos.ch) License: MIT License (http://www.slf4j.org/license.html) -This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1, -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Digester - commons-digester:commons-digester:jar:1.6 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0 -Ideveloped by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Unnamed - msv:msv:jar:20020414 -developed by (https://msv.dev.java.net/) -License: - -This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/), -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0 -developed by Apache Software Foundation (http://www.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/), developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/) License: Public Domain (http://creativecommons.org/licenses/publicdomain) -This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1 -developed by Apache Software Foundation (http://www.apache.org) +This product includes/uses software, JUnit Toolkit (http://sourceforge.net/projects/junit-toolkit/) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl) -developed by Apache Software Foundation (http://www.apache.org) +This product includes/uses software, Apache Log4j (http://logging.apache.org/log4j/1.2) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Unnamed - xerces:xercesImpl:jar:2.2.1 -developed by The Apache Software Foundation (http://jakarta.apache.org) +This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, - javax.servlet:servlet-api:jar:2.3 - -This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0 +This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl) developed by Apache Software Foundation (http://www.apache.org) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/), -developed by The Apache Software Foundation (http://jakarta.apache.org) -License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) - This product includes/uses software, Apache MINA Java5 Extensions (http://directory.apache.org/subprojects/mina/mina-java5) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Jaxen - jaxen:jaxen:jar:1.0-FCS -License: Apache License (http://jaxen.org/faq.html) +This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/), +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, BeanUtils (http://jakarta.apache.org/commons/beanutils/) +This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4 developed by The Apache Software Foundation (http://jakarta.apache.org) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, XML Commons External Components XML APIs (http://xml.apache.org/commons/#external), -developed by Apache Software Foundation (http://www.apache.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1, +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Commons Beanutils Core - commons-beanutils:commons-beanutils-core:jar:1.7.0 -developed by The Apache Software Foundation (http://jakarta.apache.org) +This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0 +Ideveloped by Apache Software Foundation (http://www.apache.org) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4 +This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/), developed by The Apache Software Foundation (http://jakarta.apache.org) License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -This product includes/uses software, Dom4j - dom4j:dom4j:jar:1.4 -developed by MetaStuff, Ltd. (http://www.dom4j.org/) -License: BSD License (http://www.dom4j.org/license.html) - -This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS -developed by Michael Kay (http://saxon.sourceforge.net/) -License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php) +This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) +This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) -- cgit v1.2.1