Author: rgreig
Date: Fri Nov 24 02:36:39 2006
New Revision: 478829
URL: http://svn.apache.org/viewvc?view=rev&rev=478829
Log:
Start of merge from trunk - some manual restructuring
Added:
incubator/qpid/branches/new_persistence/java/client/pom.xml (with props)
incubator/qpid/branches/new_persistence/java/client/src/test/
- copied from r478696,
incubator/qpid/branches/new_persistence/java/client/test/
incubator/qpid/branches/new_persistence/java/client/src/test/bin/
- copied from r478828,
incubator/qpid/branches/new_persistence/java/client/test/bin/
incubator/qpid/branches/new_persistence/java/client/src/test/build-module.xml
- copied unchanged from r478828,
incubator/qpid/branches/new_persistence/java/client/test/build-module.xml
incubator/qpid/branches/new_persistence/java/client/src/test/etc/
- copied from r478828,
incubator/qpid/branches/new_persistence/java/client/test/etc/
incubator/qpid/branches/new_persistence/java/client/src/test/example_
build.xml
- copied unchanged from r478828,
incubator/qpid/branches/new_persistence/java/client/test/example_ build.xml
incubator/qpid/branches/new_persistence/java/client/src/test/java/
- copied from r478828,
incubator/qpid/branches/new_persistence/java/client/test/java/
incubator/qpid/branches/new_persistence/java/client/src/test/lib/
- copied from r478828,
incubator/qpid/branches/new_persistence/java/client/test/lib/
Removed:
incubator/qpid/branches/new_persistence/java/client/src/test/src/
incubator/qpid/branches/new_persistence/java/client/test/
Added: incubator/qpid/branches/new_persistence/java/client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/pom.xml?view=auto&rev=478829
==============================================================================
--- incubator/qpid/branches/new_persistence/java/client/pom.xml (added)
+++ incubator/qpid/branches/new_persistence/java/client/pom.xml Fri Nov 24
02:36:39 2006
@@ -0,0 +1,126 @@
+<!--
+ 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-client</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-incubating-M2-SNAPSHOT</version>
+ <name>Qpid Client</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>
+ <amqj.logging.level>warn</amqj.logging.level>
+ </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>
+
+
+ <dependency>
+ <groupId>jmscts</groupId>
+ <artifactId>jmscts</artifactId>
+ <version>0.5-b2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <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>WARN</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+
<value>file:///${basedir}/src/main/java/log4j.properties</value>
+ </property>
+ </systemProperties>
+ <includes>
+ <include>**/test/unit/**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/JNDIReferenceableTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: incubator/qpid/branches/new_persistence/java/client/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
