Rolled back revision 561365 and commented out some broken code in ClientSession.java. The trunk should now build.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@561578 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 112 insertions, 39 deletions

diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml
index 04d83916e4..a9e769e312 100644
--- a/qpid/java/distribution/src/main/assembly/bin-test.xml
+++ b/qpid/java/distribution/src/main/assembly/bin-test.xml
@@ -27,32 +27,38 @@
   </formats>
 
   <fileSets>
-   <!-- Include the currently hardwired Apache Legal bits -->
     <fileSet>
-      <directory>../resources</directory>
+      <directory>src/main/release</directory>
       <outputDirectory>qpid-${qpid.version}</outputDirectory>
       <includes>
           <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
+          <include>LICENSE.txt</include>
+          <include>NOTICE.txt</include>
+          <include>README.txt</include>
       </includes>
-      <fileMode>0444</fileMode>
     </fileSet>
-
-  <!-- Include any release information -->
     <fileSet>
-      <directory>src/main/release</directory>
+      <directory>..</directory>
       <outputDirectory>qpid-${qpid.version}</outputDirectory>
+      <includes>
+          <include>*.txt</include>
+      </includes>
     </fileSet>
-
-    <!-- Include any release information -->
     <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+      <directory>src/main/release/etc</directory>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <includes>
+    <include>logging.properties</include>
+    <include>log4j.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/release/docs</directory>
+      <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+      <includes>
+          <include>RELEASE_NOTES.txt</include>
+      </includes>
     </fileSet>
-
-    <!-- Include the classpath jar qpid-incubating.jar -->
     <fileSet>
       <directory>target</directory>
       <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
@@ -60,40 +66,107 @@
           <include>qpid-incubating.jar</include>
       </includes>
     </fileSet>
-
-    <!-- Include etc -->
-    <fileSet>
-      <directory>../common/etc</directory>
+  </fileSets>
+  <files>
+    <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have
+         to use decimal numbers to specify fileMode -->
+    <file>
+      <source>../common/etc/qpid-run.conf</source>
       <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../broker/etc</directory>
+      <destName>qpid-run.conf</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/config.xml</source>
       <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-
-    <!-- Include bin scripts-->
-    <fileSet>
-      <directory>../broker/bin</directory>
+      <destName>config.xml</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/log4j.xml</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>log4j.xml</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/passwd</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>passwd</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/qpid-server.conf</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>qpid-server.conf</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/virtualhosts.xml</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>virtualhosts.xml</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid.start</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../common/bin</directory>
+      <destName>qpid.start</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid.stop</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-  </fileSets>
-
+      <destName>qpid.stop</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid.stopall</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid.stopall</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../common/bin/qpid-run</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid-run</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid-server</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid-server</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid-server.bat</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid-server.bat</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/run.bat</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>run.bat</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/run.sh</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>run.sh</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/runAll</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>runAll</destName>
+      <fileMode>493</fileMode>
+    </file>
+  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
       <unpack>false</unpack>
       <excludes>
-        <!-- Exclude the jar output of this build process -->
         <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <!-- Exclude the Console dependancies -->
         <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
         <exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
         <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>