svn commit: r681333 - in /incubator/qpid/trunk/qpid: cc/config/java/cpp.noprefetch.testprofile cc/scripts/javaconfig.sh java/010ExcludeList-noPrefetch java/cpp.noprefetch.testprofile java/cpp.sync.testprofile

[ar...@apache.org]

Author: arnaudsimon
Date: Thu Jul 31 03:46:57 2008
New Revision: 681333

URL: http://svn.apache.org/viewvc?rev=681333&view=rev
Log:
qpid-1205: deleted cpp.sync profile, added cpp.noprefetch profile

Added:
    incubator/qpid/trunk/qpid/java/010ExcludeList-noPrefetch
      - copied, changed from r681302, incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList
    incubator/qpid/trunk/qpid/java/cpp.noprefetch.testprofile
Removed:
    incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
Modified:
    incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
    incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh

Modified: incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile?rev=681333&r1=681332&r2=681333&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile Thu Jul 31 03:46:57 2008
@@ -1,4 +1,4 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir
 max_prefetch=0
-test.excludesfile=${project.root}/cppNoPrefetchExcludeList
\ No newline at end of file
+test.excludesfile=${project.root}/010ExcludeList-noPrefetch
\ No newline at end of file

Modified: incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh?rev=681333&r1=681332&r2=681333&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh (original)
+++ incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh Thu Jul 31 03:46:57 2008
@@ -21,7 +21,6 @@
 # copy the profiles
 sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.noprefetch.testprofile > "$CC_HOME/java/"/cpp.noprefetch.testprofile
 sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.testprofile > "$CC_HOME/java"/cpp.testprofile
-cp $CC_HOME/cc/config/java/*ExcludeList $CC_HOME/java/.
 QPID_JARS=`find "$CC_HOME/java/build/lib" -name '*.jar' | tr '\n' ":"`
 QPID_JARS=local.classes=$QPID_JARS
 sed "s#local.classes=.*#$QPID_JARS#g" $TS_HOME/bin/build.properties > "$TS_HOME/bin"/build.properties-new

Copied: incubator/qpid/trunk/qpid/java/010ExcludeList-noPrefetch (from r681302, incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList-noPrefetch?p2=incubator/qpid/trunk/qpid/java/010ExcludeList-noPrefetch&p1=incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList&r1=681302&r2=681333&rev=681333&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList-noPrefetch Thu Jul 31 03:46:57 2008
@@ -4,6 +4,8 @@
 // those tests need durable subscribe states to be persisted
 org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
 org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
+// This test cannot be run with no-prefetch
+org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
 //These tests are for the java broker
 org.apache.qpid.server.security.acl.SimpleACLTest#*
 org.apache.qpid.server.plugins.PluginTest#*
@@ -48,4 +50,6 @@
 org.apache.qpid.test.client.FlowControlTest
 // The default cpp.testprofile does not start the cpp broker with authentication so this test will fail.
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection
+// c++ broker doesn't do selectors, so this will fail
+org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue
 

Added: incubator/qpid/trunk/qpid/java/cpp.noprefetch.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.noprefetch.testprofile?rev=681333&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.noprefetch.testprofile (added)
+++ incubator/qpid/trunk/qpid/java/cpp.noprefetch.testprofile Thu Jul 31 03:46:57 2008
@@ -0,0 +1,4 @@
+broker.version=0-10
+broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --auth no
+test.excludesfile=${project.root}/010ExcludeList-noPrefetch
+max_prefetch=0
\ No newline at end of file