mirror of https://github.com/apache/activemq.git
AMQ-4747: Fixed insight-log4j using a patched JAR so we can include it in the standalone distro.
This commit is contained in:
parent
66e101b1da
commit
abaaf25d30
|
@ -28,7 +28,7 @@
|
|||
<include>conf/*.ts</include>
|
||||
<include>conf/*.ks</include>
|
||||
<include>conf/*.cert</include>
|
||||
<include>webapps/*.ico</include>
|
||||
<include>webapps/*.ico</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
|
||||
|
@ -153,7 +153,9 @@
|
|||
<include>${pom.groupId}:activemq-web</include>
|
||||
<include>org.fusesource.hawtbuf:hawtbuf</include>
|
||||
<include>org.fusesource.insight:insight-log-core</include>
|
||||
<!-- TODO: we use a patched insight-log4j AR from assembly/src/release/lib until a new release is out
|
||||
<include>org.fusesource.insight:insight-log4j</include>
|
||||
-->
|
||||
</includes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
|
|
|
@ -66,6 +66,16 @@
|
|||
<fileMode>0755</fileMode>
|
||||
<directoryMode>0755</directoryMode>
|
||||
</fileSet>
|
||||
<!-- include patched JAR files -->
|
||||
<fileSet>
|
||||
<directory>src/patch</directory>
|
||||
<outputDirectory>/lib</outputDirectory>
|
||||
<includes>
|
||||
<include>*</include>
|
||||
</includes>
|
||||
<fileMode>0755</fileMode>
|
||||
<directoryMode>0755</directoryMode>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copy over the files that need unix line endings and also chmod to 755 -->
|
||||
<fileSet>
|
||||
|
|
|
@ -71,8 +71,16 @@
|
|||
<include>bin/win64/*.dll</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<!-- include patched JAR files -->
|
||||
<fileSet>
|
||||
<directory>src/patch</directory>
|
||||
<outputDirectory>/lib</outputDirectory>
|
||||
<includes>
|
||||
<include>*</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
|
||||
</fileSets>
|
||||
</fileSets>
|
||||
|
||||
<componentDescriptors>
|
||||
<componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
|
||||
|
|
Binary file not shown.
|
@ -30,11 +30,10 @@
|
|||
</bean>
|
||||
|
||||
<!-- Allows log searching in hawtio console -->
|
||||
<!-- Disabled until new release of insight to fix AMQ-4747
|
||||
<bean id="logQuery" class="org.fusesource.insight.log.log4j.Log4jLogQuery"
|
||||
lazy-init="false" scope="singleton"
|
||||
init-method="start" destroy-method="stop">
|
||||
</bean> -->
|
||||
</bean>
|
||||
|
||||
<!--
|
||||
The <broker> element is used to configure the ActiveMQ broker.
|
||||
|
|
Loading…
Reference in New Issue