You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jl...@apache.org on 2006/09/26 11:50:00 UTC
svn commit: r449965 - in /incubator/activemq/trunk: activemq-core/
activemq-core/src/main/java/org/apache/activemq/filter/ activemq-optional/
activemq-optional/src/main/java/org/apache/activemq/filter/
Author: jlim
Date: Tue Sep 26 02:49:55 2006
New Revision: 449965
URL: http://svn.apache.org/viewvc?view=rev&rev=449965
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-851 - reduce dependencies of the activemq-core POM to only minimal stuff. moved xpath filtering components to activemq-optional
Added:
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java
Removed:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java
Modified:
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-optional/pom.xml
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?view=diff&rev=449965&r1=449964&r2=449965
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Tue Sep 26 02:49:55 2006
@@ -138,26 +138,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean_xpath</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<scope>runtime</scope>
@@ -173,11 +153,6 @@
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<optional>true</optional>
- </dependency>
- <dependency>
- <groupId>activesoap</groupId>
- <artifactId>jaxp-api</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: incubator/activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/pom.xml?view=diff&rev=449965&r1=449964&r2=449965
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (original)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Tue Sep 26 02:49:55 2006
@@ -104,8 +104,39 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
+
+
<build>
Added: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java?view=auto&rev=449965
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java (added)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java Tue Sep 26 02:49:55 2006
@@ -0,0 +1,78 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.filter;
+
+import java.io.StringReader;
+
+import javax.jms.BytesMessage;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.activemq.command.Message;
+import org.apache.activemq.util.ByteArrayInputStream;
+import org.xml.sax.InputSource;
+
+public class JAXPXPathEvaluator implements XPathExpression.XPathEvaluator {
+
+ private static final XPathFactory factory = XPathFactory.newInstance();
+ private javax.xml.xpath.XPathExpression expression;
+
+ public JAXPXPathEvaluator(String xpathExpression) {
+ try {
+ XPath xpath = factory.newXPath();
+ expression = xpath.compile(xpathExpression);
+ } catch (XPathExpressionException e) {
+ throw new RuntimeException("Invalid XPath expression: "+xpathExpression);
+ }
+ }
+
+ public boolean evaluate(Message message) throws JMSException {
+ if( message instanceof TextMessage ) {
+ String text = ((TextMessage)message).getText();
+ return evaluate(text);
+ } else if ( message instanceof BytesMessage ) {
+ BytesMessage bm = (BytesMessage) message;
+ byte data[] = new byte[(int) bm.getBodyLength()];
+ bm.readBytes(data);
+ return evaluate(data);
+ }
+ return false;
+ }
+
+ private boolean evaluate(byte[] data) {
+ try {
+ InputSource inputSource = new InputSource(new ByteArrayInputStream(data));
+ return ((Boolean)expression.evaluate(inputSource, XPathConstants.BOOLEAN)).booleanValue();
+ } catch (XPathExpressionException e) {
+ return false;
+ }
+ }
+
+ private boolean evaluate(String text) {
+ try {
+ InputSource inputSource = new InputSource(new StringReader(text));
+ return ((Boolean)expression.evaluate(inputSource, XPathConstants.BOOLEAN)).booleanValue();
+ } catch (XPathExpressionException e) {
+ return false;
+ }
+ }
+}
Added: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java?view=auto&rev=449965
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java (added)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java Tue Sep 26 02:49:55 2006
@@ -0,0 +1,62 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.filter;
+
+import javax.jms.BytesMessage;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.command.Message;
+import org.apache.activemq.util.ByteArrayInputStream;
+import org.apache.xmlbeans.XmlObject;
+
+public class XMLBeansXPathEvaluator implements XPathExpression.XPathEvaluator {
+
+ private final String xpath;
+
+ public XMLBeansXPathEvaluator(String xpath) {
+ this.xpath = xpath;
+ }
+
+ public boolean evaluate(Message message) throws JMSException {
+ if( message instanceof TextMessage ) {
+ String text = ((TextMessage)message).getText();
+ try {
+ XmlObject object = XmlObject.Factory.parse(text);
+ XmlObject[] objects = object.selectPath(xpath);
+ return object!=null && objects.length>0;
+ } catch (Throwable e) {
+ return false;
+ }
+
+ } else if ( message instanceof BytesMessage ) {
+ BytesMessage bm = (BytesMessage) message;
+ byte data[] = new byte[(int) bm.getBodyLength()];
+ bm.readBytes(data);
+ try {
+ XmlObject object = XmlObject.Factory.parse(new ByteArrayInputStream(data));
+ XmlObject[] objects = object.selectPath(xpath);
+ return object!=null && objects.length>0;
+ } catch (Throwable e) {
+ return false;
+ }
+ }
+ return false;
+ }
+}