Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-2601 make Activator class back into an activator, and use it in activemq-core 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@908373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Jencks 2010-02-10 07:49:07 +00:00
parent 09fab742ff
commit fa9f4ac9cc
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
activemq-core/pom.xml
View File

@ -179,11 +179,9 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
</dependency>
</dependency>
<!-- not really a dependency at all - just added optionally to get the generator working --> <!-- not really a dependency at all - just added optionally to get the generator working -->
<dependency> <dependency>
@ -307,7 +305,7 @@
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -394,6 +392,28 @@
<build> <build>
<plugins> <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 --> <!-- Configure which tests are included/excuded -->
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

9
activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
View File

@ -50,15 +50,6 @@ public class Activator implements BundleActivator, SynchronousBundleListener, Ob
private final ConcurrentMap<Long, BundleWrapper> bundleWrappers = new ConcurrentHashMap<Long, BundleWrapper>(); private final ConcurrentMap<Long, BundleWrapper> bundleWrappers = new ConcurrentHashMap<Long, BundleWrapper>();
private BundleContext bundleContext; 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 // BundleActivator interface impl
// ================================================================ // ================================================================