You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/11/14 19:00:30 UTC
svn commit: r594992 - in /incubator/qpid/branches/M2/java: broker/pom.xml
broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
client/pom.xml common/pom.xml management/eclipse-plugin/pom.xml
resources/NOTICE
Author: ritchiem
Date: Wed Nov 14 10:00:28 2007
New Revision: 594992
URL: http://svn.apache.org/viewvc?rev=594992&view=rev
Log:
QPID-685 : Update to address dependency issues and update the NOTICE file.
Modified:
incubator/qpid/branches/M2/java/broker/pom.xml
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
incubator/qpid/branches/M2/java/client/pom.xml
incubator/qpid/branches/M2/java/common/pom.xml
incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml
incubator/qpid/branches/M2/java/resources/NOTICE
Modified: incubator/qpid/branches/M2/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/pom.xml?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2/java/broker/pom.xml Wed Nov 14 10:00:28 2007
@@ -50,12 +50,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.0</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.0</version>
@@ -64,11 +58,47 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -82,13 +112,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java Wed Nov 14 10:00:28 2007
@@ -20,27 +20,26 @@
// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
//
-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 @@
}
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 String toString() {
return "XPATH "+ConstantExpression.encodeString(xpath);
}
-
+
/**
* @param message
* @return true if the expression evaluates to Boolean.TRUE.
@@ -121,7 +120,7 @@
public boolean matches(AMQMessage message) throws AMQException
{
Object object = evaluate(message);
- return object!=null && object==Boolean.TRUE;
+ return object!=null && object==Boolean.TRUE;
}
}
Modified: incubator/qpid/branches/M2/java/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/pom.xml?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/client/pom.xml (original)
+++ incubator/qpid/branches/M2/java/client/pom.xml Wed Nov 14 10:00:28 2007
@@ -69,34 +69,12 @@
<artifactId>commons-lang</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- </dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
- </dependency>
<dependency> <!-- for inVm Broker -->
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/qpid/branches/M2/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/pom.xml?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/common/pom.xml (original)
+++ incubator/qpid/branches/M2/java/common/pom.xml Wed Nov 14 10:00:28 2007
@@ -100,18 +100,6 @@
<dependencies>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
-
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.0</version>
Modified: incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml (original)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml Wed Nov 14 10:00:28 2007
@@ -55,12 +55,6 @@
<dependencies>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>com.ibm.icu</artifactId>
- <version>3.4.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jface</groupId>
<artifactId>org.eclipse.jface</artifactId>
<version>3.2.0</version>
Modified: incubator/qpid/branches/M2/java/resources/NOTICE
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/resources/NOTICE?rev=594992&r1=594991&r2=594992&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/resources/NOTICE (original)
+++ incubator/qpid/branches/M2/java/resources/NOTICE Wed Nov 14 10:00:28 2007
@@ -10,96 +10,54 @@
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)