You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/07 22:22:31 UTC
svn commit: r1406814 - in /activemq/trunk:
activemq-broker/src/main/java/org/apache/activemq/filter/ activemq-client/
activemq-client/src/main/java/org/apache/activemq/filter/
activemq-client/src/main/java/org/apache/activemq/util/
activemq-openwire-le...
Author: chirino
Date: Wed Nov 7 21:22:30 2012
New Revision: 1406814
URL: http://svn.apache.org/viewvc?rev=1406814&view=rev
Log:
Clean up activemq-client pom, removed un-needed dependencies and plugins. Move XPath evaluator to the broker.
Added:
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/filter/
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
- copied, changed from r1406795, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
Removed:
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
Modified:
activemq/trunk/activemq-client/pom.xml
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
activemq/trunk/activemq-openwire-legacy/pom.xml
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java (from r1406795, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java&p1=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java&r1=1406795&r2=1406814&rev=1406814&view=diff
==============================================================================
(empty)
Modified: activemq/trunk/activemq-client/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/pom.xml?rev=1406814&r1=1406813&r2=1406814&view=diff
==============================================================================
--- activemq/trunk/activemq-client/pom.xml (original)
+++ activemq/trunk/activemq-client/pom.xml Wed Nov 7 21:22:30 2012
@@ -46,95 +46,23 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activeio-core</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.fusesource.mqtt-client</groupId>
- <artifactId>mqtt-client</artifactId>
- </dependency>
- <!-- =============================== -->
- <!-- Optional Dependencies -->
- <!-- =============================== -->
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jaas</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <optional>true</optional>
- </dependency>
+ <!-- would be nice if we could make this dependency optional -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- for XML parsing -->
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <optional>true</optional>
- </dependency>
+ <!-- for ftp blob upload/download -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
+ <optional>true</optional>
</dependency>
-
- <!-- not really a dependency at all - just added optionally to get the generator working -->
+ <!-- for zerconf discovery -->
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-generator</artifactId>
+ <groupId>javax.jmdns</groupId>
+ <artifactId>jmdns</artifactId>
<optional>true</optional>
</dependency>
@@ -147,122 +75,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.jmdns</groupId>
- <artifactId>jmdns</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt-spring3</artifactId>
- <version>${jasypt-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.26</version>
- <scope>test</scope>
- </dependency>
-
- <!-- database testing -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Joram JMS conformance tests -->
- <dependency>
- <groupId>org.fusesource.joram-jms-tests</groupId>
- <artifactId>joram-jms-tests</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- LDAP tests -->
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-integ</artifactId>
- <version>${directory-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-integ</artifactId>
- <version>${directory-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <version>${ftpserver-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<reporting>
@@ -366,37 +182,6 @@
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only.
- It has no influence on the Maven build itself.-->
- <!-- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <versionRange>[0.0.0,)</versionRange>
- <goals>
- <goal>compile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin> -->
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
@@ -446,22 +231,12 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <check>
- <branchRate>50</branchRate>
- <lineRate>50</lineRate>
- <haltOnFailure>true</haltOnFailure>
- <totalBranchRate>50</totalBranchRate>
- <totalLineRate>50</totalLineRate>
- </check>
- </configuration>
- </plugin>
+
</plugins>
</build>
- <profiles>
+
+ <profiles>
+ <!-- Execute with: mvn -P openwire-generate antrun:run -->
<profile>
<id>openwire-generate</id>
<dependencies>
@@ -481,18 +256,18 @@
<execution>
<id>default</id>
<phase>generate-sources</phase>
- <configuration>
- <tasks>
- <echo>Running OpenWire Generator</echo>
- <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
- <generate version="9" basedir="${basedir}" />
- </tasks>
- </configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <tasks>
+ <echo>Running OpenWire Generator</echo>
+ <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
+ <generate version="9" basedir="${basedir}" />
+ </tasks>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java?rev=1406814&r1=1406813&r2=1406814&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java (original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java Wed Nov 7 21:22:30 2012
@@ -34,7 +34,7 @@ public final class XPathExpression imple
private static final Logger LOG = LoggerFactory.getLogger(XPathExpression.class);
private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.activemq.XPathEvaluatorClassName";
- private static final String DEFAULT_EVALUATOR_CLASS_NAME = XalanXPathEvaluator.class.getName();
+ private static final String DEFAULT_EVALUATOR_CLASS_NAME = "org.apache.activemq.filter.XalanXPathEvaluator";
private static final Constructor EVALUATOR_CONSTRUCTOR;
Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java?rev=1406814&r1=1406813&r2=1406814&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java (original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java Wed Nov 7 21:22:30 2012
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.command.ActiveMQDestination;
-import org.springframework.util.StringUtils;
/**
* Special converter for String -> List<ActiveMQDestination> to be used instead of a
@@ -41,7 +40,7 @@ public class StringToListOfActiveMQDesti
String text = value.toString();
if (text.startsWith("[") && text.endsWith("]")) {
text = text.substring(1, text.length() - 1);
- String[] array = StringUtils.delimitedListToStringArray(text, ",", null);
+ String[] array = text.split(",");
List<ActiveMQDestination> list = new ArrayList<ActiveMQDestination>();
for (String item : array) {
Modified: activemq/trunk/activemq-openwire-legacy/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-openwire-legacy/pom.xml?rev=1406814&r1=1406813&r2=1406814&view=diff
==============================================================================
--- activemq/trunk/activemq-openwire-legacy/pom.xml (original)
+++ activemq/trunk/activemq-openwire-legacy/pom.xml Wed Nov 7 21:22:30 2012
@@ -38,10 +38,10 @@
<!-- =============================== -->
<!-- Required Dependencies -->
<!-- =============================== -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
@@ -60,11 +60,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>