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

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@449965 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonas B. Lim 2006-09-26 09:49:55 +00:00
parent 8427665555
commit 2b11b8c36d
4 changed files with 171 additions and 165 deletions

View File

@ -137,26 +137,6 @@
<artifactId>smackx</artifactId>
<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>
@ -174,11 +154,6 @@
<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>
<artifactId>xbean-spring</artifactId>

View File

@ -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>

View File

@ -1,78 +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;
}
}
}
/**
*
* 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;
}
}
}

View File

@ -1,62 +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;
}
}
/**
*
* 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;
}
}