Modified: incubator/qpid/trunk/qpid/java/pom.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=495455&r1=495454&r2=495455 ============================================================================== --- incubator/qpid/trunk/qpid/java/pom.xml (original) +++ incubator/qpid/trunk/qpid/java/pom.xml Thu Jan 11 17:03:21 2007 @@ -65,6 +65,7 @@ <archive>http://mail-archives.apache.org/mod_mbox/incubator-qpid-commits</archive> </mailingList> </mailingLists> + <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -72,10 +73,12 @@ <distribution>repo</distribution> </license> </licenses> + <organization> <name>Apache Software Foundation</name> <url>http://www.apache.org/</url> </organization> + <properties> <topDirectoryLocation>.</topDirectoryLocation> @@ -148,6 +151,7 @@ </includes> </resource> </resources> + <testResources> <testResource> <directory>src/test/java</directory> @@ -183,7 +187,6 @@ <artifactId>ant-nodeps</artifactId> <version>1.6.5</version> </dependency> - </dependencies> <executions> @@ -232,16 +235,19 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>${jar.version}</version> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>${resources.version}</version> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -252,6 +258,7 @@ <fork>${compile.forked}</fork> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -273,11 +280,13 @@ </systemproperties> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>${site.version}</version> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> @@ -292,14 +301,16 @@ </projectnatures> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-idea-plugin</artifactId> <configuration> - <downloadSources>true</downloadSources> + <!--downloadSources>true</downloadSources--> <downloadJavadocs>true</downloadJavadocs> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> @@ -407,6 +418,8 @@ <artifactId>backport-util-concurrent</artifactId> <version>2.2</version> </dependency> + + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -419,6 +432,8 @@ <version>2.2</version> <scope>test</scope> </dependency> + + <!-- Qpid Version Dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> @@ -432,6 +447,16 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-perftests</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-systests</artifactId> <version>${project.version}</version> </dependency> <dependency>
Added: incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml?view=auto&rev=495455 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml (added) +++ incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml Thu Jan 11 17:03:21 2007 @@ -0,0 +1,111 @@ +<!-- + 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-systests-distribution</artifactId> + <packaging>jar</packaging> + <version>1.0-incubating-M2-SNAPSHOT</version> + <name>Qpid System 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-systests</artifactId> + </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> + <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-systests</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/systests.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +</project> Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml?view=auto&rev=495455 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml (added) +++ incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml Thu Jan 11 17:03:21 2007 @@ -0,0 +1,91 @@ +<?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>system-test-java</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + +<fileSets> + <!-- Apache Licensing Details--> + <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>..</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> + + <!-- Scripts to run the system tests--> + <fileSet> + <directory>../bin</directory> + <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> + <includes> + <include>*</include> + </includes> + </fileSet> + + <!-- Include source files in easy access form --> + <fileSet> + <directory>../src/main</directory> + <outputDirectory>qpid-${qpid.version}/src</outputDirectory> + <includes> + <include>**/*.java</include> + <include>**/*.log4j</include> + </includes> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> + <includes> + <include>qpid-systests.jar</include> + </includes> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> + <unpack>false</unpack> + <excludes> + <exclude>org.apache.qpid:qpid-systests-distribution</exclude> + </excludes> + </dependencySet> + </dependencySets> +</assembly> Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/qpid/trunk/qpid/java/systests/distribution/src/main/assembly/systests.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/qpid/trunk/qpid/java/systests/pom.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/pom.xml?view=diff&rev=495455&r1=495454&r2=495455 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/pom.xml (original) +++ incubator/qpid/trunk/qpid/java/systests/pom.xml Thu Jan 11 17:03:21 2007 @@ -39,23 +39,20 @@ <dependencies> <dependency> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <type>jar</type> </dependency> + <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker</artifactId> + <type>jar</type> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>compile</scope> </dependency> </dependencies> @@ -65,38 +62,30 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> - <property> - <name>amqj.noAutoCreateVMBroker</name> - <value>true</value> - </property> - <property> - <name>amqj.logging.level</name> - <value>${amqj.logging.level}</value> - </property> - <property> - <name>log4j.debug</name> - <value>true</value> - </property> - <property> - <name>log4j.configuration</name> - <value>file:///${basedir}/src/test/java/log4j.properties</value> - </property> - </systemProperties> + <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>bundle-test-jar</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + </plugins> + + <!-- Include source files in built jar --> + <resources> + <resource> + <targetPath>src/</targetPath> + <filtering>false</filtering> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + <resource> + <targetPath>src/</targetPath> + <filtering>false</filtering> + <directory>src/main/java</directory> + <includes> + <include>systests.log4j</include> + </includes> + </resource> + </resources> </build> </project>
