From 248f1fe188fe2307b9dcf2c87a83b653eaa1920c Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Sat, 26 Dec 2009 12:42:57 +0000
Subject: synchronized with trunk except for ruby dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/assembly/client-java14-bin.xml        |  74 ---------------
 .../src/main/assembly/jar-with-dependencies.xml    | 104 ---------------------
 2 files changed, 178 deletions(-)
 delete mode 100644 java/client-java14/src/main/assembly/client-java14-bin.xml
 delete mode 100644 java/client-java14/src/main/assembly/jar-with-dependencies.xml

(limited to 'java/client-java14/src/main/assembly')

diff --git a/java/client-java14/src/main/assembly/client-java14-bin.xml b/java/client-java14/src/main/assembly/client-java14-bin.xml
deleted file mode 100644
index 91e1f23975..0000000000
--- a/java/client-java14/src/main/assembly/client-java14-bin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Assembly instructions for a client that runs on Java 1.4 -->
-<assembly>
-  <id>java-client-java14-bin</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-      <fileSet>
-          <!-- Apache license files -->
-          <directory>../resources</directory>
-          <outputDirectory>qpid-${qpid.version}</outputDirectory>
-          <includes>
-              <include>DISCLAIMER</include>
-              <include>LICENSE.txt</include>
-              <include>NOTICE.txt</include>
-              <include>README.txt</include>
-          </includes>
-      </fileSet>
-
-      <fileSet>
-          <directory>../release-docs</directory>
-          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
-          <includes>
-              <include>RELEASE_NOTES.txt</include>
-          </includes>
-      </fileSet>
-
-  </fileSets>
-
-  <dependencySets>
-      <dependencySet>
-          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-          <unpack>false</unpack>
-          
-          <excludes>
-             <!-- Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. -->
-             <exclude>org.apache.qpid:qpid-client:jar</exclude>
-             <exclude>org.apache.qpid:qpid-common:jar</exclude>
-
-             <!-- Exclude the retrotranslated integration tests from the distriubtion. -->
-             <exclude>org.apache.qpid:qpid-integrationtests:jar:java14</exclude>
-
-             <!-- Mina SSL support only available in Java 5. No SSL on 1.4. -->
-             <exclude>org.apache.mina:mina-java5</exclude>
-             <exclude>org.apache.mina:mina-filter-ssl</exclude>
-
-          </excludes>         
-      </dependencySet>
-  </dependencySets>
-</assembly>
-
-
diff --git a/java/client-java14/src/main/assembly/jar-with-dependencies.xml b/java/client-java14/src/main/assembly/jar-with-dependencies.xml
deleted file mode 100644
index 091fd46427..0000000000
--- a/java/client-java14/src/main/assembly/jar-with-dependencies.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!-- This is an assembly descriptor that produces a jar file that contains all the
-     test dependencies, fully expanded into a single jar, required to run the tests
-     of a maven project. 
--->
-<!--
-<assembly>
-    <id>all-test-deps</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <dependencySets>
-        <!## Include all test dependencies. ##>
-        <dependencySet>
-            <outputDirectory></outputDirectory>
-            <outputFileNameMapping></outputFileNameMapping>
-            <unpack>true</unpack>
-            <!##<scope>runtime</scope>##>
-
-            <!##
-            <includes>
-                <include>org.apache.qpid:qpid-client:jar:java14</include>
-                <include>org.apache.qpid:qpid-common:jar:java14</include>
-            </includes>
-            ##>
-
-            <excludes>
-                <!## Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. ##>
-                <exclude>org.apache.qpid:qpid-client:jar</exclude>
-                <exclude>org.apache.qpid:qpid-common:jar</exclude>
-                
-                <!## Mina SSL support only available in Java 5. No SSL on 1.4. ##>
-                <exclude>org.apache.mina:mina-java5</exclude>
-                <exclude>org.apache.mina:mina-filter-ssl</exclude>
-            </excludes>         
-
-        </dependencySet>
-
-    </dependencySets>
-
-    <fileSets>
-        <!## Include all project classes. ##>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!## Include all project test classes. ##>
-        <fileSet>
-            <directory>target/test-classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
--->
-
-<assembly>
-  <id>all-test-deps</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-
-  <fileSets>
-  </fileSets>
-
-  <dependencySets>
-      <dependencySet>
-          <outputDirectory></outputDirectory>
-          <unpack>true</unpack>
-          
-          <excludes>
-             <!-- Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. -->
-             <exclude>org.apache.qpid:qpid-client:jar</exclude>
-             <exclude>org.apache.qpid:qpid-common:jar</exclude>
-
-             <!-- Mina SSL support only available in Java 5. No SSL on 1.4. -->
-             <exclude>org.apache.mina:mina-java5</exclude>
-             <exclude>org.apache.mina:mina-filter-ssl</exclude>
-
-          </excludes>         
-      </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file
-- 
cgit v1.2.1