Delete stuff that's just going to get synced from M2.x

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

2 files changed, 0 insertions, 236 deletions

diff --git a/java/perftests/distribution/pom.xml b/java/perftests/distribution/pom.xml
deleted file mode 100644
index 7de50d5a6e..0000000000
--- a/java/perftests/distribution/pom.xml
+++ /dev/null
@@ -1,133 +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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-perftests-distribution</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Performance Tests Distribution</name>
-    <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <java.source.version>1.5</java.source.version>
-        <qpid.version>${pom.version}</qpid.version>
-        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-perftests</artifactId>
-            <type>jar</type>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-perftests</artifactId>
-            <type>test-jar</type>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
-            <artifactId>junit-toolkit</artifactId>
-            <version>0.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-            </dependency>
-        <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
-            <artifactId>junit-toolkit-maven-plugin</artifactId>
-            <version>0.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.source.version}</source>
-                        <target>${java.source.version}</target>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${assembly.version}</version>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>src/main/assembly/performance.xml</descriptor>
-                        </descriptors>
-                        <finalName>qpid-${pom.version}</finalName>
-                        <outputDirectory>${qpid.targetDir}</outputDirectory>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                 <configuration>
-                        <finalName>qpid-performance</finalName>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/performance.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/java/perftests/distribution/src/main/assembly/performance.xml b/java/perftests/distribution/src/main/assembly/performance.xml
deleted file mode 100644
index a564261a24..0000000000
--- a/java/perftests/distribution/src/main/assembly/performance.xml
+++ /dev/null
@@ -1,103 +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>
-  <id>performance-test-java</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-  <!-- Apache Licensing -->
-    <fileSet>
-      <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>
-
-    <!-- Performance txt files-->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>*.txt</include>
-      </includes>
-    </fileSet>
-
-    <!-- Execution Scripts -->
-    <fileSet>
-      <directory>../bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <includes>
-          <include>*</include>
-      </includes>
-      <fileMode>777</fileMode>
-    </fileSet>
-
-    <!-- Provide Source in easy access location -->
-    <fileSet>
-      <directory>../src/main</directory>
-      <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
-      <includes>
-          <include>**/*.java</include>
-          <include>**/*.log4j</include>
-      </includes>
-    </fileSet>
-	<fileSet>
-      <directory>../src/test</directory>
-      <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
-      <includes>
-          <include>**/*.java</include>          
-      </includes>
-    </fileSet>
-
-    <!-- Metadata Jar -->
-    <fileSet>
-          <directory>target</directory>
-          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-          <includes>
-              <include>qpid-performance.jar</include>
-          </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.qpid:qpid-perftests-distribution</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>