Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java Mon Oct 5 10:35:40 2009 @@ -24,6 +24,7 @@ import static org.apache.qpid.management.ui.Constants.DEFAULT_EXCHANGE_TYPE_VALUES; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.management.MBeanServerConnection; @@ -552,6 +553,7 @@ } else { + Collections.sort(queueList); destinationCombo.setItems(queueList.toArray(new String[0])); } destinationCombo.select(0); @@ -597,6 +599,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); }
Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java Mon Oct 5 10:35:40 2009 @@ -21,6 +21,7 @@ package org.apache.qpid.management.ui.views.exchange; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.management.MBeanServerConnection; @@ -527,6 +528,7 @@ } else { + Collections.sort(queueList); destinationCombo.setItems(queueList.toArray(new String[0])); } destinationCombo.select(0); @@ -572,6 +574,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java Mon Oct 5 10:35:40 2009 @@ -477,7 +477,10 @@ } }); + shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } } @@ -537,6 +540,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } } Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java Mon Oct 5 10:35:40 2009 @@ -443,6 +443,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } } @@ -504,6 +506,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } } Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java Mon Oct 5 10:35:40 2009 @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; @@ -829,6 +830,7 @@ } else { + Collections.sort(queueList); destinationCombo.setItems(queueList.toArray(new String[0])); } destinationCombo.select(0); @@ -880,6 +882,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } @@ -949,6 +953,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } Propchange: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 10:35:40 2009 @@ -1 +1 @@ -/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:796196-797511 +/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:796196-799240 Propchange: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 10:35:40 2009 @@ -1 +1 @@ -/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:796196-797511 +/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:796196-799240 Propchange: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 10:35:40 2009 @@ -1 +1 @@ -/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:796196-797511 +/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:796196-799240 Propchange: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 10:35:40 2009 @@ -1 +1 @@ -/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:796196-797511 +/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:796196-799240 Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java Mon Oct 5 10:35:40 2009 @@ -265,7 +265,17 @@ selectionIndex).getData(); String user = selectedLogger.get(USERNAME).toString(); InputDialog id = new InputDialog(setPasswordButton.getShell(),"Set Password", - "Please enter the new password for '" + user + "':",null,null); + "Please enter the new password for '" + user + "':",null,null){ + @Override + protected Control createDialogArea(Composite parent) + { + Control control = super.createDialogArea(parent); + //set the Text field echo char to '*' to mask the password + getText().setEchoChar('*'); + //return the normal result + return control; + } + }; int returnValue; while((returnValue = id.open()) == InputDialog.OK) @@ -686,6 +696,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } @@ -708,7 +720,7 @@ passwordComposite.setLayout(new GridLayout(2,false)); _toolkit.createLabel(passwordComposite,"Password:").setBackground(shell.getBackground()); - final Text passwordText = new Text(passwordComposite, SWT.BORDER); + final Text passwordText = new Text(passwordComposite, SWT.BORDER | SWT.PASSWORD); passwordText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); Group buttonGroup = new Group(shell, SWT.NONE); @@ -786,6 +798,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } Modified: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java Mon Oct 5 10:35:40 2009 @@ -578,6 +578,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } @@ -704,6 +706,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } @@ -827,6 +831,8 @@ shell.setDefaultButton(okButton); shell.pack(); + ViewUtility.centerChildInParentShell(parent, shell); + shell.open(); } Propchange: qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 5 10:35:40 2009 @@ -1 +1 @@ -/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:796196-797511 +/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:796196-799240 Modified: qpid/branches/java-broker-0-10/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/module.xml?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/module.xml (original) +++ qpid/branches/java-broker-0-10/qpid/java/module.xml Mon Oct 5 10:35:40 2009 @@ -239,6 +239,10 @@ </concat> <property file="${build.scratch}/test-${profile}.properties"/> + <map property="test.excludefiles" value="${test.excludes}"> + <globmapper from="*" to="${test.profiles}/*"/> + </map> + <condition property="dontruntest" value="dontruntest" else="runtest"> <contains substring="${module.name}" string="${exclude.modules}" /> @@ -535,9 +539,10 @@ <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.version" value="${broker.version}"/> <sysproperty key="broker.ready" value="${broker.ready}" /> - <sysproperty key="test.excludes" value="${test.excludes}"/> - <sysproperty key="test.excludesfile" value="${test.excludesfile}"/> <sysproperty key="test.output" value="${module.results}"/> + <syspropertyset> + <propertyref prefix="test"/> + </syspropertyset> <sysproperty key="max_prefetch" value ="${max_prefetch}"/> <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/> <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/> Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original) +++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Mon Oct 5 10:35:40 2009 @@ -77,11 +77,11 @@ static { - if (Boolean.getBoolean("test.excludes")) + if (Boolean.getBoolean("test.exclude")) { _logger.info("Some tests should be excluded, building the exclude list"); - String exclusionListURIs = System.getProperties().getProperty("test.excludesfile", ""); - String exclusionListString = System.getProperties().getProperty("test.excludeslist", ""); + String exclusionListURIs = System.getProperties().getProperty("test.excludefiles", ""); + String exclusionListString = System.getProperties().getProperty("test.excludelist", ""); List<String> exclusionList = new ArrayList<String>(); for (String uri : exclusionListURIs.split("\\s+")) Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile Mon Oct 5 10:35:40 2009 @@ -1,5 +1,3 @@ include=cpp - +profile.excludes=010PrefetchExcludes broker.modules=--load-module ${broker.module.store} - -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile Mon Oct 5 10:35:40 2009 @@ -2,7 +2,7 @@ broker.modules=--load-module ${broker.module.cluster} --cluster-name cpp-java-test-cluster -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList +profile.excludes=XAExcludes 010PrefetchExcludes 010TransientExcludes profile.clustered=true profile.failoverMsgCount=10 Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile Mon Oct 5 10:35:40 2009 @@ -1,3 +1,3 @@ include=cpp -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch +profile.excludes=010TransientExcludes max_prefetch=0 Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile Mon Oct 5 10:35:40 2009 @@ -2,9 +2,6 @@ broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --ssl-port @SSL_PORT -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl -test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#* - profile.use_ssl=true broker.ready= Listening for SSL connections Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile Mon Oct 5 10:35:40 2009 @@ -14,4 +14,5 @@ broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList +profile.excludes=010PrefetchExcludes 010TransientExcludes +test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes} Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile Mon Oct 5 10:35:40 2009 @@ -20,8 +20,9 @@ test.port.ssl=15671 test.port.alt=15673 -test.excludes=true -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence +test.exclude=true +profile.excludes=08TransientExcludes +test.excludes=Excludes XAExcludes 08Excludes ${profile}.excludes ${profile.excludes} test.fork=no test.mem=512M test=*Test Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile Mon Oct 5 10:35:40 2009 @@ -4,4 +4,4 @@ broker.ready=Qpid Broker Ready broker.config=${project.root}/build/etc/config-systests-derby.xml -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm +profile.excludes=08StandaloneExcludes Modified: qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile?rev=821747&r1=821746&r2=821747&view=diff ============================================================================== --- qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile (original) +++ qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile Mon Oct 5 10:35:40 2009 @@ -3,4 +3,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Qpid Broker Ready -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence +profile.excludes=08TransientExcludes 08StandaloneExcludes --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
