You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/01/26 09:52:25 UTC
svn commit: r500188 [2/5] - in
/incubator/qpid/branches/perftesting/qpid/java: ./ broker/
broker/distribution/ broker/distribution/src/ broker/distribution/src/main/
broker/distribution/src/main/assembly/ client/ client/distribution/
client/distributio...
Added: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,107 @@
+<?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>java-client-bin-with-tests</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>
+
+ <!-- Include easy access to test source-->
+ <fileSet>
+ <directory>../src/test</directory>
+ <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+
+ <!-- fileSet> Client contains a readme.txt as does qpid root.
+ Which will cause problems on windows as the zip will
+ contain: readme.txt and README.txt
+ < Client local documentation>
+ <directory>..</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet-->
+
+ <!-- Configuration -->
+ <fileSet>
+ <directory>../test/etc</directory>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Execution Scripts -->
+ <fileSet>
+ <directory>../test/bin</directory>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <fileMode>777</fileMode> <!-- RWX -->
+ </fileSet>
+
+ <!-- Metadata Jar -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <includes>
+ <include>qpid-incubating.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin-tests.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,76 @@
+<?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>java-client-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>
+ < Client local documentation>
+ <directory>..</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet-->
+
+ <fileSet>
+ <directory>../../release-docs</directory>
+ <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <includes>
+ <include>qpid-incubating.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,62 @@
+<?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 typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>java-client-src</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}-src</outputDirectory>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+ <includes>
+ <include>src/main/**</include>
+ <include>src/test/**</include>
+ <include>test/main/**</include>
+ <include>test/test/**</include>
+ <include>pom.xml</include>
+ <include>distribution/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/build</exclude>
+ <exclude>**/build/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/client/distribution/src/main/assembly/client-src.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/qpid/branches/perftesting/qpid/java/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/client/pom.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/client/pom.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/client/pom.xml Fri Jan 26 00:52:20 2007
@@ -35,40 +35,45 @@
<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-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
</dependency>
+ <!-- Test Dependencies -->
+ <dependency> <!-- for inVm Broker -->
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>jmscts</groupId>
<artifactId>jmscts</artifactId>
@@ -85,12 +90,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
</dependency>
-
</dependencies>
<build>
@@ -115,11 +122,67 @@
</property>
<property>
<name>log4j.configuration</name>
- <value>file:///${basedir}/src/main/java/log4j.properties</value>
+ <value>file:///${basedir}/src/main/java/client.log4j</value>
</property>
</systemProperties>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
+
+<!-- The inclusion of this resource causes the build to hang. -->
+ <!--resources>
+ <resource>
+ <targetPath>META-INF/</targetPath>
+ <filtering>false</filtering>
+ <directory>../resources/META-INF</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ </resources-->
+
+ <testResources>
+ <testResource>
+ <targetPath>META-INF/</targetPath>
+ <filtering>false</filtering>
+ <directory>../resources/META-INF</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <targetPath>src/</targetPath>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </testResource>
+
+ <testResource>
+ <targetPath></targetPath>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>client.log4j</include>
+ </includes>
+ </testResource>
+ </testResources>
+
</build>
+
</project>
Modified: incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ incubator/qpid/branches/perftesting/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Fri Jan 26 00:52:20 2007
@@ -37,7 +37,6 @@
import org.apache.qpid.framing.*;
import org.apache.qpid.jms.Session;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.handler.ExchangeBoundHandler;
import org.apache.qpid.url.AMQBindingURL;
import org.apache.qpid.url.URLSyntaxException;
@@ -1626,7 +1625,7 @@
throw new JMSAMQException(e);
}
ExchangeBoundOkBody responseBody = (ExchangeBoundOkBody) response.getMethod();
- return (responseBody.replyCode == ExchangeBoundHandler.OK);
+ return (responseBody.replyCode == 0);//ExchangeBoundHandler.OK);
}
private void checkTransacted() throws JMSException
Propchange: incubator/qpid/branches/perftesting/qpid/java/common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 26 00:52:20 2007
@@ -1,3 +1,4 @@
common.iml
intellijclasses
target
+*.iml
Modified: incubator/qpid/branches/perftesting/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/common/pom.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/common/pom.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/common/pom.xml Fri Jan 26 00:52:20 2007
@@ -68,21 +68,44 @@
</build>
<dependencies>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+
+
+<!-- This is a mina dependency but it isn't being picked up-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
+ <artifactId>mina-java5</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/pom.xml Fri Jan 26 00:52:20 2007
@@ -16,7 +16,10 @@
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">
+<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-distribution</artifactId>
@@ -36,7 +39,7 @@
<qpid.version>${pom.version}</qpid.version>
<qpid.targetDir>${project.build.directory}</qpid.targetDir>
</properties>
-
+
<repositories>
<repository>
<id>repo1.maven.org</id>
@@ -48,18 +51,15 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>qpid-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>qpid-broker</artifactId>
<version>${pom.version}</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>qpid-client</artifactId>
<version>${pom.version}</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>${pom.groupId}.management</groupId>
@@ -85,7 +85,7 @@
<version>${assembly.version}</version>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
<finalName>qpid-${pom.version}</finalName>
<outputDirectory>${qpid.targetDir}</outputDirectory>
@@ -106,14 +106,7 @@
</plugin>
</plugins>
</pluginManagement>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
+
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -127,7 +120,6 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/client-bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/management-eclipse-plugin.xml</descriptor>
<descriptor>src/main/assembly/management-eclipse-plugin-unix.xml</descriptor>
@@ -139,4 +131,74 @@
</plugin>
</plugins>
</build>
-</project>
+
+ <profiles>
+ <profile>
+ <id>tests</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-broker</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-broker</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-perftests</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-systests</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <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/bin-test.xml</descriptor>
+ </descriptors>
+ <finalName>qpid-${pom.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
+
+</project>
Added: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,169 @@
+<?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 typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>java-bin-with-tests</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/release</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>..</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <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>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <includes>
+ <include>qpid-incubating.jar</include>
+ </includes>
+ </fileSet>
+ </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>
+ <destName>qpid-run.conf</destName>
+ </file>
+ <file>
+ <source>../broker/etc/config.xml</source>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <destName>config.xml</destName>
+ </file>
+ <file>
+ <source>../broker/etc/log4j.xml</source>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <destName>log4j.xml</destName>
+ </file>
+ <file>
+ <source>../broker/etc/passwd</source>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <destName>passwd</destName>
+ </file>
+ <file>
+ <source>../broker/etc/qpid-server.conf</source>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <destName>qpid-server.conf</destName>
+ </file>
+ <file>
+ <source>../broker/etc/virtualhosts.xml</source>
+ <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+ <destName>virtualhosts.xml</destName>
+ </file>
+ <file>
+ <source>../common/bin/qpid-run</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid-run</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/qpid-server</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid-server</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/qpid-server.bat</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid-server.bat</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/run.bat</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>run.bat</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/run.sh</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>run.sh</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/runAll</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>runAll</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.qpid:qpid-distribution</exclude>
+ <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>
+ <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude>
+ <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude>
+ <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude>
+ <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude>
+ <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude>
+ <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude>
+ <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude>
+ <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude>
+ <exclude>org.eclipse.help:org.eclipse.help</exclude>
+ <exclude>org.eclipse.jface:org.eclipse.jface</exclude>
+ <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
+ <exclude>org.eclipse.swt:org.eclipse.swt</exclude>
+ <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude>
+ <exclude>org.eclipse.ui:org.eclipse.ui</exclude>
+ <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude>
+ <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin-test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/bin.xml Fri Jan 26 00:52:20 2007
@@ -74,73 +74,67 @@
<source>../common/etc/qpid-run.conf</source>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
<destName>qpid-run.conf</destName>
- <fileMode>420</fileMode>
</file>
<file>
<source>../broker/etc/config.xml</source>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
<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>../common/bin/qpid-run</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-run</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
<file>
<source>../broker/bin/qpid-server</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-server</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
<file>
<source>../broker/bin/qpid-server.bat</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-server.bat</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
<file>
<source>../broker/bin/run.bat</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>run.bat</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
<file>
<source>../broker/bin/run.sh</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>run.sh</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
<file>
<source>../broker/bin/runAll</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>runAll</destName>
- <fileMode>493</fileMode>
+ <fileMode>0755</fileMode>
</file>
</files>
<dependencySets>
Modified: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml Fri Jan 26 00:52:20 2007
@@ -19,11 +19,10 @@
-->
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
- <id>eclipse-plugin-unix</id>
+ <id>management-console-unix</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<!--
<moduleSets>
@@ -75,10 +74,17 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../management/eclipse-plugin</directory>
+ <outputDirectory>qpidmc</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../management/eclipse-plugin/bin</directory>
<outputDirectory>qpidmc/bin</outputDirectory>
<includes>
- <include>qpidmc.sh</include>
+ <include>qpidmc*.sh</include>
</includes>
<fileMode>777</fileMode>
</fileSet>
Modified: incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml (original)
+++ incubator/qpid/branches/perftesting/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml Fri Jan 26 00:52:20 2007
@@ -74,6 +74,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../management/eclipse-plugin</directory>
+ <outputDirectory>qpidmc</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../management/eclipse-plugin/bin</directory>
<outputDirectory>qpidmc/bin</outputDirectory>
<includes>
Propchange: incubator/qpid/branches/perftesting/qpid/java/management/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 26 00:52:20 2007
@@ -1 +1,2 @@
target
+*.iml
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 26 00:52:20 2007
@@ -0,0 +1,4 @@
+target
+*.iml
+*.ipr
+*.iws
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt Fri Jan 26 00:52:20 2007
@@ -0,0 +1,112 @@
+Running Performance Tests
+-------------------------
+
+This performance test suite contains a number of tests.
+
+- Service request-reply
+- Ping-Pong
+- Topic
+
+Service request-reply
+---------------------
+
+Description:
+This is the simplest test to ensure everything is working. This involves
+one client that is known as a "service provider" and it listens on a
+well-known queue for requests. Another client, known as the "service requester"
+creates a private (temporary) response queue, creates a message with the
+private response queue set as the "reply to" field and then publishes the
+message to the well known service queue. The test allows you to time how long
+it takes to send messages and receive the response back. It also allows varying
+of the message size.
+
+Quick Run:
+
+./serviceRequestReply-QuickTest.sh <brokerdetails> <number of messages>
+
+This provides a quick test to run everything against a running broker. Simply specify broker and number of messages to run.
+
+
+Detailed Run:
+
+You must start the service provider first:
+
+serviceProvidingClient.sh <brokerdetails> [<P[ersistent]|N[onPersistent]> <T[ransacted]|N[onTransacted]>] [selector]
+
+where Brokerdetails is the connection information to the broker you are running on; e.g. localhost or localhost:5670 or tcp://10.10.10.10:5677.
+By default Non Persistent, Non Transaction messages are used in the response. A selector may also be specified.
+
+
+To run the service requester:
+
+serviceRequestingClient.sh <Brokerdetails> <Number of Messages> [<Message Size>] [<P[ersistent]|N[onPersistent]> <T[ransacted]|N[onTransacted]>]
+
+This requests the <number of messages> of a <Message Size (default 4096 bytes>. By default the connection is Non Persistent and Non Transactional.
+
+After receiving all the messages the client outputs the rate it achieved.
+
+
+Ping-Pong
+---------
+
+Description:
+Quick Run:
+Detailed Run:
+
+Topic
+-------
+
+Description:
+A more realistic test is the topic test, which tests the
+performance of the topic exchange to a configurable number of clients (e.g. 50).
+A publisher sends batches of of messages to a topic that a number of clients are
+subscribed to. The clients recevie each all the messages and then send a response.
+
+The time taken to send all messages and receive a response from all clients is displayed.
+
+Quick Run:
+
+./topic-QuickTest.sh <host> <port> <messages> <clients> <batches>
+
+This provides a quick test to run everything against a running broker. Simply specify host, port, the number of messages, number of clients and number of batches to run this quick test.
+
+Detailed Run:
+
+You must run the listener processes first:
+
+run_many.sh 10 topic "topicListener.sh [-host <host> -port <port>]"
+
+In this command, the first argument means start 10 processes, the
+second is just a name use in the log files generated and the third
+argument is the command to run the specified number of times.
+
+The topicListener by default connects to localhost:5672 this can be changed using the above flags.
+
+Then run the publisher process:
+
+headersPublisher.sh [-host <host> -port <port> -messages <number> -clients <number> -batch <number>]
+
+The default is to connect to localhost:5672 and send 1 batch of 1000 messages expecting 1 client to respond.
+
+Note that before starting the publisher you should wait about 30
+seconds to ensure all the clients are registered with the broker (you
+can see this from the broker output). Otherwise the numbers will be
+slightly skewed.
+
+
+Additional parameters to scripts
+
+Publisher
+-payload <int> : specify the payload size (256b Default)
+-delay <long> : Number of seconds to send between batches (0 Default)
+-warmup <int> : Number of messages to send as a warm up (0 Default)
+-ack <int> : Acknowledgement mode
+ - 1 : Auto
+ - 2 : Client
+ - 3 : Dups_OK
+ - 257 : No (Default)
+ - 258 : Pre
+-factory <string> : ConnectionFactoryInitialiser class
+-persistent <"true"|other> : User persistent messages if string equals "true" (false Default)
+-clientId <string> : Set client id
+-subscriptionId <string> : set subscription id
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/RunningPerformanceTests.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceProvidingClient.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceProvidingClient.sh?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceProvidingClient.sh (original)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceProvidingClient.sh Fri Jan 26 00:52:20 2007
@@ -17,9 +17,17 @@
# specific language governing permissions and limitations
# under the License.
#
+# args supplied: <brokerdetails> <num messages>
+
+if [[ $# != 1 ]] ; then
+ echo "usage: ./serviceProvidingClient.sh <brokerdetails> [<P[ersistent]|N[onPersistent] (default N)> <T[ransacted]|N[onTransacted] (default N)>] [selector]"
+ exit 1
+fi
+
+thehosts=$1
+shift
-# XXX -Xms1024m -XX:NewSize=300m
. ./setupclasspath.sh
echo $CP
-# usage: just pass in the host(s)
-$JAVA_HOME/bin/java -cp $CP org.apache.qpid.requestreply.ServiceProvidingClient $1 guest guest /test serviceQ
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.requestreply.ServiceProvidingClient $thehosts guest guest /test serviceQ "$@"
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <brokerdetails> <num messages> <num clients>
+
+if [[ $# < 3 ]] ; then
+ echo "usage: ./serviceRequestReply-QuickTest.sh <brokerdetails> <Number of messages> <number of clients> [<P[ersistent]|N[onPersistent] (default N)> <T[ransacted]|N[onTransacted] (default N)>]"
+ exit 1
+fi
+
+thehosts=$1
+shift
+
+numberofmessages=$1
+shift
+
+numberofclients=$1
+shift
+
+. ./setupclasspath.sh
+echo $CP
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.requestreply.ServiceProvidingClient $thehosts guest guest /test serviceQ "$@" &
+
+providingclient=$!
+
+./run_many.sh $numberofclients requestClients "./serviceRequestingClient.sh $thehosts $numberofmessages $@"
+
+sleeping=$(( numberofmessages * 1 / 10 ))
+
+echo "Sleeping for $sleeping secconds to completion"
+sleep $sleeping
+
+kill $providingclient
+
+echo "Results"
+cat requestClients.*.out
\ No newline at end of file
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-MultipleClients.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <brokerdetails> <num messages>
+
+if [[ $# < 2 ]] ; then
+ echo "usage: ./serviceRequestReply-QuickTest.sh <brokerdetails> <Number of messages> [<P[ersistent]|N[onPersistent] (default N)> <T[ransacted]|N[onTransacted] (default N)>]"
+ exit 1
+fi
+
+thehosts=$1
+shift
+
+numberofmessages=$1
+shift
+
+. ./setupclasspath.sh
+echo $CP
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.requestreply.ServiceProvidingClient $thehosts guest guest /test serviceQ "$@" &
+
+providingclient=$!
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.requestreply.ServiceRequestingClient $thehosts guest guest /test serviceQ $numberofmessages "$@"
+
+kill $providingclient
+
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestReply-QuickTest.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# 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.
+#
+
+##LOGDIR=$QPID_HOME/logs
+LOGDIR=../logs
+date=`date +"%y%m%d%H%M%S"`
+LOGFILE=$LOGDIR/perftest.log.$date
+
+## create the log dir
+if [ ! -d $LOGDIR ]; then
+ mkdir $LOGDIR
+fi
+
+echo "********** Running the test **************"
+echo "creating logfile $LOGFILE"
+echo
+
+./serviceRequestingClient.sh $@ 2>&1 | tee $LOGFILE
+
+echo "********** End of test ******************"
+echo
\ No newline at end of file
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient-createLogFile.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient.sh?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient.sh (original)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/serviceRequestingClient.sh Fri Jan 26 00:52:20 2007
@@ -17,11 +17,18 @@
# specific language governing permissions and limitations
# under the License.
#
-# args supplied: <host:port> <num messages>
+# usage: ./serviceRequestingClient.sh <brokerdetails> <number of messages> [<message size 4096b default>] [<P[ersistent]|N[onPersistent]> <T[ransacted]|N[onTransacted]>]
+
+if [[ $# < 2 ]] ; then
+ echo "usage: ./serviceRequestingClient.sh <brokerdetails> <number of messages> [<message size 4096b default>] [<P[ersistent]|N[onPersistent]> <T[ransacted]|N[onTransacted]>]"
+ exit 1
+fi
+
thehosts=$1
shift
-echo $thehosts
+
# XXX -Xms1024m -XX:NewSize=300m
. ./setupclasspath.sh
echo $CP
-$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="INFO" org.apache.qpid.requestreply.ServiceRequestingClient $thehosts guest guest /test serviceQ "$@"
+
+$JAVA_HOME/bin/java -cp $CP -Dlog.dir="$QPID_HOME/logs" -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.requestreply.ServiceRequestingClient $thehosts guest guest /test serviceQ "$@"
Modified: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/setupclasspath.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/setupclasspath.sh?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/setupclasspath.sh (original)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/setupclasspath.sh Fri Jan 26 00:52:20 2007
@@ -2,8 +2,11 @@
echo "QPID_HOME must be set"
exit
fi
-CP=$QPID_HOME/lib/qpid-incubating.jar:../target/classes
+
+CP=../lib/qpid-performance.jar:$QPID_HOME/lib/qpid-incubating.jar
if [ `uname -o` == "Cygwin" ] ; then
CP=`cygpath --path --windows $CP`
fi
+
+
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <host:port>
+#
+if [[ $# < 1 ]] ; then
+ echo "usage: ./testPingClient.sh <host details> [<selector>]"
+ exit 1
+fi
+
+thehosts=$1
+shift
+echo $thehosts
+# XXX -Xms1024m -XX:NewSize=300m
+. ./setupclasspath.sh
+echo $CP
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.ping.TestPingClient $thehosts guest guest /test "$@"
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingClient.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <host:port>
+#
+if [[ $# < 1 ]] ; then
+ echo "usage: ./testPingProducer.sh <host details> [<selector>]"
+ exit 1
+fi
+
+thehosts=$1
+shift
+echo $thehosts
+# XXX -Xms1024m -XX:NewSize=300m
+. ./setupclasspath.sh
+echo $CP
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.ping.TestPingProducer $thehosts /test
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingProducer.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <host:port>
+#
+if [[ $# < 1 ]] ; then
+ echo "usage: ./testPingPublisher.sh <host details>"
+ exit 1
+fi
+
+thehosts=$1
+shift
+echo $thehosts
+# XXX -Xms1024m -XX:NewSize=300m
+. ./setupclasspath.sh
+echo $CP
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.pingpong.TestPingPublisher $thehosts /test
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingPublisher.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <host:port>
+#
+if [[ $# < 1 ]] ; then
+ echo "usage: ./testPingSubscriber.sh <host details> [<selector>]"
+ exit 1
+fi
+
+thehosts=$1
+shift
+echo $thehosts
+# XXX -Xms1024m -XX:NewSize=300m
+. ./setupclasspath.sh
+echo $CP
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="debug" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.pingpong.TestPingSubscriber $thehosts guest guest /test "$@"
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/testPingSubscriber.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh Fri Jan 26 00:52:20 2007
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# 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.
+#
+# args supplied: <host> <port> <messages> <clients> <batches>
+
+if [[ $# < 5 ]] ; then
+ echo "usage: ./topic-QuickTest.sh <host> <port> <messages> <clients> <batches> [other params for both listener and publisher]"
+ exit 1
+fi
+
+host=$1
+shift
+
+port=$1
+shift
+
+nomessages=$1
+shift
+
+noclients=$1
+shift
+
+batches=$1
+shift
+
+sleeptime=$(( 2 * $noclients ))
+
+. ./setupclasspath.sh
+echo $CP
+
+./run_many.sh $noclients topic "$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level='warn' -Damqj.test.logging.level='info' -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Listener -host $host -port $port $@" &
+
+echo
+echo "Pausing for $sleeptime seconds to allow clients to connect"
+sleep $sleeptime
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Publisher -host $host -port $port -messages $nomessages -clients $noclients -batch $batches $@
+
+
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topic-QuickTest.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicListener.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicListener.sh?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicListener.sh (original)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicListener.sh Fri Jan 26 00:52:20 2007
@@ -22,4 +22,5 @@
# XXX -Xmx512m -Xms512m -XX:NewSize=150m
. ./setupclasspath.sh
echo $CP
-$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="INFO" org.apache.qpid.topic.Listener $*
+
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Listener $@
Modified: incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicPublisher.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicPublisher.sh?view=diff&rev=500188&r1=500187&r2=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicPublisher.sh (original)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/bin/topicPublisher.sh Fri Jan 26 00:52:20 2007
@@ -20,4 +20,4 @@
# XXX -Xmx512m -Xms512m -XX:NewSize=150m
. ./setupclasspath.sh
-$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="INFO" org.apache.qpid.topic.Publisher $*
+$JAVA_HOME/bin/java -cp $CP -Damqj.logging.level="warn" -Damqj.test.logging.level="info" -Dlog4j.configuration=src/perftests.log4j org.apache.qpid.topic.Publisher $@
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 26 00:52:20 2007
@@ -0,0 +1 @@
+target
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,127 @@
+<!--
+ 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-M2-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-M2-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.4</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>
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,103 @@
+<?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>
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/distribution/src/main/assembly/performance.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml?view=auto&rev=500188
==============================================================================
--- incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml (added)
+++ incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml Fri Jan 26 00:52:20 2007
@@ -0,0 +1,29 @@
+<!-- This is an assembly descriptor that produces a jar file that contains all the
+ dependencies, fully expanded into a single jar, required to run the tests of
+ a maven project.
+ -->
+<assembly>
+ <id>all-test-deps</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <outputFileNameMapping></outputFileNameMapping>
+ <unpack>true</unpack>
+ <scope>test</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/test-classes</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/branches/perftesting/qpid/java/perftests/jar-with-dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml