Author: djencks
Date: Wed Feb 10 07:49:07 2010
New Revision: 908373
URL: http://svn.apache.org/viewvc?rev=908373&view=rev
Log:
AMQ-2601 make Activator class back into an activator, and use it in
activemq-core
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
Modified: activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=908373&r1=908372&r2=908373&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Feb 10 07:49:07 2010
@@ -179,11 +179,9 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
-
-</dependency>
-
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
<!-- not really a dependency at all - just added optionally to get the
generator working -->
<dependency>
@@ -307,7 +305,7 @@
</dependencies>
- <reporting>
+ <reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -394,6 +392,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix-version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
+ <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>
+
<DynamicImport-Package>${activemq.osgi.dynamic.import}</DynamicImport-Package>
+ <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache ActiveMQ</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+
<_versionpolicy>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy>
+ <_failok>${servicemix.osgi.failok}</_failok>
+ </instructions>
+ </configuration>
+ </plugin>
+
<!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java?rev=908373&r1=908372&r2=908373&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
Wed Feb 10 07:49:07 2010
@@ -50,15 +50,6 @@
private final ConcurrentMap<Long, BundleWrapper> bundleWrappers = new
ConcurrentHashMap<Long, BundleWrapper>();
private BundleContext bundleContext;
- /**
- * constructor for use as a blueprint bean rather than bundle activator
- * @param bundleContext
- */
- public Activator(BundleContext bundleContext) throws Exception {
- start(bundleContext);
- }
-
-
// ================================================================
// BundleActivator interface impl
// ================================================================
