diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-07-31 09:07:57 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-07-31 09:07:57 +0000 |
| commit | 59f5427b7f2b9f6959aebf257b1e6f11d237b03d (patch) | |
| tree | ce0cbc08ae76ca699b1da6295a7a4a9e43260c0d /java/distribution | |
| parent | dcad8eab01ad32735fe2dc5aee8f3c825c074e8b (diff) | |
| download | qpid-python-59f5427b7f2b9f6959aebf257b1e6f11d237b03d.tar.gz | |
Changes to POMs.
Client pom now builds a single jar with all dependancies included in the single bundle.
systests/pom.xml adjusted to include only *Test.class items. This will fix the current Error on OptOutTestCase
management/eclipse-plugin/pom.xml - editied to include there required MANIFEST.MF to identify plugin to eclipse
distribution/src/main/assembly/management-eclipse-plugin.xml editied to include there required MANIFEST.MF to identify the plugin
distribution/pom.xml - white space
Also updated log4j.xml default to create an alert.log file from the AMQQueue alerting. Added a debug.log4j.xml that gives example of debugging the broker via log4j.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@561278 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/distribution')
| -rw-r--r-- | java/distribution/pom.xml | 1 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/management-eclipse-plugin.xml | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml index 120475cc72..7899ef8912 100644 --- a/java/distribution/pom.xml +++ b/java/distribution/pom.xml @@ -135,7 +135,6 @@ </plugin> </plugins> - <defaultGoal>assembly:assembly</defaultGoal> </build> diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/java/distribution/src/main/assembly/management-eclipse-plugin.xml index bd0d2bdd99..05df2c030b 100644 --- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml +++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml @@ -30,7 +30,7 @@ <!-- Include the currently hardwired Apache Legal bits --> <fileSet> <directory>../resources</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> + <outputDirectory>qpidmc</outputDirectory> <includes> <include>DISCLAIMER</include> <include>LICENSE</include> @@ -90,7 +90,18 @@ </excludes> <fileMode>0777</fileMode> </fileSet> - </fileSets> + + <!-- Required to make eclipse load the JMXRemote SASL pluging --> + <!-- This should be removed as JMXRemote SASL module is not ASF license friendly --> + <!-- However management console doesn't seem to work without it --> + <fileSet> + <directory>../management/eclipse-plugin/src/main/resources/sasl</directory> + <outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory> + <includes> + <include>MANIFEST.MF</include> + </includes> + </fileSet> + </fileSets> <dependencySets> <dependencySet> @@ -102,7 +113,7 @@ <exclude>org.apache.qpid:qpid-common</exclude> <exclude>org.apache.qpid:qpid-broker</exclude> <exclude>org.apache.qpid:qpid-client</exclude> - <exclude>commons-cli:commons-cli</exclude> + <exclude>commons-cli:commons-cli</exclude> <exclude>commons-configuration:commons-configuration</exclude> <exclude>commons-lang:commons-lang</exclude> <exclude>org.apache.mina:mina-filter-ssl</exclude> |