mirror of https://github.com/apache/activemq.git
https://issues.apache.org/activemq/browse/AMQ-2570 - unsuccessful attempt to osgify the web console, karaf and amq spring versions clashes, saving this to try again when we upgrade spring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@902134 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6efc268572
commit
96f2622053
|
@ -44,10 +44,10 @@
|
||||||
WEB-INF/lib/xml-apis*.jar,
|
WEB-INF/lib/xml-apis*.jar,
|
||||||
WEB-INF/lib/xerces*.jar
|
WEB-INF/lib/xerces*.jar
|
||||||
</warSourceExcludes>
|
</warSourceExcludes>
|
||||||
<archive>
|
<!-- <archive>
|
||||||
<!-- add the generated manifest to the war -->
|
|
||||||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
|
-->
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
<scanIntervalSeconds>10</scanIntervalSeconds>
|
<scanIntervalSeconds>10</scanIntervalSeconds>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<!-- <plugin>
|
||||||
<groupId>org.apache.felix</groupId>
|
<groupId>org.apache.felix</groupId>
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
|
@ -121,10 +121,12 @@
|
||||||
<Web-ContextPath>activemqweb</Web-ContextPath>
|
<Web-ContextPath>activemqweb</Web-ContextPath>
|
||||||
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
|
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
|
||||||
<Embed-Directory>WEB-INF/lib</Embed-Directory>
|
<Embed-Directory>WEB-INF/lib</Embed-Directory>
|
||||||
<!-- use <Embed-Dependencies> to add other libs -->
|
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
|
||||||
|
<Embed-Transitive>true</Embed-Transitive>
|
||||||
|
<Import-Package>*;resolution:=optional</Import-Package>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin> -->
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
@ -289,6 +291,11 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<jetty.port>8080</jetty.port>
|
<jetty.port>8080</jetty.port>
|
||||||
<activemq.osgi.import.pkg></activemq.osgi.import.pkg>
|
<!-- <activemq.osgi.dynamic.import>
|
||||||
|
javax.naming,
|
||||||
|
org.xml.*,
|
||||||
|
javax.xml.*,
|
||||||
|
org.w3c.*,
|
||||||
|
</activemq.osgi.dynamic.import> -->
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue