You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/04/01 09:41:43 UTC
svn commit: r1583552 - in /qpid/branches/java-broker-bdb-ha2: ./ qpid/
qpid/cpp/ qpid/cpp/CMakeModules/ qpid/cpp/src/
qpid/cpp/src/qpid/linearstore/journal/ qpid/java/ qpid/java/lib/poms/
qpid/java/qpid-perftests-systests/ qpid/java/qpid-systests-paren...
Author: kwall
Date: Tue Apr 1 07:41:42 2014
New Revision: 1583552
URL: http://svn.apache.org/r1583552
Log:
NO-JIRA: Final merge from trunk before reintegration
Added:
qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeModules/
- copied from r1583550, qpid/trunk/qpid/cpp/CMakeModules/
qpid/branches/java-broker-bdb-ha2/qpid/java/lib/poms/cryptojs-3.1.2.xml
- copied unchanged from r1583550, qpid/trunk/qpid/java/lib/poms/cryptojs-3.1.2.xml
Modified:
qpid/branches/java-broker-bdb-ha2/ (props changed)
qpid/branches/java-broker-bdb-ha2/qpid/ (props changed)
qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeLists.txt
qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/ (props changed)
qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
qpid/branches/java-broker-bdb-ha2/qpid/java/ (props changed)
qpid/branches/java-broker-bdb-ha2/qpid/java/pom.xml
qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-perftests-systests/pom.xml
qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-systests-parent/pom.xml
qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/cpp.excludes
Propchange: qpid/branches/java-broker-bdb-ha2/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1581823-1583550
Propchange: qpid/branches/java-broker-bdb-ha2/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1581823-1583550
Modified: qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeLists.txt?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeLists.txt (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/cpp/CMakeLists.txt Tue Apr 1 07:41:42 2014
@@ -29,6 +29,8 @@ else()
set (OPTIONAL_ARG OPTIONAL)
endif()
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
+
# Parse the version from QPID_VERSION.txt.
# Use the top level qpid/ file if we're in an SVN checkout, source dir otherwise.
find_file(QPID_VERSION_FILE NAMES QPID_VERSION.txt PATHS ${PROJECT_SOURCE_DIR}/.. ${PROJECT_SOURCE_DIR} NO_DEFAULT_PATH)
Propchange: qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1581291-1583550
Modified: qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp Tue Apr 1 07:41:42 2014
@@ -104,6 +104,7 @@ jdir::clear_dir(const std::string& dirna
DIR* dir = open_dir(dirname, "clear_dir", true);
if (!dir && create_flag) {
create_dir(dirname);
+ dir = open_dir(dirname, "clear_dir", true);
}
//#ifndef RHM_JOWRITE
struct dirent* entry;
Propchange: qpid/branches/java-broker-bdb-ha2/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1581823-1583550
Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/pom.xml?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/pom.xml Tue Apr 1 07:41:42 2014
@@ -53,7 +53,7 @@
<readme.text>Documentation for the Qpid components can be accessed on our website at:${line.separator}http://qpid.apache.org/documentation.html</readme.text>
<!-- enforcer plugin config properties -->
- <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10)</supported-test-profiles-regex>
+ <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp)</supported-test-profiles-regex>
<!-- plugin properties-->
<license-maven-plugin-output-dir>${project.build.directory}/license-maven-plugin</license-maven-plugin-output-dir>
@@ -644,6 +644,54 @@
</properties>
</profile>
+ <profile>
+ <id>cpp</id>
+ <activation>
+ <property>
+ <name>profile</name>
+ <value>cpp</value>
+ </property>
+ </activation>
+ <properties>
+ <profile>cpp</profile>
+ <profile.broker.language>cpp</profile.broker.language>
+ <profile.broker.type>spawned</profile.broker.type>
+ <profile.broker.stopped>Exception constructed</profile.broker.stopped>
+ <profile.broker.ready>Listening on TCP</profile.broker.ready>
+ <profile.broker.command>${cpp-broker-dir}/qpidd -p @PORT --data-dir ${qpid.work}/@PORT -t --auth no --no-module-dir</profile.broker.command>
+ <profile.broker.command.windows></profile.broker.command.windows>
+ <profile.test.excludes>Excludes CPPExcludes ${profile}.excludes ${profile.specific.excludes} cpp.excludes</profile.test.excludes>
+ <profile.specific.excludes>CPPPrefetchExcludes CPPTransientExcludes</profile.specific.excludes>
+ <profile.broker.version>v0_10</profile.broker.version>
+ <profile.broker.persistent>true</profile.broker.persistent>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-cpp-broker-dir-defined</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>cpp-broker-dir</property>
+ <message>You must set a the CPP broker directory property for this profile. (e.g. -Dcpp-broker-dir=/somedir/cpp/src)</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-perftests-systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-perftests-systests/pom.xml?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-perftests-systests/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-perftests-systests/pom.xml Tue Apr 1 07:41:42 2014
@@ -115,16 +115,5 @@
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <!--version specified in parent pluginManagement -->
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
</build>
</project>
Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-systests-parent/pom.xml?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-systests-parent/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-systests-parent/pom.xml Tue Apr 1 07:41:42 2014
@@ -216,6 +216,16 @@
<skip>true</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <!--version specified in parent pluginManagement -->
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/cpp.excludes
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/cpp.excludes?rev=1583552&r1=1583551&r2=1583552&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/cpp.excludes (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/cpp.excludes Tue Apr 1 07:41:42 2014
@@ -27,3 +27,5 @@ org.apache.qpid.test.client.message.JMSD
// This test requires a broker capable of 0-8/9 and 0-10
org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
+//BDB System Tests
+org.apache.qpid.server.store.berkeleydb.*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org