activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] git commit: AMQ-4747: Fixed insight-log4j using a patched JAR so we can include it in the standalone distro.
Date Sat, 05 Oct 2013 12:53:01 GMT
AMQ-4747: Fixed insight-log4j using a patched JAR so we can include it in the standalone distro.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/abaaf25d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/abaaf25d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/abaaf25d

Branch: refs/heads/trunk
Commit: abaaf25d3090fda7c07497d027d3dc7467e03952
Parents: 66e101b
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Sat Oct 5 14:52:43 2013 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Sat Oct 5 14:52:43 2013 +0200

----------------------------------------------------------------------
 assembly/src/main/descriptors/common-bin.xml       |   4 +++-
 assembly/src/main/descriptors/unix-bin.xml         |  10 ++++++++++
 assembly/src/main/descriptors/windows-bin.xml      |  10 +++++++++-
 .../insight-log4j-7.2.0.redhat-024-patched.jar     | Bin 0 -> 20044 bytes
 assembly/src/release/conf/activemq.xml             |   3 +--
 5 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/abaaf25d/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 97057df..3f20fc2 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/abaaf25d/assembly/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 9875fc8..62b3ea6 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/abaaf25d/assembly/src/main/descriptors/windows-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index 893e24a..c073a24 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/abaaf25d/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar
----------------------------------------------------------------------
diff --git a/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar b/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar
new file mode 100644
index 0000000..58e4101
Binary files /dev/null and b/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar
differ

http://git-wip-us.apache.org/repos/asf/activemq/blob/abaaf25d/assembly/src/release/conf/activemq.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 45d99f6..126c871 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -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.


Mime
View raw message