Author: aco
Date: Mon Feb 18 06:52:56 2008
New Revision: 628764
URL: http://svn.apache.org/viewvc?rev=628764&view=rev
Log:
Fix typo: https://issues.apache.org/activemq/browse/AMQ-1565
Added explicit version for maven-antrun-plugin
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
activemq/trunk/pom.xml
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java?rev=628764&r1=628763&r2=628764&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
Mon Feb 18 06:52:56 2008
@@ -40,7 +40,7 @@
try {
return
(BrokerFactoryHandler)BROKER_FACTORY_HANDLER_FINDER.newInstance(type);
} catch (Throwable e) {
- throw IOExceptionSupport.create("Could load " + type + " factory:"
+ e, e);
+ throw IOExceptionSupport.create("Could not load " + type + "
factory:" + e, e);
}
}
Modified: activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=628764&r1=628763&r2=628764&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Feb 18 06:52:56 2008
@@ -964,6 +964,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -988,22 +993,22 @@
</archive>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${felix-version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
-
<Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
- <Export-Package>${activemq.osgi.export}</Export-Package>
- <Import-Package>${activemq.osgi.import}</Import-Package>
- <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
- <Implementation-Title>Apache ActiveMQ</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- </instructions>
- </configuration>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix-version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+
<Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${activemq.osgi.export}</Export-Package>
+ <Import-Package>${activemq.osgi.import}</Import-Package>
+ <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache ActiveMQ</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-one-plugin</artifactId>
