svn commit: r725984 - in /incubator/qpid/trunk/qpid/dotnet: README.txt README0-8.txt RELEASE_NOTES.txt

[aidan]

Author: aidan
Date: Fri Dec 12 04:36:46 2008
New Revision: 725984

URL: http://svn.apache.org/viewvc?rev=725984&view=rev
Log:
Correct protocol versions, removed duplicate build instructions.

Removed:
incubator/qpid/trunk/qpid/dotnet/README0-8.txt
Modified:
incubator/qpid/trunk/qpid/dotnet/README.txt
incubator/qpid/trunk/qpid/dotnet/RELEASE_NOTES.txt

Modified: incubator/qpid/trunk/qpid/dotnet/README.txt
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/README.txt?rev=725984&r1=725983&r2=725984&view=diff
==
--- incubator/qpid/trunk/qpid/dotnet/README.txt (original)
+++ incubator/qpid/trunk/qpid/dotnet/README.txt Fri Dec 12 04:36:46 2008
@@ -1,10 +1,11 @@
 Info
 
 
-There are two separate .NET clients: one that implements AMQP 0.9 and another 
that
-implements 0-10. 0-10 is required to communicate with the Qpid C++ broker.
+There are two separate .NET clients: one that implements AMQP 0-8 (and
+can communicate with the Java broker) and another that implements
+0-10 (and can communicate with the C++ broker).
 
-This README contains instructions for building the 0-9 client.
+This README contains instructions for building the 0-8 client.
 
 Instructions for building and installing the 0-10 client are located in 
client-010/README.txt.
 

Modified: incubator/qpid/trunk/qpid/dotnet/RELEASE_NOTES.txt
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/RELEASE_NOTES.txt?rev=725984&r1=725983&r2=725984&view=diff
==
--- incubator/qpid/trunk/qpid/dotnet/RELEASE_NOTES.txt (original)
+++ incubator/qpid/trunk/qpid/dotnet/RELEASE_NOTES.txt Fri Dec 12 04:36:46 2008
@@ -1,8 +1,8 @@
 Apache Incubator Qpid .NET M4 Release Notes
 ---
 
-The Qpid M4 release contains support the for AMQP 0-10 and AMQP 0-8
-specification.
+The Qpid M4 release contains seperate clients that support the AMQP
+0-10 and AMQP 0-8 protocols.
 
 For full details of Qpid capabilities, as they currently stand, see our
 detailed project documentation at:
@@ -23,5 +23,4 @@
 Changes since M3
 
 
-The major change since M3 has been the introduction of 0-10 support.
-
+The major change since M3 has been the addition of a new client which 
implements 0-10 support.

svn commit: r725982 - /incubator/qpid/trunk/qpid/java/module.xml

[aidan]

Author: aidan
Date: Fri Dec 12 04:27:06 2008
New Revision: 725982

URL: http://svn.apache.org/viewvc?rev=725982&view=rev
Log:
QPID-1282: add build dep on instrument target for coverage reports

Modified:
incubator/qpid/trunk/qpid/java/module.xml

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=725982&r1=725981&r2=725982&view=diff
==
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Fri Dec 12 04:27:06 2008
@@ -467,7 +467,7 @@
 
   
 
-  
+  
 
   

svn commit: r726010 - in /incubator/qpid/trunk/qpid/java: build.xml module.xml

[aidan]

Author: aidan
Date: Fri Dec 12 05:57:42 2008
New Revision: 726010

URL: http://svn.apache.org/viewvc?rev=726010&view=rev
Log:
QPID-1282: move dependency on build target up a few levels

Modified:
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/module.xml

Modified: incubator/qpid/trunk/qpid/java/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=726010&r1=726009&r2=726010&view=diff
==
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Fri Dec 12 05:57:42 2008
@@ -216,7 +216,7 @@
 
   
   
-  
+  
 
   
 

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=726010&r1=726009&r2=726010&view=diff
==
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Fri Dec 12 05:57:42 2008
@@ -467,7 +467,7 @@
 
   
 
-  
+  
 
   

svn commit: r726776 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java

[aidan]

Author: aidan
Date: Mon Dec 15 11:17:57 2008
New Revision: 726776

URL: http://svn.apache.org/viewvc?rev=726776&view=rev
Log:
QPID-1469: style fix

patch from gemme...@dcs.gla.ac.uk

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java?rev=726776&r1=726775&r2=726776&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
 Mon Dec 15 11:17:57 2008
@@ -30,124 +30,123 @@
 
 import junit.framework.TestCase;
 
-public class AMQUserManagementMBeanTest extends TestCase {
+public class AMQUserManagementMBeanTest extends TestCase
+{
+private Base64MD5PasswordFilePrincipalDatabase _database;
+private AMQUserManagementMBean _amqumMBean;
+
+private static final String _QPID_HOME =  System.getProperty("QPID_HOME");
+
+private static final String USERNAME = "testuser";
+private static final String PASSWORD = "password";
+private static final String JMXRIGHTS = "admin";
+private static final String TEMP_PASSWORD_FILE_NAME = 
"tempPasswordFile.tmp";
+private static final String TEMP_JMXACCESS_FILE_NAME = 
"tempJMXAccessFile.tmp";
 
-   private Base64MD5PasswordFilePrincipalDatabase _database;
-   private AMQUserManagementMBean _amqumMBean;
+@Override
+protected void setUp() throws Exception
+{
+assertNotNull("QPID_HOME not set", _QPID_HOME);
+
+_database = new Base64MD5PasswordFilePrincipalDatabase();
+_amqumMBean = new AMQUserManagementMBean();
+}
+
+@Override
+protected void tearDown() throws Exception
+{
+File testFile = new File(_QPID_HOME + File.separator + 
TEMP_JMXACCESS_FILE_NAME + ".tmp");
+if (testFile.exists())
+{
+testFile.delete();
+}
+
+testFile = new File(_QPID_HOME + File.separator + 
TEMP_JMXACCESS_FILE_NAME + ".old");
+if (testFile.exists())
+{
+testFile.delete();
+}
+
+testFile = new File(_QPID_HOME + File.separator + 
TEMP_PASSWORD_FILE_NAME + ".tmp");
+if (testFile.exists())
+{
+testFile.delete();
+}
+
+testFile = new File(_QPID_HOME + File.separator + 
TEMP_PASSWORD_FILE_NAME + ".old");
+if (testFile.exists())
+{
+testFile.delete();
+}
+}
+
+public void testDeleteUser()
+{
+loadTestPasswordFile();
+loadTestAccessFile();
+
+boolean deleted = false;
+
+try
+{
+deleted = _amqumMBean.deleteUser(USERNAME);
+}
+catch(Exception e){
+fail("Unable to delete user: " + e.getMessage());
+}
+
+assertTrue(deleted);
+}
+ 
+
+//  Utility methods =
 
-   private static final String _QPID_HOME =  
System.getProperty("QPID_HOME");
-   
-   private static final String USERNAME = "testuser";
-   private static final String PASSWORD = "password";
-   private static final String JMXRIGHTS = "admin";
-   private static final String TEMP_PASSWORD_FILE_NAME = 
"tempPasswordFile.tmp";
-   private static final String TEMP_JMXACCESS_FILE_NAME = 
"tempJMXAccessFile.tmp";
-
-   @Override
-   protected void setUp() throws Exception {
-
-   assertNotNull("QPID_HOME not set", _QPID_HOME);
-
-   _database = new Base64MD5PasswordFilePrincipalDatabase();
-   _amqumMBean = new AMQUserManagementMBean();
-   }
-   
-   @Override
-   protected void tearDown() throws Exception {
-   
-   File testFile = new File(_QPID_HOME + File.separator + 
TEMP_JMXACCESS_FILE_NAME + ".tmp");
-   if (testFile.exists())
-   {
-   testFile.delete();
-   }
-   
-   testFile = new File(_QPID_HOME + File.separator + 
TEMP_JMXACCESS_FILE_NAME + ".old");
-   if (testFile.exists())
-   {
-   testFile.delete();
-   }
-
-   testFile = new File(_QPID_HOME + File.separator + 
TEMP_PA

svn commit: r728059 - in /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions: AddServer.java ReconnectServer.java

[aidan]

Author: aidan
Date: Fri Dec 19 08:07:23 2008
New Revision: 728059

URL: http://svn.apache.org/viewvc?rev=728059&view=rev
Log:
QPID-1010 patch from gemme...@dcs.gla.ac.uk


This addresses the button visibility issue in a slightly different way, by 
ensuring ensuring the dialog increases its size to match the contents if the 
(now increased ) default is not large enough. It also centre's the dialog 
correctly, and does not allow it to be resized by the user. The same approach 
is applied to the Reconnect dialog, which suffers similar issues.

In addition, the patch incorporates Enter/Escape keyboard functionality in the 
dialogs, as per QPID-1531

Modified:

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java

Modified: 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java?rev=728059&r1=728058&r2=728059&view=diff
==
--- 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
 (original)
+++ 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
 Fri Dec 19 08:07:23 2008
@@ -28,6 +28,8 @@
 import org.apache.qpid.management.ui.views.ViewUtility;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -35,6 +37,7 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
@@ -106,11 +109,24 @@
 shell.setImage(ApplicationRegistry.getImage(CONSOLE_IMAGE));
 shell.setLayout(new GridLayout());
 
-int x = display.getBounds().width;
-int y = display.getBounds().height;
-shell.setBounds(x/3, y/3, 425, 275);
-
 createWidgets(shell);
+shell.pack();
+
+//get current size dialog, and screen size
+int displayWidth = display.getBounds().width;
+int displayHeight = display.getBounds().height;
+int currentShellWidth = shell.getSize().x;
+int currentShellHeight = shell.getSize().y;
+
+//default sizes for the dialog
+int minShellWidth = 425;
+int minShellHeight= 290;
+//ensure this is large enough, increase it if its not
+int newShellWidth =  currentShellWidth > minShellWidth ? 
currentShellWidth : minShellWidth;
+int newShellHeight = currentShellHeight > minShellHeight ? 
currentShellHeight : minShellHeight;
+
+//set the final size and centre the dialog
+shell.setBounds((displayWidth - newShellWidth)/2 , (displayHeight - 
newShellHeight)/2, newShellWidth, newShellHeight);
 
 shell.open();
 _window.getShell().setEnabled(false);
@@ -201,11 +217,27 @@
 //textPwd.setEchoChar('*');
 textPwd.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 
+//Get the text widgets
+Control[] widgets = composite.getChildren();
+for (int i=0; i < widgets.length; i++)
+{
+widgets[i].addKeyListener(new KeyAdapter()
+{
+public void keyPressed(KeyEvent event)
+{
+if (event.character == SWT.ESC)
+{
+  //Escape key acts as cancel on all widgets
+shell.close();
+}
+}
+});
+}
+
 Composite buttonsComposite  = new Composite(composite, SWT.NONE);
 buttonsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, 
true, 2, 1));
 buttonsComposite.setLayout(new GridLayout(2, true));
 
-
 final Button connectButton = new Button(buttonsComposite, SWT.PUSH | 
SWT.CENTER);   
 connectButton.setText(BUTTON_CONNECT);
 GridData gridData = new GridData (SWT.TRAIL, SWT.BOTTOM, true, true);
@@ -263,12 +295,32 @@
 gridData.widthHint = 100;
 cancelButton.setLayoutData(gridData);
 cancelButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-cancelButton.a

svn commit: r728064 - in /qpid/trunk/qpid/java/release-docs: RELEASE_NOTES.txt RELEASE_NOTES_M1.txt

[aidan]

Author: aidan
Date: Fri Dec 19 08:51:14 2008
New Revision: 728064

URL: http://svn.apache.org/viewvc?rev=728064&view=rev
Log:
Update release notes for M4

Removed:
qpid/trunk/qpid/java/release-docs/RELEASE_NOTES_M1.txt
Modified:
qpid/trunk/qpid/java/release-docs/RELEASE_NOTES.txt

Modified: qpid/trunk/qpid/java/release-docs/RELEASE_NOTES.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/release-docs/RELEASE_NOTES.txt?rev=728064&r1=728063&r2=728064&view=diff
==
--- qpid/trunk/qpid/java/release-docs/RELEASE_NOTES.txt (original)
+++ qpid/trunk/qpid/java/release-docs/RELEASE_NOTES.txt Fri Dec 19 08:51:14 2008
@@ -16,28 +16,20 @@
 New features, Improvements and Bug fixes
 --
 
-AMQP 0-10 support (client only)
-Apache Derby persistent message store
-Transient transactional performance has greatly increased.
+A security related problem was addressed. If Base64MD5 passwords are
+turned on on the broker and it has been configured to use JMXMP via
+the addition of jxmremote_optional.jar to the classpath, it is
+possible for an attacker to bypass the authentication on the JMX
+management interface due to a bug in password verification.
 
-A full list can be found:
-http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12312117&styleName=Text&projectId=12310520
+A new command line management interface was added (qpid-cli)
+
+A full list of changes can be found at:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12313279&styleName=Text&projectId=12310520
 
 
 Known Issues/Outstanding Work
 -
 
-QPID-959: Fail over between a 0-9 and a 0-10 broker is not supported.
-
-QPID-1251: On windows platforms the following run time exception is thrown and 
displayed when initiating a connection with an 0.9 broker:
-  Exception in thread "IoReceiver - localhost/localhost:5672"
-  java.lang.RuntimeException: connection closed
-
-  Moreover, when closing JMS connections the JMS exception listener may
-  receive the following JMS exception:
-
-  javax.jms.JMSException: connection was closed at
-  
org.apache.qpid.client.AMQConnectionDelegate_0_10.onClosed(AMQConnectionDelegate_0_10.java:164)
-
 You can view the outstanding task list for Qpid by visiting our JIRA:
 http://issues.apache.org/jira/browse/QPID

svn commit: r732306 - in /qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid: ./ commands/

[aidan]

Author: aidan
Date: Wed Jan  7 03:34:02 2009
New Revision: 732306

URL: http://svn.apache.org/viewvc?rev=732306&view=rev
Log:
QPID-1522: Rename Command class to CommandImpl and make it implement Command 
interface.

Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java?rev=732306&r1=732305&r2=732306&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
(original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
Wed Jan  7 03:34:02 2009
@@ -39,24 +39,14 @@
 
 import org.apache.qpid.utils.CommandLineOption;
 
-/**
- * Created by IntelliJ IDEA.
- * User: lahiru
- * Date: May 29, 2008
- * Time: 9:21:46 PM
- * To change this template use File | Settings | File Templates.
- */
-public interface
-Command {
+public interface Command {
 
 public static String commandname = null;
 public static CommandLineOption options = null;
 
-void execute();
+public void execute();
 
-void printusage();
+public void printusage();
 
-void optionchecker();
-
-void optionvaluechecker();
+public void optionvaluechecker();
 }

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java?rev=732306&r1=732305&r2=732306&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java
 Wed Jan  7 03:34:02 2009
@@ -40,7 +40,7 @@
 import org.apache.qpid.utils.CommandLineOptionParser;
 import org.apache.qpid.utils.JMXinfo;
 import org.apache.qpid.commands.*;
-import org.apache.qpid.commands.Command;
+import org.apache.qpid.commands.CommandImpl;
 
 
 public class CommandExecusionEngine {

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java?rev=732306&r1=732305&r2=732306&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
 Wed Jan  7 03:34:02 2009
@@ -59,7 +59,7 @@
  * Time: 5:34:51 PM
  * To change this template use File | Settings | File Templates.
  */
-public class Commanddelete extends Command {
+public class Commanddelete extends CommandImpl {
 private String object;
 private String name;
 private String vhost;

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java?rev=732306&r1=732305&r2=732306&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
 Wed Jan  7 03:34:02 2009
@@ -47,7 +47,7 @@
  * Time: 5:55:28 PM
  * To change this template use File | Settings | File Templates.
  */
-public class Commandhelp extends Command {
+public class Commandhelp extends CommandImpl {
 public Commandhelp(JMXinfo info, String name) {
 super(info, name);
 }

Modified: 
qpid/trunk/qpid/java/management/tools/qp

svn commit: r732307 - in /qpid/trunk/qpid/java/management/tools/qpid-cli: src/org/apache/qpid/ src/org/apache/qpid/commands/ test/org/apache/qpid/commands/

[aidan]

Author: aidan
Date: Wed Jan  7 03:36:41 2009
New Revision: 732307

URL: http://svn.apache.org/viewvc?rev=732307&view=rev
Log:
QPID-1522: Move common code up to CommandImpl. Rename methods to be consistent. 
Remove commented out code.

Added:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
Removed:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Command.java
Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java?rev=732307&r1=732306&r2=732307&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
(original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
Wed Jan  7 03:36:41 2009
@@ -37,16 +37,14 @@
  */
 package org.apache.qpid;
 
-import org.apache.qpid.utils.CommandLineOption;
-
 public interface Command {
 
-public static String commandname = null;
-public static CommandLineOption options = null;
-
 public void execute();
 
 public void printusage();
 
-public void optionvaluechecker();
+public String optionchecker(String string);
+
+public boolean checkoptionsetting(String string);
+
 }

Added: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java?rev=732307&view=auto
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 (added)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 Wed Jan  7 03:36:41 2009
@@ -0,0 +1,158 @@
+/*
+ *
+ * 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.
+ *
+ */
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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

svn commit: r732308 - in /qpid/trunk/qpid/java/management/tools/qpid-cli: src/org/apache/qpid/ test/org/apache/qpid/

[aidan]

Author: aidan
Date: Wed Jan  7 03:40:08 2009
New Revision: 732308

URL: http://svn.apache.org/viewvc?rev=732308&view=rev
Log:
QPID-1522: Fix spelling error in classname

Added:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
Removed:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecusionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecusionEngine.java
Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/AllTest.java

Added: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java?rev=732308&view=auto
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
 (added)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
 Wed Jan  7 03:40:08 2009
@@ -0,0 +1,86 @@
+/*
+ *
+ * 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.
+ *
+ */
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ *
+ */
+package org.apache.qpid;
+
+import org.apache.qpid.utils.JMXinfo;
+import org.apache.qpid.commands.*;
+
+
+public class CommandExecutionEngine {
+private Command currentcommand = null;
+private String commandname = null;
+private JMXinfo info = null;
+
+public CommandExecutionEngine(JMXinfo info) {
+this.info = info;
+this.commandname = info.getCommandLineOptionParser().getcommandname();
+}
+
+public boolean CommandSelector() {
+
+if (CommandConstants.INFO_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandinfo(info, this.commandname);
+else if 
(CommandConstants.LIST_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandlist(info, this.commandname);
+else if 
(CommandConstants.HELP_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandhelp(info, this.commandname);
+else if 
(CommandConstants.DELETE_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commanddelete(info, this.commandname);
+else if 
(CommandConstants.MOVE_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandmove(info, this.commandname);
+else if 
(CommandConstants.VIEW_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandview(info, this.commandname);
+else if 
(CommandConstants.VIEWCONTENT_COMMAND.equalsIgnoreCase(this.commandname))
+currentcommand = new Commandviewcontent(info, this.commandname);
+else {
+usage();
+return false;
+}
+return true;
+
+
+}
+
+public void runcommand() {
+currentcommand.execute();
+}
+
+public void usage() {
+System.out.println(commandname + ":Command not found");
+}
+}

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLin

svn commit: r732310 - in /qpid/trunk/qpid/java/management: common/ common/src/ common/src/main/ common/src/main/java/ common/src/main/java/org/ common/src/main/java/org/apache/ common/src/main/java/or

[aidan]

Author: aidan
Date: Wed Jan  7 03:50:43 2009
New Revision: 732310

URL: http://svn.apache.org/viewvc?rev=732310&view=rev
Log:
QPID-1522: Move command line constants to individual command files. Centralise 
list of commands in CommandLineInterpreter. Make CommandExecutionEngine look up 
command from registered list rather than use a big if().


Added:
qpid/trunk/qpid/java/management/common/
qpid/trunk/qpid/java/management/common/src/
qpid/trunk/qpid/java/management/common/src/main/
qpid/trunk/qpid/java/management/common/src/main/java/
qpid/trunk/qpid/java/management/common/src/main/java/org/
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
Removed:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandConstants.java
Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java

Added: 
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java?rev=732310&view=auto
==
--- 
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
 (added)
+++ 
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
 Wed Jan  7 03:50:43 2009
@@ -0,0 +1,249 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+package org.apache.qpid.management.common;
+
+import java.io.IOException;
+import jav

svn commit: r732311 - in /qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid: CommandLineInterpreter.java commands/objects/ObjectNames.java

[aidan]

Author: aidan
Date: Wed Jan  7 03:54:14 2009
New Revision: 732311

URL: http://svn.apache.org/viewvc?rev=732311&view=rev
Log:
QPID-1528: Add get/set commands for JMX attributes.

Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java?rev=732311&r1=732310&r2=732311&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 Wed Jan  7 03:54:14 2009
@@ -49,10 +49,12 @@
 import jline.SimpleCompletor;
 
 import org.apache.qpid.commands.Commanddelete;
+import org.apache.qpid.commands.Commandget;
 import org.apache.qpid.commands.Commandhelp;
 import org.apache.qpid.commands.Commandinfo;
 import org.apache.qpid.commands.Commandlist;
 import org.apache.qpid.commands.Commandmove;
+import org.apache.qpid.commands.Commandset;
 import org.apache.qpid.commands.Commandview;
 import org.apache.qpid.commands.Commandviewcontent;
 import org.apache.qpid.utils.CommandLineOptionParser;
@@ -106,9 +108,16 @@
 /* This implementation is for the people who are using the 
interactive
 mode for one shot this run the user given command and exit */
 for (int i = 0; i < args.length; i++) {
-if (args[i].compareTo("list") == 0 || 
args[i].compareTo("info") == 0 || args[i].compareTo("view") == 0 || 
args[i].compareTo("viewcontent") == 0
-|| args[i].compareTo("delete") == 0 || 
args[i].compareTo("move") == 0) {
-oneshotmode(args,commandlineoptionparser,jmxc,mbsc);
+if (args[i].compareTo("list") == 0 ||
+args[i].compareTo("info") == 0 ||
+args[i].compareTo("view") == 0 ||
+args[i].compareTo("viewcontent") == 0 ||
+args[i].compareTo("delete") == 0 ||
+args[i].compareTo("move") == 0 ||
+args[i].compareTo("set") == 0 ||
+args[i].compareTo("get") == 0)
+{
+oneshotmode(args, commandlineoptionparser, jmxc, mbsc);
 
 return;
 }
@@ -124,7 +133,9 @@
 /* prividing GNU readline features using Jline library */
 PrintWriter out = new PrintWriter(System.out);
 reader.addCompletor(new ArgumentCompletor(
-new SimpleCompletor(new String[]{"list", "info", "exit", 
"quit", "delete", "move", "view", "viewcontent", "queue", "exchange", 
"connection", "usermanagement", "virtualhost"})));
+new SimpleCompletor(new String[]{"get","set","list", 
"info", "exit", "quit", "delete", "move", "view", 
+ "viewcontent", "queue", 
"exchange", "connection", "usermanagement",
+ "virtualhost"})));
 while ((line = reader.readLine("qpid-admin-$ ")) != null) {
 out.flush();
 if (removeSpaces(line).equalsIgnoreCase("quit") || 
removeSpaces(line).equalsIgnoreCase("exit"))
@@ -140,6 +151,7 @@
 engine.runcommand();
 }
 }
+
 conn.getConnector().close();
 }
 catch (Exception ex) {
@@ -150,10 +162,12 @@
 private static void registerCommands()
 {
 CommandExecutionEngine.addCommand(Commanddelete.COMMAND_NAME, 
Commanddelete.class);
+CommandExecutionEngine.addCommand(Commandget.COMMAND_NAME, 
Commandget.class);
 CommandExecutionEngine.addCommand(Commandhelp.COMMAND_NAME, 
Commandhelp.class);
 CommandExecutionEngine.addCommand(Commandinfo.COMMAND_NAME, 
Commandinfo.class);
 CommandExecutionEngine.addCommand(Commandlist.COMMAND_NAME, 
Commandlist.class);
 CommandExecutionEngine.addCommand(Commandmove.COMMAND_NAME, 
Commandmove.class);
+Comma

svn commit: r732330 - in /qpid/trunk/qpid/java: ./ management/common/ management/common/src/main/java/org/apache/qpid/management/common/sasl/ management/eclipse-plugin/ management/eclipse-plugin/META-

[aidan]

Author: aidan
Date: Wed Jan  7 05:32:59 2009
New Revision: 732330

URL: http://svn.apache.org/viewvc?rev=732330&view=rev
Log:
QPID-1539: add management/common module. Move SASL and login code there.
 Make gui depend on management common and OSGify it a bit.

Added:
qpid/trunk/qpid/java/management/common/build.xml

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
  - copied, changed from r732325, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/MANIFEST.MF
Removed:

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
Modified:
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF

qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build.xml

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini

Modified: qpid/trunk/qpid/java/build.deps
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=732330&r1=732329&r2=732330&view=diff
==
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Wed Jan  7 05:32:59 2009
@@ -102,3 +102,4 @@
 management-eclipse-plugin.test.libs=${systests.libs}
 broker-plugins.test.

svn commit: r732332 - in /qpid/trunk/qpid/java/management/tools/qpid-cli: ./ bin/ src/org/apache/qpid/ src/org/apache/qpid/utils/ test/org/apache/qpid/ test/org/apache/qpid/commands/ test/org/apache/q

[aidan]

Author: aidan
Date: Wed Jan  7 05:41:40 2009
New Revision: 732332

URL: http://svn.apache.org/viewvc?rev=732332&view=rev
Log:
QPID-1548: Make the CLI depend on management-common, use the login logic there.

Modified:
qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/ConnectionConstants.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestConnector.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestAllObject.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestConnectionObject.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestExchangeObject.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestQueueObject.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestUserManagementObject.java

qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestVirtualHostObject.java

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat?rev=732332&r1=732331&r2=732332&view=diff
==
--- qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat Wed Jan  7 
05:41:40 2009
@@ -19,6 +19,7 @@
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/jline-0.9.94.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/junit-4.4.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/qpid-cli-1.0.jar
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/qpid-management-common-M4.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/management/tools/qpid-cli/main/classes/
 java -classpath %CLASSPATH% org.apache.qpid.CommandLineInterpreter %1
 

Modified: qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml?rev=732332&r1=732331&r2=732332&view=diff
==
--- qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml (original)
+++ qpid/trunk/qpid/java/management/tools/qpid-cli/build.xml Wed Jan  7 
05:41:40 2009
@@ -20,7 +20,7 @@
  -->
 
 
-  
+  
   
   
   

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java?rev=732332&r1=732331&r2=732332&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 Wed Jan  7 05:41:40 2009
@@ -96,7 +96,8 @@
 commandlineoptionparser = new 
CommandLineOptionParser(args);
 
 JMXConfiguration config = new 
JMXConfiguration(commandlineoptionparser.getAlloptions());
-conn = ConnectorFactory.getConnector(config.gethostname(), 
config.getport());
+conn = Conne

svn commit: r732340 - in /qpid/trunk/qpid/java/broker/scripts: ./ resetAlerting.sh

[aidan]

Author: aidan
Date: Wed Jan  7 05:56:38 2009
New Revision: 732340

URL: http://svn.apache.org/viewvc?rev=732340&view=rev
Log:
Add script to reset the alerting levels, which were broken in M2.1

Added:
qpid/trunk/qpid/java/broker/scripts/
qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh

Added: qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh?rev=732340&view=auto
==
--- qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh (added)
+++ qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh Wed Jan  7 05:56:38 
2009
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# Alerting Rest Scripts to renabled the alerts on the queue.
+#
+# Defaults to Localhost broker
+#
+
+CLI=./build/bin/qpid-cli
+OUTPUT=0
+
+
+resetQueue()
+{
+vhost=$1
+queue=$2
+echo "Resetting Values for $queue on $vhost"
+rawQDepth=`$CLI get -o queue -v $vhost -n $queue  -a MaximumQueueDepth`
+# Note that MaxQueDepth is returned as Kb but set as b!
+queueDepth=$[ $rawQDepth * 1024 ]
+messageAge=`$CLI get -o queue -v $vhost -n $queue  -a MaximumMessageAge`
+messageCount=`$CLI get -o queue -v $vhost -n $queue  -a 
MaximumMessageCount`
+messageSize=`$CLI get -o queue -v $vhost -n $queue  -a MaximumMessageSize` 
+
+if [ $OUTPUT == 1 ] ; then
+ echo Current Values:
+ echo MaximumQueueDepth   : $queueDepth
+ echo MaximumMessageAge   : $messageAge
+ echo MaximumMessageCount : $messageCount
+ echo MaximumMessageSize  : $messageSize
+fi
+
+$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageSize -s 
$messageSize
+$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageAge -s $messageAge
+$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageCount -s 
$messageCount
+$CLI set -o queue -v $vhost -n $queue  -a MaximumQueueDepth -s $queueDepth 

+}
+
+resetVirtualHost()
+{
+ vhost=$1
+ ignore=0
+ for queue in `$CLI list -o queue -v $vhost |grep '|' | cut -d '|' -f 1 ` ; do
+ 
+   if [ $ignore == 0 ] ; then
+ ignore=1
+   else
+ resetQueue $vhost $queue
+   fi
+ 
+ done
+}
+
+for vhost in `$CLI list -o virtualhost|grep VirtualHost|cut -d '=' -f 3` ; do
+
+ resetVirtualHost $vhost
+ 
+done
+

svn commit: r732390 - in /qpid/trunk/qpid/java: build.xml common.xml module.xml

[aidan]

Author: aidan
Date: Wed Jan  7 08:38:20 2009
New Revision: 732390

URL: http://svn.apache.org/viewvc?rev=732390&view=rev
Log:
Only define cobertura task definition  when it's about to get used.

Modified:
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=732390&r1=732389&r2=732390&view=diff
==
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Wed Jan  7 08:38:20 2009
@@ -195,7 +195,7 @@
 
   
 
-  
+  
 
   
   

Modified: qpid/trunk/qpid/java/common.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=732390&r1=732389&r2=732390&view=diff
==
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Wed Jan  7 08:38:20 2009
@@ -61,8 +61,6 @@
 
   
 
-  
-
   
 
 
@@ -134,6 +132,10 @@
 
   
 
+  
+
+  
+
   
 
   ant build

Modified: qpid/trunk/qpid/java/module.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=732390&r1=732389&r2=732390&view=diff
==
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Wed Jan  7 08:38:20 2009
@@ -470,7 +470,7 @@
 
   
 
-  
+  
 
   
@@ -530,7 +530,7 @@
 
   
 
-  
+  
   
   

svn commit: r732729 - /qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh

[aidan]

Author: aidan
Date: Thu Jan  8 07:41:18 2009
New Revision: 732729

URL: http://svn.apache.org/viewvc?rev=732729&view=rev
Log:
Improve error handling, help

Modified:
qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh

Modified: qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh?rev=732729&r1=732728&r2=732729&view=diff
==
--- qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh (original)
+++ qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh Thu Jan  8 07:41:18 
2009
@@ -5,21 +5,52 @@
 # Defaults to Localhost broker
 #
 
-CLI=./build/bin/qpid-cli
+if [ -z "$QPID_ALERT_HOME" ]; then
+export QPID_ALERT_HOME=$(dirname $(dirname $(readlink -f $0)))
+export PATH=${PATH}:${QPID_ALERT_HOME}/bin
+fi
+
+USERNAME=$1
+PASSWORD=$2
+HOSTNAME=$3
+PORT=$4
+
+CLI="$QPID_ALERT_HOME/bin/qpid-cli -h ${HOSTNAME:-localhost} -p ${PORT:-8999}"
+AUTH=
+if [ -n $USERNAME ] ; then
+   if [ "$USERNAME" == "-h" ] ; then
+   echo "resetAlerting.sh: [  [ []]]"
+   exit 0
+   fi
+   if [ -n $PASSWORD ] ; then
+   AUTH="-u $USERNAME -w $PASSWORD"
+   else 
+   echo "Password must be specified with username"
+   fi
+fi
+  
+
 OUTPUT=0
 
+runCommand()
+{
+  RET=`$CLI $1 $AUTH`
+}
 
 resetQueue()
 {
 vhost=$1
 queue=$2
-echo "Resetting Values for $queue on $vhost"
-rawQDepth=`$CLI get -o queue -v $vhost -n $queue  -a MaximumQueueDepth`
-# Note that MaxQueDepth is returned as Kb but set as b!
+runCommand "get -o queue -v $vhost -n $queue  -a MaximumQueueDepth"
+rawQDepth=$RET
+# Note that MaxQueueDepth is returned as Kb but set as b!
 queueDepth=$[ $rawQDepth * 1024 ]
-messageAge=`$CLI get -o queue -v $vhost -n $queue  -a MaximumMessageAge`
-messageCount=`$CLI get -o queue -v $vhost -n $queue  -a 
MaximumMessageCount`
-messageSize=`$CLI get -o queue -v $vhost -n $queue  -a MaximumMessageSize` 
+runCommand "get -o queue -v $vhost -n $queue  -a MaximumMessageAge"
+messageAge=$RET
+runCommand "get -o queue -v $vhost -n $queue  -a MaximumMessageCount"
+messageCount=$RET
+runCommand "get -o queue -v $vhost -n $queue  -a MaximumMessageSize" 
+messageSize=$RET
 
 if [ $OUTPUT == 1 ] ; then
  echo Current Values:
@@ -29,30 +60,36 @@
  echo MaximumMessageSize  : $messageSize
 fi
 
-$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageSize -s 
$messageSize
-$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageAge -s $messageAge
-$CLI set -o queue -v $vhost -n $queue  -a MaximumMessageCount -s 
$messageCount
-$CLI set -o queue -v $vhost -n $queue  -a MaximumQueueDepth -s $queueDepth 

+runCommand "set -o queue -v $vhost -n $queue  -a MaximumMessageSize -s 
$messageSize"
+runCommand "set -o queue -v $vhost -n $queue  -a MaximumMessageAge -s 
$messageAge"
+runCommand "set -o queue -v $vhost -n $queue  -a MaximumMessageCount -s 
$messageCount"
+runCommand "set -o queue -v $vhost -n $queue  -a MaximumQueueDepth -s 
$queueDepth"
 }
 
 resetVirtualHost()
 {
  vhost=$1
  ignore=0
- for queue in `$CLI list -o queue -v $vhost |grep '|' | cut -d '|' -f 1 ` ; do
+ for queue in `$CLI list -o queue -v $vhost $AUTH |grep '|' | cut -d '|' -f 1 
` ; do
  
if [ $ignore == 0 ] ; then
  ignore=1
-   else
+   else 
  resetQueue $vhost $queue
fi
  
  done
 }
 
-for vhost in `$CLI list -o virtualhost|grep VirtualHost|cut -d '=' -f 3` ; do
-
- resetVirtualHost $vhost
- 
-done
-
+VHOST=`$CLI list -o virtualhost $AUTH`
+COUNT=`echo $VHOST | grep -c VirtualHost`
+if [ $COUNT -gt 0 ] ; then
+   for vhost in `echo $VHOST |grep VirtualHost|cut -d '=' -f 3` ; do
+
+  echo "Resetting alert levels for $vhost";
+  resetVirtualHost $vhost;
+   done
+   echo "Alerting levels reset"
+else
+   echo $VHOST
+fi

svn commit: r733016 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security: access/management/AMQUserManagementMBean.java auth/database/Base64MD5PasswordFilePrincipalDatabase.

[aidan]

Author: aidan
Date: Fri Jan  9 04:03:03 2009
New Revision: 733016

URL: http://svn.apache.org/viewvc?rev=733016&view=rev
Log:
QPID-1563: Use createTempFile

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java?rev=733016&r1=733015&r2=733016&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
 Fri Jan  9 04:03:03 2009
@@ -396,23 +396,11 @@
 _accessRightsUpdate.lock();
 try
 {
-// remove old temporary file
-File tmp = new File(_accessFileName + ".tmp");
-if (tmp.exists())
-{
-tmp.delete();
-}
-
-//remove old backup
-File old = new File(_accessFileName + ".old");
-if (old.exists())
-{
-old.delete();
-}
+// Create temporary file
+File tmp = File.createTempFile(_accessFileName, ".tmp");
 
 // Rename current file
 File rights = new File(_accessFileName);
-rights.renameTo(old);
 
 FileOutputStream output = new FileOutputStream(tmp);
 _accessRights.store(output, "Generated by 
AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=733016&r1=733015&r2=733016&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 Fri Jan  9 04:03:03 2009
@@ -386,11 +386,7 @@
 
 BufferedReader reader = null;
 PrintStream writer = null;
-File tmp = new File(_passwordFile.getAbsolutePath() + ".tmp");
-if (tmp.exists())
-{
-tmp.delete();
-}
+File tmp = File.createTempFile(_passwordFile.getName(), ".tmp");
 
 try
 {

svn commit: r733073 [4/4] - in /qpid/trunk/qpid/java/management/tools/qpid-cli: src/org/apache/qpid/ src/org/apache/qpid/commands/ src/org/apache/qpid/commands/objects/ src/org/apache/qpid/utils/ test

[aidan]

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfigProperty.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfigProperty.java?rev=733073&r1=733072&r2=733073&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfigProperty.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfigProperty.java
 Fri Jan  9 08:24:01 2009
@@ -18,34 +18,9 @@
  * under the License.
  *
  */
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
- *
- */
 package org.apache.qpid.utils;
 
-import junit.framework.TestCase;
+public class TestJMXConfigProperty
+{
 
-/**
- * Created by IntelliJ IDEA.
- * User: lahiru
- * Date: Jun 30, 2008
- * Time: 12:15:35 PM
- * To change this template use File | Settings | File Templates.
- */
-public class TestJMXConfigProperty {
-
 }

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfiguration.java?rev=733073&r1=733072&r2=733073&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXConfiguration.java
 Fri Jan  9 08:24:01 2009
@@ -18,45 +18,22 @@
  * under the License.
  *
  */
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
- *
- */
 package org.apache.qpid.utils;
 
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
+import java.util.ArrayList;
+
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-import java.util.ArrayList;
-
-/**
- * Created by IntelliJ IDEA.
- * User: lahiru
- * Date: Jun 30, 2008
- * Time: 12:14:32 PM
- * To change this template use File | Settings | File Templates.
- */
-public class TestJMXConfiguration {
+public class TestJMXConfiguration
+{
 CommandLineOptionParser clop;
 JMXConfiguration jmc;
 CommandLineOption option;
-String [] input;
+String[] input;
+
 @Before
 public void setup()
 {
@@ -65,16 +42,18 @@
 clop = new CommandLineOptionParser(input);
 jmc = new JMXConfiguration(clop.getAlloptions());
 }
+
 @Test
 public void TestLoadOption()
 {
 ArrayList list = new ArrayList();
 list.add("127.0.0.1");
-option = new CommandLineOption("-h",list);
-CommandLineOption expect = jmc.loadoption("h",clop.getAlloptions());
-Assert.assertEquals(expect.getOptionType(),option.getOptionType());
-Assert.assertEquals(expect.getOptionValue(),option.getOptionValue());
+option = new CommandLineOption("-h", list);
+CommandLineOption expect = jmc.loadoption("h", clop.getAlloptions());
+Assert.assertEquals(expect.getOptionType(), option.getOptionType());
+Assert.assertEquals(expect.getOptionValue(), option.getOptionValue());
 }
+
 @After
 public void cleanup()
 {

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXinfo.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXinfo.java?rev=733073&r1=733072&r2=733073&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/utils/TestJMXinfo.java
 (origi

svn commit: r733830 - in /qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security: access/management/AMQUserManagementMBean.java auth/database/Base64MD5PasswordFilePrincipa

[aidan]

Author: aidan
Date: Mon Jan 12 08:08:46 2009
New Revision: 733830

URL: http://svn.apache.org/viewvc?rev=733830&view=rev
Log:
QPID-1563: Use createTempFile

merge from trunk 733016

Modified:

qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java

qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java

Modified: 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java?rev=733830&r1=733829&r2=733830&view=diff
==
--- 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
 (original)
+++ 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
 Mon Jan 12 08:08:46 2009
@@ -396,23 +396,11 @@
 _accessRightsUpdate.lock();
 try
 {
-// remove old temporary file
-File tmp = new File(_accessFileName + ".tmp");
-if (tmp.exists())
-{
-tmp.delete();
-}
-
-//remove old backup
-File old = new File(_accessFileName + ".old");
-if (old.exists())
-{
-old.delete();
-}
+// Create temporary file
+File tmp = File.createTempFile(_accessFileName, ".tmp");
 
 // Rename current file
 File rights = new File(_accessFileName);
-rights.renameTo(old);
 
 FileOutputStream output = new FileOutputStream(tmp);
 _accessRights.store(output, "Generated by 
AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());

Modified: 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=733830&r1=733829&r2=733830&view=diff
==
--- 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 (original)
+++ 
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 Mon Jan 12 08:08:46 2009
@@ -386,11 +386,7 @@
 
 BufferedReader reader = null;
 PrintStream writer = null;
-File tmp = new File(_passwordFile.getAbsolutePath() + ".tmp");
-if (tmp.exists())
-{
-tmp.delete();
-}
+File tmp = File.createTempFile(_passwordFile.getName(), ".tmp");
 
 try
 {

svn commit: r734079 - in /qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid: Command.java commands/CommandImpl.java commands/Commandget.java commands/Commandinfo.java commands/Command

[aidan]

Author: aidan
Date: Tue Jan 13 01:25:53 2009
New Revision: 734079

URL: http://svn.apache.org/viewvc?rev=734079&view=rev
Log:
QPID-1522: remove bogus COMMAND_NAME in CommandImpl.java, fix typos in help


Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java?rev=734079&r1=734078&r2=734079&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
(original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java 
Tue Jan 13 01:25:53 2009
@@ -22,9 +22,6 @@
 
 public interface Command
 {
-
-public static String COMMAND_NAME = null;
-
 public void execute();
 
 public void printusage();

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java?rev=734079&r1=734078&r2=734079&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
 Tue Jan 13 01:25:53 2009
@@ -143,7 +143,7 @@
 public void unrecognizeoption()
 {
 echo("list: Unrecognized option");
-echo("Try `" + COMMAND_NAME + " --help` for more information");
+echo("Try --help for more information");
 }
 
 public abstract void execute();

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java?rev=734079&r1=734078&r2=734079&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
 Tue Jan 13 01:25:53 2009
@@ -76,7 +76,7 @@
 
 if (objname.getSet().size() != 1)
 {
-echo("You quering return more than one queue to set was this 
intended?\n" + objname.getQueryString());
+echo("Your query returned more than one object to set was this 
intended?\n" + objname.getQueryString());
 }
 else if (objname.getSet().size() == 1)
 {
@@ -91,9 +91,9 @@
 if (hasName())
 {
 
-echo("You might quering wrong " + this.getObject() + " 
name with --name or -n option ");
+echo("You might be querying wrong " + this.getObject() + " 
name with --name or -n option ");
 echo("");
-echo(this.getObject() + "Type Objects might not in the 
broker currently");
+echo("No " + this.getObject() + "Type Objects might not in 
the broker currently");
 echo("");
 }
 else

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java?rev=734079&r1=734078&r2=734079&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
 Tue Jan 13 01:25:53 2009
@@ -114,9 +114,9 @@
 if (hasName())
 {
 
-echo("You might quering wrong " + this.getObject() + " 
name with --name or -n option ");
+echo("You might querying wrong " + this.getObject() + " 
name with --name or -n option ");
 

svn commit: r734081 - in /qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid: CommandExecutionEngine.java CommandLineInterpreter.java

[aidan]

Author: aidan
Date: Tue Jan 13 01:26:41 2009
New Revision: 734081

URL: http://svn.apache.org/viewvc?rev=734081&view=rev
Log:
QPID-1528: Use central list of commands for parsing and completing.

Modified:

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java

qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java?rev=734081&r1=734080&r2=734081&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
 Tue Jan 13 01:26:41 2009
@@ -58,6 +58,11 @@
 {
 _commands.put(name, newCommand);
 }
+
+public static Map> getCommands()
+{
+return _commands;
+}
 
 public void runcommand()
 {

Modified: 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java?rev=734081&r1=734080&r2=734081&view=diff
==
--- 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 (original)
+++ 
qpid/trunk/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
 Tue Jan 13 01:26:41 2009
@@ -22,6 +22,8 @@
 package org.apache.qpid;
 
 import java.io.PrintWriter;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.StringTokenizer;
 
 import javax.management.MBeanServerConnection;
@@ -46,6 +48,13 @@
 
 public class CommandLineInterpreter
 {
+private static final String OBJECT_VIRTUALHOST = "virtualhost";
+private static final String OBJECT_USERMANAGEMENT = "usermanagement";
+private static final String OBJECT_CONNECTION = "connection";
+private static final String OBJECT_EXCHANGE = "exchange";
+private static final String OBJECT_QUEUE = "queue";
+private static final String COMMAND_QUIT = "quit";
+private static final String COMMAND_EXIT = "exit";
 
 public static void main(String[] args)
 {
@@ -118,13 +127,9 @@
  */
 for (int i = 0; i < args.length; i++)
 {
-if (args[i].compareTo("list") == 0 || 
args[i].compareTo("info") == 0
-|| args[i].compareTo("view") == 0 || 
args[i].compareTo("viewcontent") == 0
-|| args[i].compareTo("delete") == 0 || 
args[i].compareTo("move") == 0
-|| args[i].compareTo("set") == 0 || 
args[i].compareTo("get") == 0)
+if 
(CommandExecutionEngine.getCommands().keySet().contains(args[i]))
 {
 oneshotmode(args, commandlineoptionparser, jmxc, mbsc);
-
 return;
 }
 }
@@ -140,13 +145,18 @@
 
 /* prividing GNU readline features using Jline library */
 PrintWriter out = new PrintWriter(System.out);
-reader.addCompletor(new ArgumentCompletor(new SimpleCompletor(new 
String[] { "get", "set", "list", "info",
-"exit", "quit", "delete", "move", "view", "viewcontent", 
"queue", "exchange", "connection",
-"usermanagement", "virtualhost" })));
+SimpleCompletor completer = new SimpleCompletor(new String[] { 
+COMMAND_EXIT, COMMAND_QUIT, OBJECT_QUEUE, OBJECT_EXCHANGE, 
OBJECT_CONNECTION,
+OBJECT_USERMANAGEMENT, OBJECT_VIRTUALHOST});
+for (String commandName : 
CommandExecutionEngine.getCommands().keySet())
+{
+completer.addCandidateString(commandName);
+}
+reader.addCompletor(new ArgumentCompletor(completer));
 while ((line = reader.readLine("qpid-admin-$ ")) != null)
 {
 out.flush();
-if (removeSpaces(line).equalsIgnoreCase("quit") || 
removeSpaces(line).equalsIgnoreCase("exit"))
+if (removeSpaces(line).equalsIgnoreCase(COMMAND_QUIT) || 
removeSpaces(line).equalsIgnoreCase(COMMAND_EXIT))
 break;
 else if (line.length() == 0)
 continue;

svn commit: r734379 - in /qpid/trunk/qpid/java: ./ systests/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/server/exchange/ systests/src/main/java/org/apache/qpid/server/

[aidan]

Author: aidan
Date: Wed Jan 14 05:05:45 2009
New Revision: 734379

URL: http://svn.apache.org/viewvc?rev=734379&view=rev
Log:
QPID-1573: Change AMQQueueDeferredOrderingTest, 
ReturnUnroutableMandatoryMessageTest, DispatcherTest, PriorityTest and 
TimeToLiveTest to extend QpidTestCase

Add ReturnUnroutableMandatoryMessageTest, PriorityTest and TimeToLiveTest to 
the 010ExcludeList

Modified:
qpid/trunk/qpid/java/010ExcludeList

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

Modified: qpid/trunk/qpid/java/010ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/010ExcludeList?rev=734379&r1=734378&r2=734379&view=diff
==
--- qpid/trunk/qpid/java/010ExcludeList (original)
+++ qpid/trunk/qpid/java/010ExcludeList Wed Jan 14 05:05:45 2009
@@ -55,3 +55,7 @@
 org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
 // QPID-1262, QPID-1119 : This test fails occasionally due to potential 
protocol issue.
 org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
+// c++ broker doesn't support priorities, TTL or message bouncing
+org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
+org.apache.qpid.server.queue.PriorityTest#*
+org.apache.qpid.server.queue.TimeToLiveTest#*

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=734379&r1=734378&r2=734379&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
 Wed Jan 14 05:05:45 2009
@@ -20,30 +20,26 @@
  */
 package org.apache.qpid.client;
 
+import javax.jms.Connection;
+import javax.jms.Session;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.jms.Session;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * This class tests all the alerts an AMQQueue can throw based on threshold
- * values of different parameters
- */
-public class AMQQueueDeferredOrderingTest extends TestCase
+public class AMQQueueDeferredOrderingTest extends QpidTestCase
 {
 
 private static final int NUM_MESSAGES = 1000;
 
-private AMQConnection con;
+private Connection con;
 private Session session;
 private AMQQueue queue;
 private MessageConsumer consumer;
@@ -51,7 +47,6 @@
 private static final Logger _logger = 
LoggerFactory.getLogger(AMQQueueDeferredOrderingTest.class);
 
 private ASyncProducer producerThread;
-private static final String BROKER = "vm://:1";
 
 private class ASyncProducer extends Thread
 {
@@ -95,11 +90,11 @@
 TransportConnection.createVMBroker(1);
 
 _logger.info("Create Connection");
-con = new AMQConnection(BROKER, "guest", "guest", "OrderingTest", 
"test");
+con = getConnection();
 _logger.info("Create Session");
 session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
 _logger.info("Create Q");
-queue = new AMQQueue(session.getDefaultQueueExchangeName(), new 
AMQShortString("Q"), new AMQShortString("Q"),
+queue = new AMQQueue(new AMQShortString("amq.direct"), new 
AMQShortString("Q"), new AMQShortString("Q"),
 false, true);
 _logger.info("Create Consumer of Q");
 consumer = session.createConsumer(queue);

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java?rev=734379&r1=734378&r2=734379&view=diff
==
--- 
qpid/trunk/qpid/java/syste

svn commit: r734677 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

[aidan]

Author: aidan
Date: Thu Jan 15 03:43:45 2009
New Revision: 734677

URL: http://svn.apache.org/viewvc?rev=734677&view=rev
Log:
QPID-1575: Reduce TTL from 1 second to 100ms

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=734677&r1=734676&r2=734677&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 Thu Jan 15 03:43:45 2009
@@ -43,7 +43,7 @@
 
 protected final String QUEUE = "TimeToLiveQueue";
 
-private final long TIME_TO_LIVE = 1000L;
+private final long TIME_TO_LIVE = 100L;
 
 private static final int MSG_COUNT = 50;
 private static final long SERVER_TTL_TIMEOUT = 6L;

svn commit: r735023 - in /qpid/trunk/qpid/java/management/eclipse-plugin: ./ src/main/resources/ src/main/resources/icons/ src/main/resources/jmxremote.sasl-plugin/ src/main/resources/linux-gtk-x86/ s

[aidan]

Author: aidan
Date: Fri Jan 16 06:17:23 2009
New Revision: 735023

URL: http://svn.apache.org/viewvc?rev=735023&view=rev
Log:
QPID-1565: Move each platforms config + executables into a more appropriately 
named folder, and where suitable with the structure they should take within the 
console builds. Additionally, the component plugin's manifest folders are moved 
to indicate their usage better. There is also a patch to update the build 
process with the new locations.

Patch from Robbie Gemmell gemme...@dcs.gla.ac.uk

Added:

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/
  - copied from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/sasl/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/
  - copied from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/
  - copied from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/icons/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/
  - copied from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/
  - copied from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
  - copied unchanged from r735021, 
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
Removed:

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/icons/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/sasl/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/
Modified:

qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties

q

svn commit: r735735 - in /qpid/trunk/qpid/java: broker/src/test/java/org/apache/qpid/server/ broker/src/test/java/org/apache/qpid/server/ack/ broker/src/test/java/org/apache/qpid/server/exchange/ brok

[aidan]

Author: aidan
Date: Mon Jan 19 07:56:57 2009
New Revision: 735735

URL: http://svn.apache.org/viewvc?rev=735735&view=rev
Log:
QPID-1573: Move unit tests that were living in systests into appropriate 
module. Fix up a few bugs in other tests that this exposed. 

Added:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
  - copied, changed from r734435, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
  - copied, changed from r734435, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
  - copied unchanged from r735666, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
  - copied unchanged from r735666, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
  - copied, changed from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
  - copied unchanged from r734435, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestMemoryMessageStore.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
  - copied unchanged from r734440, 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
Removed:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestMemoryMessageStore.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/s

svn commit: r735993 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java test/java/org/apache/qpid/server/security/access/PrincipalPermissi

[aidan]

Author: aidan
Date: Tue Jan 20 03:06:37 2009
New Revision: 735993

URL: http://svn.apache.org/viewvc?rev=735993&view=rev
Log:
QPID-1600: Add tests for PrincipalPermissions, document arguments to authorise 
and grant.

Added:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java?rev=735993&r1=735992&r2=735993&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
 Tue Jan 20 03:06:37 2009
@@ -60,6 +60,22 @@
 _permissions = new ConcurrentHashMap();
 }
 
+/**
+ * 
+ * @param permission the type of permission to check
+ * 
+ * @param parameters vararg depending on what permission was passed in
+ *  ACCESS: none
+ *  BIND: none
+ *  CONSUME: AMQShortString queueName, Boolean temporary, Boolean 
ownQueueOnly
+ *  CREATE:  Boolean temporary, AMQShortString queueName, AMQShortString 
exchangeName, AMQShortString routingKey
+ *  or
+ *   AMQShortString exchangeName, AMQShortString Class
+ *  DELETE: none
+ *  PUBLISH: Exchange exchange, AMQShortString routingKey
+ *  PURGE: none
+ *  UNBIND: none
+ */
 public void grant(Permission permission, Object... parameters)
 {
 switch (permission)
@@ -306,6 +322,20 @@
 
 }
 
+/**
+ * 
+ * @param permission the type of permission to check
+ * 
+ * @param parameters vararg depending on what permission was passed in
+ *  ACCESS: none
+ *  BIND: QueueBindBody bindmethod, Exchange exchange, AMQQueue queue, 
AMQShortString routingKey
+ *  CONSUME: AMQQueue queue
+ *  CREATE:  QueueDeclareBody obj || ExchangeDeclareBody obj
+ *  DELETE: none
+ *  PUBLISH: Exchange exchange, AMQShortString routingKey
+ *  PURGE: none
+ *  UNBIND: none
+ */
 public boolean authorise(Permission permission, Object... parameters)
 {
 

Added: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java?rev=735993&view=auto
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
 (added)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
 Tue Jan 20 03:06:37 2009
@@ -0,0 +1,146 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+package org.apache.qpid.server.security.access;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.framing.amqp_0_9.ExchangeDeclareBodyImpl;
+import org.apache.qpid.framing.amqp_0_9.QueueDeclareBodyImpl;
+import org.apache.qpid.framing.amqp_8_0.QueueBindBodyImpl;
+import org.apache.qpid.server.exchange.DirectExchange;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.store.SkeletonMessageStore;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+public class PrincipalPermissionsTest extends TestCase
+{
+
+private String _user = "user";
+private PrincipalPermissions _perms;
+
+// Common things that are passed to frame constructors
+private AMQShortString _queueName = ne

svn commit: r735994 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

[aidan]

Author: aidan
Date: Tue Jan 20 03:41:43 2009
New Revision: 735994

URL: http://svn.apache.org/viewvc?rev=735994&view=rev
Log:
Reorder receives, check that we don't get 3 messages first. Trying to debug 
occasional failures on a slow cruise control machine. 

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=735994&r1=735993&r2=735994&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 Tue Jan 20 03:41:43 2009
@@ -95,19 +95,20 @@
 clientConnection.start();
 
 //Receive Message 0
-Message received = consumer.receive(1000);
-Assert.assertNotNull("First message not received", received);
-Assert.assertTrue("First message doesn't have first set.", 
received.getBooleanProperty("first"));
-Assert.assertEquals("First message has incorrect TTL.", 0L, 
received.getLongProperty("TTL"));
-
-
-received = consumer.receive(1000);
-Assert.assertNotNull("Final message not received", received);
-Assert.assertFalse("Final message has first set.", 
received.getBooleanProperty("first"));
-Assert.assertEquals("Final message has incorrect TTL.", 0L, 
received.getLongProperty("TTL"));
-
-received = consumer.receive(1000);
-Assert.assertNull("More messages received", received);
+Message receivedFirst = consumer.receive(1000);
+Message receivedSecond = consumer.receive(1000);
+Message receivedThird = consumer.receive(1000);
+
+// Only first and last messages sent should survive expiry
+Assert.assertNull("More messages received", receivedThird); 
+
+Assert.assertNotNull("First message not received", receivedFirst);
+Assert.assertTrue("First message doesn't have first set.", 
receivedFirst.getBooleanProperty("first"));
+Assert.assertEquals("First message has incorrect TTL.", 0L, 
receivedFirst.getLongProperty("TTL"));
+
+Assert.assertNotNull("Final message not received", receivedSecond);
+Assert.assertFalse("Final message has first set.", 
receivedSecond.getBooleanProperty("first"));
+Assert.assertEquals("Final message has incorrect TTL.", 0L, 
receivedSecond.getLongProperty("TTL"));
 
 clientConnection.close();
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r736618 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

[aidan]

Author: aidan
Date: Thu Jan 22 04:19:47 2009
New Revision: 736618

URL: http://svn.apache.org/viewvc?rev=736618&view=rev
Log:
QPID-1418: Destroy and recreate consumer once all messages are
sent so that they have enough time to expire.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=736618&r1=736617&r2=736618&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
 Thu Jan 22 04:19:47 2009
@@ -55,8 +55,13 @@
 
 Session clientSession = clientConnection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
 Queue queue = clientSession.createQueue(QUEUE); 
-
+
+// Create then close the consumer so the queue is actually created
+// Closing it then reopening it ensures that the consumer shouldn't 
get messages
+// which should have expired and allows a shorter sleep period. See 
QPID-1418
+
 MessageConsumer consumer = clientSession.createConsumer(queue);
+consumer.close();
 
 //Create Producer
 Connection producerConnection = getConnection();
@@ -82,10 +87,11 @@
 producer.setTimeToLive(0L);
 producer.send(nextMessage(String.valueOf(msg), false, producerSession, 
producer));
 
- try
+consumer = clientSession.createConsumer(queue);
+try
 {
 // Sleep to ensure TTL reached
-Thread.sleep(2000);
+Thread.sleep(TIME_TO_LIVE);
 }
 catch (InterruptedException e)
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r736715 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/jms/

[aidan]

Author: aidan
Date: Thu Jan 22 09:06:25 2009
New Revision: 736715

URL: http://svn.apache.org/viewvc?rev=736715&view=rev
Log:
Remove unused class JmsConsumer

Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/jms/


-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r740270 - /qpid/trunk/.gitignore

[aidan]

Author: aidan
Date: Tue Feb  3 10:55:46 2009
New Revision: 740270

URL: http://svn.apache.org/viewvc?rev=740270&view=rev
Log:
Add some cpp and cobertura files

Modified:
qpid/trunk/.gitignore

Modified: qpid/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/qpid/trunk/.gitignore?rev=740270&r1=740269&r2=740270&view=diff
==
--- qpid/trunk/.gitignore (original)
+++ qpid/trunk/.gitignore Tue Feb  3 10:55:46 2009
@@ -15,6 +15,12 @@
 qpid/cpp/examples/direct/declare_queues
 qpid/cpp/examples/direct/direct_producer
 qpid/cpp/examples/direct/listener
+qpid/cpp/examples/failover/declare_queues
+qpid/cpp/examples/failover/replaying_sender
+qpid/cpp/examples/failover/resuming_receiver
+qpid/cpp/examples/qmf-console/console
+qpid/cpp/examples/qmf-console/ping
+qpid/cpp/examples/qmf-console/printevents
 qpid/cpp/examples/fanout/fanout_producer
 qpid/cpp/examples/fanout/listener
 qpid/cpp/examples/pub-sub/topic_listener
@@ -32,6 +38,9 @@
 qpid/cpp/src/tests/topic_publisher
 qpid/cpp/src/tests/txtest
 qpid/cpp/src/tests/unit_test
+qpid/cpp/src/boost
+qpid/cpp/src/generate_MaxMethodBodySize_h
+qpid/cpp/src/stamp-h1
 aclocal.m4
 developer.doxygen
 user.doxygen
@@ -57,6 +66,7 @@
 .settings
 generated/
 target
+qpid/java/lib/cobertura/
 # Intellij Project files
 *.iml
 *.ipr



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743015 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

[aidan]

Author: aidan
Date: Tue Feb 10 16:52:34 2009
New Revision: 743015

URL: http://svn.apache.org/viewvc?rev=743015&view=rev
Log:
Borrow NetMatcher from JAMES. Should probably be moved to commons-net at some 
point. 

Added:

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
  - copied unchanged from r743013, 
james/server/branches/next-minor/src/java/org/apache/james/util/NetMatcher.java


-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743028 - in /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol: AMQProtocolSessionMBeanTest.java MaxChannelsTest.java MockIoSession.java TestIoSession.java

[aidan]

Author: aidan
Date: Tue Feb 10 17:38:43 2009
New Revision: 743028

URL: http://svn.apache.org/viewvc?rev=743028&view=rev
Log:
Remove MockIoSession, replace with TestIoSession everywhere.

Removed:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?rev=743028&r1=743027&r2=743028&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
 Tue Feb 10 17:38:43 2009
@@ -114,7 +114,7 @@
 
 IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
 _protocolSession =
-new AMQMinaProtocolSession(new MockIoSession(), 
appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
+new AMQMinaProtocolSession(new TestIoSession(), 
appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
 null);
 
_protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
 _channel = new AMQChannel(_protocolSession, 1, _messageStore);

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java?rev=743028&r1=743027&r2=743028&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
 Tue Feb 10 17:38:43 2009
@@ -38,7 +38,7 @@
 
 public void testChannels() throws Exception
 {
-_session = new AMQMinaProtocolSession(new MockIoSession(), _appRegistry
+_session = new AMQMinaProtocolSession(new TestIoSession(), _appRegistry
.getVirtualHostRegistry(), new 
AMQCodecFactory(true), null);
 
_session.setVirtualHost(_appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
 

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java?rev=743028&r1=743027&r2=743028&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
 Tue Feb 10 17:38:43 2009
@@ -24,6 +24,7 @@
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 import org.apache.qpid.pool.ReadWriteThreadModel;
 
+import java.net.InetAddress;
 import java.net.SocketAddress;
 import java.net.InetSocketAddress;
 import java.util.Set;
@@ -37,6 +38,8 @@
 public class TestIoSession implements IoSession
 {
 private final ConcurrentMap attributes = new ConcurrentHashMap();
+private String _address;
+private int _port;
 
 public TestIoSession()
 {
@@ -139,7 +142,7 @@
 
 public SocketAddress getRemoteAddress()
 {
-return new InetSocketAddress("127.0.0.1", 1234);
+return new InetSocketAddress(getAddress(), getPort());
 }
 
 public SocketAddress getLocalAddress()
@@ -282,6 +285,26 @@
 return 0; 
 }
 
+public void setAddress(String string)
+{
+this._address = string;
+}
+
+public String getAddress()
+{
+return _address;
+}
+
+public void setPort(int _port)
+{
+this._port = _port;
+}
+
+public int getPort()
+{
+return _port;
+}
+
 /**
  * Test implementation of IoServiceConfig
  */



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743029 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

[aidan]

Author: aidan
Date: Tue Feb 10 17:39:25 2009
New Revision: 743029

URL: http://svn.apache.org/viewvc?rev=743029&view=rev
Log:
Change package, remove dependency on Java DNS server

Modified:

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

Modified: 
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java?rev=743029&r1=743028&r2=743029&view=diff
==
--- 
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java 
(original)
+++ 
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java 
Tue Feb 10 17:39:25 2009
@@ -15,9 +15,10 @@
  * permissions and limitations under the License.  *
  ***/
 
-package org.apache.james.util;
+package org.apache.qpid.util;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -62,7 +63,7 @@
 
 try
 {
-ip = org.apache.james.dnsserver.DNSServer.getByName(hostIP);
+ip = InetAddress.getByName(hostIP);
 }
 catch (java.net.UnknownHostException uhe)
 {
@@ -130,7 +131,7 @@
 
 public boolean contains(final String name) throws 
java.net.UnknownHostException
 {
-return 
network.equals(maskIP(org.apache.james.dnsserver.DNSServer.getByName(name), 
netmask));
+return network.equals(maskIP(InetAddress.getByName(name), netmask));
 }
 
 public boolean contains(final InetAddress ip)
@@ -164,8 +165,8 @@
 else if (netspec.indexOf('.', iSlash) == -1) netspec = 
normalizeFromCIDR(netspec);
 }
 
-return new 
InetNetwork(org.apache.james.dnsserver.DNSServer.getByName(netspec.substring(0, 
netspec.indexOf('/'))),
-   
org.apache.james.dnsserver.DNSServer.getByName(netspec.substring(netspec.indexOf('/')
 + 1)));
+return new InetNetwork(InetAddress.getByName(netspec.substring(0, 
netspec.indexOf('/'))),
+InetAddress.getByName(netspec.substring(netspec.indexOf('/') + 
1)));
 }
 
 public static InetAddress maskIP(final byte[] ip, final byte[] mask)



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743304 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/security/access/plugins/ broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/ broker

[aidan]

Author: aidan
Date: Wed Feb 11 11:18:58 2009
New Revision: 743304

URL: http://svn.apache.org/viewvc?rev=743304&view=rev
Log:
Merge branch 'QPID-1583'

Conflicts:
qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

Added:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java
Modified:

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

Added: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java?rev=743304&view=auto
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java
 (added)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java
 Wed Feb 11 11:18:58 2009
@@ -0,0 +1,99 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.security.access.plugins;
+
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.security.access.ACLPlugin;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+/**
+ * This ACLPlugin abstains from all votes. Useful if your plugin only cares 
about a few operations. 
+ */
+public abstract class AbstractACLPlugin implements ACLPlugin
+{
+
+private static final AuthzResult DEFAULT_ANSWER = AuthzResult.ABSTAIN;
+
+public AuthzResult authoriseBind(AMQProtocolSession session, Exchange 
exch, AMQQueue queue,
+AMQShortString routingKey)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseConnect(AMQProtocolSession session, 
VirtualHost virtualHost)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseConsume(AMQProtocolSession session, boolean 
noAck, AMQQueue queue)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseConsume(AMQProtocolSession session, boolean 
exclusive, boolean noAck, boolean noLocal,
+boolean nowait, AMQQueue queue)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseCreateExchange(AMQProtocolSession session, 
boolean autoDelete, boolean durable,
+AMQShortString exchangeName, boolean internal, boolean nowait, 
boolean passive, AMQShortString exchangeType)
+{
+// TODO Auto-generated method stub
+return null;
+}
+
+public AuthzResult authoriseCreateQueue(AMQProtocolSession session, 
boolean autoDelete, boolean durable,
+boolean exclusive, boolean nowait, boolean passive, AMQShortString 
queue)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseDelete(AMQProtocolSession session, AMQQueue 
queue)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authoriseDelete(AMQProtocolSession session, Exchange 
exchange)
+{
+return DEFAULT_ANSWER;
+}
+
+public AuthzResult authorisePublish(AMQProtocolSession session, boolean 
immediate, boolean mandatory,
+AMQShortString routingKey, Exchange e)

svn commit: r743306 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java

[aidan]

Author: aidan
Date: Wed Feb 11 11:42:39 2009
New Revision: 743306

URL: http://svn.apache.org/viewvc?rev=743306&view=rev
Log:
TestIoSession: default address and port to avoid illegal arguments when 
creating an address.

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java?rev=743306&r1=743305&r2=743306&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
 Wed Feb 11 11:42:39 2009
@@ -38,8 +38,8 @@
 public class TestIoSession implements IoSession
 {
 private final ConcurrentMap attributes = new ConcurrentHashMap();
-private String _address;
-private int _port;
+private String _address = "127.0.0.1";
+private int _port = 1;
 
 public TestIoSession()
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743311 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/security/access/plugins/network/ test/java/org/apache/qpid/server/protocol/ test/java/org/apache/qpid/server

[aidan]

Author: aidan
Date: Wed Feb 11 12:38:31 2009
New Revision: 743311

URL: http://svn.apache.org/viewvc?rev=743311&view=rev
Log:
QPDI-1583: Implement support for comma-seperated lists of networks and 
hostnames.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java?rev=743311&r1=743310&r2=743311&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 Wed Feb 11 12:38:31 2009
@@ -23,6 +23,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.List;
 import java.util.regex.Pattern;
 
 import org.apache.commons.configuration.Configuration;
@@ -32,8 +33,6 @@
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.util.NetMatcher;
 
-import sun.net.util.IPAddressUtil;
-
 public class FirewallPlugin extends AbstractACLPlugin
 {
 
@@ -42,20 +41,54 @@
 
 private AuthzResult _access;
 private NetMatcher _network;
-private Pattern _hostnamePattern;
+private Pattern[] _hostnamePatterns;
 
-public FirewallRule(String access, String network, String hostname)
+public FirewallRule(String access, List networks, List hostnames)
 {
 _access = (access.equals("allow")) ? AuthzResult.ALLOWED : 
AuthzResult.DENIED;
-_network = (network != null) ? new NetMatcher(new 
String[]{network}) : null;
-_hostnamePattern = (hostname != null) ? Pattern.compile(hostname) 
: null;
+
+if (networks != null && networks.size() > 0)
+{
+String[] networkStrings = objListToStringArray(networks);
+_network = new NetMatcher(networkStrings);
+}
+
+if (hostnames != null && hostnames.size() > 0)
+{
+int i = 0;
+_hostnamePatterns = new Pattern[hostnames.size()];
+for (String hostname : objListToStringArray(hostnames))
+{
+_hostnamePatterns[i++] = Pattern.compile(hostname);
+}
+}
+
+}
+
+private String[] objListToStringArray(List objList)
+{
+String[] networkStrings = new String[objList.size()];
+int i = 0;
+for (Object network : objList)
+{
+networkStrings[i++] = (String) network;
+}
+return networkStrings;
 }
 
 public boolean match(InetAddress remote)
 {
-if (_hostnamePattern != null)
+if (_hostnamePatterns != null)
 {
-return 
_hostnamePattern.matcher(remote.getCanonicalHostName()).matches();
+String hostname = remote.getCanonicalHostName();
+for (Pattern pattern : _hostnamePatterns)
+{
+if (pattern.matcher(hostname).matches())
+{
+return true;
+}
+}
+return false;
 }
 else
 {
@@ -78,16 +111,17 @@
 {
 if (!(session instanceof AMQMinaProtocolSession))
 {
-return AuthzResult.ABSTAIN; // We only deal with tcp sessions, 
which mean MINA right now
+return AuthzResult.ABSTAIN; // We only deal with tcp sessions, 
which
+// mean MINA right now
 }
 
 InetAddress addr = 
getInetAdressFromMinaSession((AMQMinaProtocolSession) session);
-
+
 if (addr == null)
 {
 return AuthzResult.ABSTAIN; // Not an Inet socket on the other end
 }
-
+
 boolean match = false;
 for (FirewallRule rule : _rules)
 {
@@ -107,7 +141,7 @@
 if (remote instanceof InetSocketAddress)
 {
 return ((InetSocketAddress) remote).getAddress();
-} 
+}
 else
 {
 return null;
@@ -119,27 +153,27 @@
 {
 // Get default action
 String defau

svn commit: r743357 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/queue/ main/java/org/apache/qpid/server/util/ main/java/org/apache/qpid/server/virtualhost/ test/java/org/ap

[aidan]

Author: aidan
Date: Wed Feb 11 15:17:19 2009
New Revision: 743357

URL: http://svn.apache.org/viewvc?rev=743357&view=rev
Log:
QPID-430: Fix message age alerting so that it works on queues which are 
otherwise inactive.

AMQQueue, VirtualHost, MockAMQQueue: change name of 
removeExpiredIfNoSubscribers to checkMessageStatus.
AMQQueueMBean: remove unthrown exception
SimpleAMQQueue: add notification checks to checkMessageStatus, remove catch for 
JMException which checkForNotification no longer throws.
NullApplicationRegistry: set small housekeeping check period so that it runs 
freuqently and tests don't need to sleep for excessive periods of time
AMQQueueAlertTest: remove subsequent send, notification alerts shouldn't depend 
on queue activity.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=743357&r1=743356&r2=743357&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
 Wed Feb 11 15:17:19 2009
@@ -149,9 +149,11 @@
 
 long clearQueue(StoreContext storeContext) throws AMQException;
 
-
-
-void removeExpiredIfNoSubscribers() throws AMQException;
+/**
+ * Checks the status of messages on the queue, purging expired ones, 
firing age related alerts etc.
+ * @throws AMQException
+ */
+void checkMessageStatus() throws AMQException;
 
 Set getNotificationChecks();
 

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java?rev=743357&r1=743356&r2=743357&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
 Wed Feb 11 15:17:19 2009
@@ -246,7 +246,7 @@
 /**
  * Checks if there is any notification to be send to the listeners
  */
-public void checkForNotification(AMQMessage msg) throws AMQException, 
JMException
+public void checkForNotification(AMQMessage msg) throws AMQException
 {
 
 final Set notificationChecks = 
_queue.getNotificationChecks();

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=743357&r1=743356&r2=743357&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
 Wed Feb 11 15:17:19 2009
@@ -423,17 +423,9 @@
 deliverAsync();
 }
 
-try
-{
-_managedObject.checkForNotification(entry.getMessage());
-}
-catch (JMException e)
-{
-throw new AMQException("Unable to get notification from manage 
queue: " + e, e);
-}
-
+_managedObject.checkForNotification(entry.getMessage());
+
 return entry;
-
 }
 
 private void deliverToSubscription(final Subscription sub, final 
QueueEntry entry)
@@ -1431,7 +1423,8 @@
 }
 }
 
-public void removeExpiredIfNoSubscribers() throws AMQException
+@Override
+public void checkMessageStatus() throws AMQException
 {
 
 final StoreContext storeContext = new StoreContext();
@@ -1443,10 +1436,12 @@
 QueueEntry node = queueListIterator.getNode();
 if (!node.isDeleted() && node.expired() && node.acquire())
 {
-
  

svn commit: r743367 - in /qpid/trunk/qpid/java/client/src: main/java/org/apache/qpid/client/message/ test/java/org/apache/qpid/client/message/

[aidan]

Author: aidan
Date: Wed Feb 11 15:55:48 2009
New Revision: 743367

URL: http://svn.apache.org/viewvc?rev=743367&view=rev
Log:
QPID-1623: Allow null as a valid destination for JMSReplyTo

Added:

qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
Modified:

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java

Modified: 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=743367&r1=743366&r2=743367&view=diff
==
--- 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
 (original)
+++ 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
 Wed Feb 11 15:55:48 2009
@@ -286,7 +286,8 @@
 {
 if (destination == null)
 {
-throw new IllegalArgumentException("Null destination not allowed");
+_messageProps.setReplyTo(null);
+return;
 }
 
 if (!(destination instanceof AMQDestination))

Modified: 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java?rev=743367&r1=743366&r2=743367&view=diff
==
--- 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
 (original)
+++ 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
 Wed Feb 11 15:55:48 2009
@@ -196,7 +196,8 @@
 {
 if (destination == null)
 {
-throw new IllegalArgumentException("Null destination not allowed");
+getContentHeaderProperties().setReplyTo((String) null);
+return; // We're done here
 }
 
 if (!(destination instanceof AMQDestination))

Added: 
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java?rev=743367&view=auto
==
--- 
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
 (added)
+++ 
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
 Wed Feb 11 15:55:48 2009
@@ -0,0 +1,36 @@
+package org.apache.qpid.client.message;
+
+import javax.jms.JMSException;
+
+import junit.framework.TestCase;
+
+public class AbstractJMSMessageTest extends TestCase
+{
+
+public void testSetNullJMSReplyTo08() throws JMSException
+{
+JMSTextMessage message = new 
JMSTextMessage(AMQMessageDelegateFactory.FACTORY_0_8);
+try 
+{
+message.setJMSReplyTo(null);
+}
+catch (IllegalArgumentException e)
+{
+fail("Null destination should be allowed");
+}
+}
+
+public void testSetNullJMSReplyTo10() throws JMSException
+{
+JMSTextMessage message = new 
JMSTextMessage(AMQMessageDelegateFactory.FACTORY_0_10);
+try 
+{
+message.setJMSReplyTo(null);
+}
+catch (IllegalArgumentException e)
+{
+fail("Null destination should be allowed");
+}
+}
+
+}



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r743697 - /qpid/trunk/qpid/java/010ExcludeList

[aidan]

Author: aidan
Date: Thu Feb 12 11:57:03 2009
New Revision: 743697

URL: http://svn.apache.org/viewvc?rev=743697&view=rev
Log:
Enable org.apache.qpid.test.unit.ack.AcknowledgeTest since this should (and 
does) work with the 0-10 broker.

Modified:
qpid/trunk/qpid/java/010ExcludeList

Modified: qpid/trunk/qpid/java/010ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/010ExcludeList?rev=743697&r1=743696&r2=743697&view=diff
==
--- qpid/trunk/qpid/java/010ExcludeList (original)
+++ qpid/trunk/qpid/java/010ExcludeList Thu Feb 12 11:57:03 2009
@@ -4,7 +4,6 @@
 org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
 org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
 org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
-org.apache.qpid.test.unit.ack.AcknowledgeTest#*
 // those tests need durable subscribe states to be persisted
 
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
 // those tests require broker recovery



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r744113 - in /qpid/trunk/qpid/java: broker/etc/ broker/src/main/java/org/apache/qpid/server/management/ broker/src/main/java/org/apache/qpid/server/security/auth/rmi/ broker/src/test/java/

[aidan]

Author: aidan
Date: Fri Feb 13 14:00:10 2009
New Revision: 744113

URL: http://svn.apache.org/viewvc?rev=744113&view=rev
Log:
QPID-1511 : Adds authentication and ssl encryption capabilities to the RMI 
based JMXConnectorServer in use, enforces use of the custom 
MBeanInvocationhandlerImp when using the RMI based JMX, and implements a 
customised RMI registry to prevent external changes being possible. Updated 
Management console accordingly.

Patch from Robbert Gemmell 

Added:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
Modified:
qpid/trunk/qpid/java/broker/etc/config.xml
qpid/trunk/qpid/java/broker/etc/persistent_config.xml
qpid/trunk/qpid/java/broker/etc/transient_config.xml

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java

qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini

qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini

Modified: qpid/trunk/qpid/java/broker/etc/config.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config.xml?rev=744113&r1=744112&r2=744113&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config.xml Fri Feb 13 14:00:10 2009
@@ -43,9 +43,15 @@
 32768
 
 
-false
+true
 8999
 false
+
+true
+
+
${prefix}/../test_resources/ssl/keystore.jks
+password
+
 
 
 

Modified: qpid/trunk/qpid/java/broker/etc/persistent_config.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/persistent_config.xml?rev=744113&r1=744112&r2=744113&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/persistent_config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/persistent_config.xml Fri Feb 13 14:00:10 
2009
@@ -35,8 +35,15 @@
 32768
 
 
-false
+true
 8999
+false
+
+true
+
+
${prefix}/../test_resources/ssl/keystore.jks
+password
+
 
 
 

Modified: qpid/trunk/qpid/java/broker/etc/transient_config.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/transient_config.xml?rev=744113&r1=744112&r2=744113&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/transient_config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/transient_config.xml Fri Feb 13 14:00:10 
2009
@@ -35,8 +35,15 @@
 32768
 
 
-false
+true
 8999
+false
+
+true
+
+
${prefix}/../test_resources/ssl/keystore.jks
+password
+
 
 
 

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java?rev=744113&r1=744112&r2=744113&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
 Fri Feb 13 14:00:10 2009
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.management;
 
+import org.apache.commons.configuration.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -27,6 +28,7 @@
 import 
org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase;
 import 
org.apache.qpid.server.security.auth.

svn commit: r745799 [3/3] - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/configuration/ broker/src/main/java/org/apache/qpid/serve

[aidan]

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=745799&r1=745798&r2=745799&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
 Thu Feb 19 10:03:18 2009
@@ -20,13 +20,7 @@
  */
 package org.apache.qpid.test.client.timeouts;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.File;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -35,7 +29,13 @@
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
-import java.io.File;
+
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This tests that when the commit takes a long time(due to POST_COMMIT_DELAY) 
that the commit does not timeout
@@ -67,16 +67,17 @@
 fail("Unable to test without config file:" + _configFile);
 }
 
-ConfigurationFileApplicationRegistry config = new 
ConfigurationFileApplicationRegistry(_configFile);
-
-//Disable management on broker.
-config.getConfiguration().setProperty("management.enabled", "false");
-
-Configuration testVirtualhost = 
config.getConfiguration().subset("virtualhosts.virtualhost." + VIRTUALHOST);
-testVirtualhost.setProperty("store.class", 
"org.apache.qpid.server.store.SlowMessageStore");
-testVirtualhost.setProperty("store.delays.commitTran.post", 
POST_COMMIT_DELAY);
-
-startBroker(1, config);
+XMLConfiguration configuration = new XMLConfiguration(_configFile); 
+configuration.setProperty("virtualhosts.virtualhost." + 
VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+configuration.setProperty("virtualhosts.virtualhost." + 
VIRTUALHOST+".store.delays.commitTran.post", POST_COMMIT_DELAY);
+
+File tmpFile = File.createTempFile("configFile", "test");
+tmpFile.deleteOnExit();
+configuration.save(tmpFile);
+
+ApplicationRegistry reg = new 
ConfigurationFileApplicationRegistry(tmpFile);
+
+startBroker(1, reg);
 
 //Set the syncWrite timeout to be just larger than the delay on the 
commitTran.
 setSystemProperty("amqj.default_syncwrite_timeout", 
String.valueOf(SYNC_WRITE_TIMEOUT));

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=745799&r1=745798&r2=745799&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
 Thu Feb 19 10:03:18 2009
@@ -290,7 +290,7 @@
 }
 }
 
-public void startBroker(int port, ConfigurationFileApplicationRegistry 
config) throws Exception
+public void startBroker(int port, ApplicationRegistry config) throws 
Exception
 {
 ApplicationRegistry.initialise(config, port);
 startBroker(port);



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747363 - in /qpid/trunk/qpid/java: ./ broker/src/main/java/org/apache/qpid/server/configuration/ broker/src/test/java/org/apache/qpid/server/configuration/ lib/

[aidan]

Author: aidan
Date: Tue Feb 24 13:02:30 2009
New Revision: 747363

URL: http://svn.apache.org/viewvc?rev=747363&view=rev
Log:
Merge branch 'QPID-1612'

Added:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/trunk/qpid/java/lib/commons-beanutils-core-1.8.0.jar
qpid/trunk/qpid/java/lib/commons-configuration-1.6.jar
qpid/trunk/qpid/java/lib/commons-digester-1.8.1.jar
Removed:
qpid/trunk/qpid/java/lib/commons-configuration-1.2.jar
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/build.deps

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=747363&r1=747362&r2=747363&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Tue Feb 24 13:02:30 2009
@@ -25,12 +25,18 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
+import org.apache.commons.configuration.CombinedConfiguration;
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.ConfigurationFactory;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
+import 
org.apache.commons.configuration.ConfigurationFactory.DigesterConfigurationFactory;
+import org.apache.commons.configuration.tree.ExpressionEngine;
 
 public class ServerConfiguration
 {
@@ -45,24 +51,57 @@
 private static final long DEFAULT_HOUSEKEEPING_PERIOD = 3L;
 private static final int DEFAULT_JMXPORT = 8999;
 
-private long _housekeepingExpiredMessageCheckPeriod = 
DEFAULT_HOUSEKEEPING_PERIOD;
 private static int _jmxPort = DEFAULT_JMXPORT;
 
 private Map _virtualHosts = new 
HashMap();
 private SecurityConfiguration _securityConfiguration = null;
+
+// Map of environment variables to config items
+private static final Map envVarMap = new HashMap();
+
+{
+envVarMap.put("QPID_PORT", "connector.port");
+envVarMap.put("QPID_ENABLEDIRECTBUFFERS", 
"advanced.enableDirectBuffers");
+envVarMap.put("QPID_SSLPORT", "connector.ssl.port");
+envVarMap.put("QPID_NIO", "connector.qpidnio");
+envVarMap.put("QPID_WRITEBIASED", "advanced.useWriteBiasedPool");
+envVarMap.put("QPID_JMXPORT", "management.jmxport");
+envVarMap.put("QPID_FRAMESIZE", "advanced.framesize");
+envVarMap.put("QPID_MSGAUTH", "security.msg-auth");
+envVarMap.put("QPID_AUTOREGISTER", "auto_register");
+envVarMap.put("QPID_MANAGEMENTENABLED", "management.enabled");
+envVarMap.put("QPID_HEARTBEATDELAY", "heartbeat.delay");
+envVarMap.put("QPID_HEARTBEATTIMEOUTFACTOR", 
"heartbeat.timeoutFactor");
+envVarMap.put("QPID_MAXIMUMMESSAGEAGE", "maximumMessageAge");
+envVarMap.put("QPID_MAXIMUMMESSAGECOUNT", "maximumMessageCount");
+envVarMap.put("QPID_MAXIMUMQUEUEDEPTH", "maximumQueueDepth");
+envVarMap.put("QPID_MAXIMUMMESSAGESIZE", "maximumMessageSize");
+envVarMap.put("QPID_MINIMUMALERTREPEATGAP", "minimumAlertRepeatGap");
+envVarMap.put("QPID_SOCKETRECEIVEBUFFER", 
"connector.socketReceiveBuffer");
+envVarMap.put("QPID_SOCKETWRITEBUFFER", "connector.socketWriteBuffer");
+envVarMap.put("QPID_TCPNODELAY", "connector.tcpNoDelay");
+envVarMap.put("QPID_ENABLEPOOLEDALLOCATOR", 
"advanced.enablePooledAllocator");
+}
 
 public ServerConfiguration(File configurationURL) throws 
ConfigurationException
 {
-this(config(configurationURL));
+this(parseConfig(configurationURL));
 }
 
 public ServerConfiguration(Configuration conf) throws 
ConfigurationException
 {
 _config = conf;
+
+substituteEnvironmentVariables

svn commit: r747367 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

[aidan]

Author: aidan
Date: Tue Feb 24 13:12:03 2009
New Revision: 747367

URL: http://svn.apache.org/viewvc?rev=747367&view=rev
Log:
QPID-1612: add test class for ServerConfiguration

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=747367&r1=747366&r2=747367&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Tue Feb 24 13:12:03 2009
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.configuration;
 
+<<<<<<< 
HEAD:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -27,6 +28,12 @@
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.SystemConfiguration;
+===
+import java.util.List;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+>>>>>>> QPID-1612: add test class for 
ServerConfiguration:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 import org.apache.commons.configuration.XMLConfiguration;
 
 import junit.framework.TestCase;



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747369 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

[aidan]

Author: aidan
Date: Tue Feb 24 13:12:59 2009
New Revision: 747369

URL: http://svn.apache.org/viewvc?rev=747369&view=rev
Log:
QPID-1612: add environment variables for some things, sanitise the housekeeping 
timer.

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=747369&r1=747368&r2=747369&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Tue Feb 24 13:12:59 2009
@@ -20,20 +20,10 @@
  */
 package org.apache.qpid.server.configuration;
 
-<<<<<<< 
HEAD:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.SystemConfiguration;
-===
 import java.util.List;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
->>>>>>> QPID-1612: add test class for 
ServerConfiguration:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 import org.apache.commons.configuration.XMLConfiguration;
 
 import junit.framework.TestCase;



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747370 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

[aidan]

Author: aidan
Date: Tue Feb 24 13:13:31 2009
New Revision: 747370

URL: http://svn.apache.org/viewvc?rev=747370&view=rev
Log:
QPID-1612: Allow split configuration files. Add tests for old-style and 
new-style file parsing.

This depends on an upgraded commons-configuration, which needs commons-digester 
and commons-beanutils.

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=747370&r1=747369&r2=747370&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Tue Feb 24 13:13:31 2009
@@ -20,10 +20,14 @@
  */
 package org.apache.qpid.server.configuration;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 
 import junit.framework.TestCase;



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747376 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java build.deps

[aidan]

Author: aidan
Date: Tue Feb 24 13:29:59 2009
New Revision: 747376

URL: http://svn.apache.org/viewvc?rev=747376&view=rev
Log:
Fix build deps file

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/build.deps

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=747376&r1=747375&r2=747376&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Tue Feb 24 13:29:59 2009
@@ -27,16 +27,12 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.configuration.CombinedConfiguration;
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.ConfigurationFactory;
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
-import 
org.apache.commons.configuration.ConfigurationFactory.DigesterConfigurationFactory;
-import org.apache.commons.configuration.tree.ExpressionEngine;
 
 public class ServerConfiguration
 {

Modified: qpid/trunk/qpid/java/build.deps
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=747376&r1=747375&r2=747376&view=diff
==
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Tue Feb 24 13:29:59 2009
@@ -73,9 +73,8 @@
 felix.libs=${osgi-core} ${felix-framework}
 
 common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
-${mina-filter-ssl} ${commons-beanutils-core} ${commons-codec} \ 
-${commons-lang} ${commons-collections} ${commons-configuration} \
-${commons-digester}
+${mina-filter-ssl} ${commons-beanutils-core} ${commons-digester} 
${commons-codec} ${commons-lang} ${commons-collections} \
+${commons-configuration}
 client.libs=${common.libs}  ${geronimo-jms}
 tools.libs=${client.libs}
 broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747782 - /qpid/trunk/qpid/java/08ExcludeList

[aidan]

Author: aidan
Date: Wed Feb 25 13:59:48 2009
New Revision: 747782

URL: http://svn.apache.org/viewvc?rev=747782&view=rev
Log:
QPID-1668 Exclude org.apache.qpid.server.queue.SimpleAMQQueueThreadPoolTest

Modified:
qpid/trunk/qpid/java/08ExcludeList

Modified: qpid/trunk/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/08ExcludeList?rev=747782&r1=747781&r2=747782&view=diff
==
--- qpid/trunk/qpid/java/08ExcludeList (original)
+++ qpid/trunk/qpid/java/08ExcludeList Wed Feb 25 13:59:48 2009
@@ -6,3 +6,5 @@
 org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
 // Those tests are written against the 0.10 path
 org.apache.qpid.test.unit.message.UTF8Test#*
+// This test has a random failure that we haven't been able to identify
+org.apache.qpid.server.queue.SimpleAMQQueueThreadPoolTest



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747783 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java

[aidan]

Author: aidan
Date: Wed Feb 25 14:00:39 2009
New Revision: 747783

URL: http://svn.apache.org/viewvc?rev=747783&view=rev
Log:
QPID-1668: check initial count, don't assume it's 0. It should be, but there  
are bugs in ApplicationRegistry.close that prevent this from working.

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java?rev=747783&r1=747782&r2=747783&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
 Wed Feb 25 14:00:39 2009
@@ -35,7 +35,7 @@
 
 public void test() throws AMQException
 {
-assertEquals("References exist before start!", 0, 
ReferenceCountingExecutorService.getInstance().getReferenceCount());
+int initialCount = 
ReferenceCountingExecutorService.getInstance().getReferenceCount();
 VirtualHost test = 
ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHost("test");
 
 try
@@ -45,12 +45,12 @@

false, test, null);
 
 assertFalse("Creation did not start Pool.", 
ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
+
+assertEquals("References not increased", initialCount + 1, 
ReferenceCountingExecutorService.getInstance().getReferenceCount());
 
 queue.stop();
 
-assertEquals("References still exist", 0, 
ReferenceCountingExecutorService.getInstance().getReferenceCount());
-
-assertTrue("Stop did not clean up.", 
ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
+assertEquals("References not decreased", initialCount , 
ReferenceCountingExecutorService.getInstance().getReferenceCount());
 }
 finally
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747784 - /qpid/trunk/qpid/java/08ExcludeList

[aidan]

Author: aidan
Date: Wed Feb 25 14:01:58 2009
New Revision: 747784

URL: http://svn.apache.org/viewvc?rev=747784&view=rev
Log:
revert r747782

Modified:
qpid/trunk/qpid/java/08ExcludeList

Modified: qpid/trunk/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/08ExcludeList?rev=747784&r1=747783&r2=747784&view=diff
==
--- qpid/trunk/qpid/java/08ExcludeList (original)
+++ qpid/trunk/qpid/java/08ExcludeList Wed Feb 25 14:01:58 2009
@@ -6,5 +6,3 @@
 org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
 // Those tests are written against the 0.10 path
 org.apache.qpid.test.unit.message.UTF8Test#*
-// This test has a random failure that we haven't been able to identify
-org.apache.qpid.server.queue.SimpleAMQQueueThreadPoolTest



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r747868 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server: ./ exchange/ management/ protocol/ queue/ security/access/management/ virtualhost/

[aidan]

Author: aidan
Date: Wed Feb 25 17:47:10 2009
New Revision: 747868

URL: http://svn.apache.org/viewvc?rev=747868&view=rev
Log:
QPID-1537: Version MBeans.

Patch from Robbie Gemmell 

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java?rev=747868&r1=747867&r2=747868&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
 Wed Feb 25 17:47:10 2009
@@ -77,7 +77,7 @@
 @MBeanConstructor("Creates the Broker Manager MBean")
 public AMQBrokerManagerMBean(VirtualHost.VirtualHostMBean 
virtualHostMBean) throws JMException
 {
-super(ManagedBroker.class, ManagedBroker.TYPE);
+super(ManagedBroker.class, ManagedBroker.TYPE, ManagedBroker.VERSION);
 
 _virtualHostMBean = virtualHostMBean;
 VirtualHost virtualHost = virtualHostMBean.getVirtualHost();

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=747868&r1=747867&r2=747868&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 Wed Feb 25 17:47:10 2009
@@ -38,13 +38,9 @@
 import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
-import java.util.List;
-import java.util.Map;
-
 public abstract class AbstractExchange implements Exchange, Managable
 {
 private AMQShortString _name;
@@ -81,7 +77,7 @@
 
 public ExchangeMBean() throws NotCompliantMBeanException
 {
-super(ManagedExchange.class, ManagedExchange.TYPE);
+super(ManagedExchange.class, ManagedExchange.TYPE, 
ManagedExchange.VERSION);
 }
 
 protected void init() throws OpenDataException

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java?rev=747868&r1=747867&r2=747868&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
 Wed Feb 25 17:47:10 2009
@@ -40,6 +40,7 @@
 public interface ManagedExchange
 {
 static final String TYPE = "Exchange";
+static final int VERSION = 1;
 
 /**
  * Returns the name of the managed exchange.

Modified: 
qpid/trunk/qpid

svn commit: r747869 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java

[aidan]

Author: aidan
Date: Wed Feb 25 17:49:05 2009
New Revision: 747869

URL: http://svn.apache.org/viewvc?rev=747869&view=rev
Log:
QPID-1568: make isInstanceOf and isRegistered read only methods. Fix code style 
issue with field name.

Patch from Robbie Gemmell 

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java?rev=747869&r1=747868&r2=747869&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
 Wed Feb 25 17:49:05 2009
@@ -53,7 +53,7 @@
 public final static String READWRITE = "readwrite";
 public final static String READONLY = "readonly";
 private final static String DELEGATE = 
"JMImplementation:type=MBeanServerDelegate";
-private MBeanServer mbs;
+private MBeanServer _mbs;
 private static Properties _userRoles = new Properties();
 
 public static MBeanServerForwarder newProxyInstance()
@@ -71,7 +71,7 @@
 
 if (methodName.equals("getMBeanServer"))
 {
-return mbs;
+return _mbs;
 }
 
 if (methodName.equals("setMBeanServer"))
@@ -80,11 +80,11 @@
 {
 throw new IllegalArgumentException("Null MBeanServer");
 }
-if (mbs != null)
+if (_mbs != null)
 {
 throw new IllegalArgumentException("MBeanServer object already 
initialized");
 }
-mbs = (MBeanServer) args[0];
+_mbs = (MBeanServer) args[0];
 return null;
 }
 
@@ -95,12 +95,12 @@
 // Allow operations performed locally on behalf of the connector 
server itself
 if (subject == null)
 {
-return method.invoke(mbs, args);
+return method.invoke(_mbs, args);
 }
 
 if (args == null || DELEGATE.equals(args[0]))
 {
-return method.invoke(mbs, args);
+return method.invoke(_mbs, args);
 }
 
 // Restrict access to "createMBean" and "unregisterMBean" to any user
@@ -124,7 +124,7 @@
 {
 if (isAdmin(identity))
 {
-return method.invoke(mbs, args);
+return method.invoke(_mbs, args);
 }
 else
 {
@@ -135,14 +135,14 @@
 // Following users can perform any operation other than "createMBean" 
and "unregisterMBean"
 if (isAllowedToModify(identity))
 {
-return method.invoke(mbs, args);
+return method.invoke(_mbs, args);
 }
 
 // These users can only call "getAttribute" on the MBeanServerDelegate 
MBean
 // Here we can add other fine grained permissions like specific method 
for a particular mbean
 if (isReadOnlyUser(identity) && isReadOnlyMethod(method, args))
 {
-return method.invoke(mbs, args);
+return method.invoke(_mbs, args);
 }
 
 throw new SecurityException("Access denied");
@@ -196,7 +196,10 @@
 private boolean isReadOnlyMethod(Method method, Object[] args)
 {
 String methodName = method.getName();
-if (methodName.startsWith("query") || methodName.startsWith("get"))
+
+//handle standard get/set/query and select 'is' methods from 
MBeanServer
+if (methodName.startsWith("query") || methodName.startsWith("get")
+||methodName.startsWith("isInstanceOf") || 
methodName.startsWith("isRegistered"))
 {
 return true;
 }
@@ -205,8 +208,11 @@
 return false;
 }
 
+//handle invocation of other methods on mbeans
 if ((args[0] instanceof ObjectName) && (methodName.equals("invoke")))
 {
+
+//get invoked method name
 String mbeanMethod = (args.length > 1) ? (String) args[1] : null;
 if (mbeanMethod == null)
 {
@@ -215,7 +221,8 @@
 
 try
 {
-MBeanInfo mbeanInfo = mbs.getMBeanInfo((ObjectName) args[0]);
+//check if the given method is tagged with an INFO impact 
attribute
+MBeanInfo mbeanInfo = _mbs.getMBeanInfo((ObjectName) args[0]);
 

svn commit: r747870 [2/2] - in /qpid/trunk/qpid/java/broker: etc/ src/main/java/org/apache/qpid/server/ src/main/java/org/apache/qpid/server/logging/ src/main/java/org/apache/qpid/server/logging/manag

[aidan]

Added: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java?rev=747870&view=auto
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
 (added)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
 Wed Feb 25 17:53:09 2009
@@ -0,0 +1,826 @@
+/*
+ *  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.
+ *
+ * 
+ */
+package org.apache.qpid.server.logging.management;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.JMException;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.TabularDataSupport;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import junit.framework.TestCase;
+
+public class LoggingManagementMBeanTest extends TestCase
+{
+private static final String TEST_LOGGER = 
"LoggingManagementMBeanTestLogger";
+private static final String TEST_LOGGER_CHILD1 = 
"LoggingManagementMBeanTestLogger.child1";
+private static final String TEST_LOGGER_CHILD2 = 
"LoggingManagementMBeanTestLogger.child2";
+
+private static final String CATEGORY_PRIORITY = 
"LogManMBeanTest.category.priority";
+private static final String CATEGORY_LEVEL = 
"LogManMBeanTest.category.level";
+private static final String LOGGER_LEVEL = "LogManMBeanTest.logger.level";
+
+private static final String NAME_INDEX = 
LoggingManagement.COMPOSITE_ITEM_NAMES[0];
+private static final String LEVEL_INDEX = 
LoggingManagement.COMPOSITE_ITEM_NAMES[1];
+
+private static final String NEWLINE = System.getProperty("line.separator");
+
+private File _testConfigFile;
+
+protected void setUp() throws Exception
+{
+_testConfigFile = createTempTestLog4JConfig();
+}
+
+private File createTempTestLog4JConfig()
+{
+File tmpFile = null;
+try
+{
+tmpFile = File.createTempFile("LogManMBeanTestLog4jConfig", 
".tmp");
+tmpFile.deleteOnExit();
+
+FileWriter fstream = new FileWriter(tmpFile);
+BufferedWriter writer = new BufferedWriter(fstream);
+
+writer.write(""+NEWLINE);
+writer.write(""+NEWLINE);
+
+writer.write("http://jakarta.apache.org/log4j/\"; debug=\"null\" " +
+   
"threshold=\"null\">"+NEWLINE);
+
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+
+//Example of a 'category' with a 'priority'
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+
+//Example of a 'category' with a 'level'
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+
+//Example of a 'logger' with a 'level'
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+
+//'root' logger
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+writer.write("  "+NEWLINE);
+
+writer.write(""+NEWLINE);
+
+writer.flush();
+writer.close();
+}
+catch (IOException e)
+{
+fail("Unable to create temporary test l

svn commit: r747875 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/logging/management/ test/java/org/apache/qpid/server/logging/management/

[aidan]

Author: aidan
Date: Wed Feb 25 18:09:04 2009
New Revision: 747875

URL: http://svn.apache.org/viewvc?rev=747875&view=rev
Log:
QPID-1648: Remove doubling of new classes. Stoopid patch(1). PEBKAC.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java?rev=747875&r1=747874&r2=747875&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java
 Wed Feb 25 18:09:04 2009
@@ -127,132 +127,3 @@
 "in the log4j xml configuration file.")
 String getConfigFileRootLoggerLevel() throws IOException;
 }
-/*
- *  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.
- *
- * 
- */
-package org.apache.qpid.server.logging.management;
-
-import java.io.IOException;
-
-import org.apache.qpid.server.management.MBeanAttribute;
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanOperationParameter;
-
-import javax.management.MBeanOperationInfo;
-import javax.management.openmbean.TabularData;
-
-public interface LoggingManagement
-{
-String TYPE = "LoggingManagement";
-int VERSION = 1;
-
-//TabularType and contained CompositeType key/description information
-String[] COMPOSITE_ITEM_NAMES = {"LoggerName", "Level"};
-String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Name of the logger", "Level of 
the logger"};
-String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
-
-/**
- * Attribute to represent the log4j xml configuration file's LogWatch 
interval.
- * @return The logwatch interval in seconds.
- */
-@MBeanAttribute(name="Log4jLogWatchInterval", 
-description = "The log4j xml configuration file LogWatch 
interval (in seconds). 0 indicates not being checked.")
-Integer getLog4jLogWatchInterval();
-
-
-//** log4j runtime operations ** //
-
-/**
- * Sets the level of an active Log4J logger
- * @param logger The name of the logger
- * @param level The level to set the logger to
- * @return True if successful, false if unsuccessful (eg if an invalid 
level is specified) 
- */
-@MBeanOperation(name = "setRuntimeLoggerLevel", description = "Set the 
runtime logging level for an active log4j logger.",
-impact = MBeanOperationInfo.ACTION)
-boolean setRuntimeLoggerLevel(@MBeanOperationParameter(name = "logger", 
description = "Logger name")String logger,
-@MBeanOperationParameter(name = "level", 
description = "Logger level")String level);
-
-/**
- * Retrieves a TabularData set of the active log4j loggers and their levels
- * @return TabularData set of CompositeData rows with logger name and 
level, or null if there is a problem with the TabularData type 
- */
-@MBeanOperation(name = "viewEffectiveRuntimeLoggerLevels", description = 
"View the effective runtime logging level " +
-   "for active log4j logger's.", impact = 
MBeanOperationInfo.INFO)
-TabularData viewEffectiveRuntimeLoggerLevels();
-
-/**
- * Sets the level of the active Log4J RootLogger
- * @param level The level to set the RootLogger to
- * @return True if su

svn commit: r748561 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server: ./ configuration/ configuration/management/ management/

[aidan]

Author: aidan
Date: Fri Feb 27 15:40:56 2009
New Revision: 748561

URL: http://svn.apache.org/viewvc?rev=748561&view=rev
Log:
QPID-1699: reload the config file sections that we can when we receive SIGHUP. 
Add jmx method to do so.

Added:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=748561&r1=748560&r2=748561&view=diff
==
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java 
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java 
Fri Feb 27 15:40:56 2009
@@ -26,6 +26,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
+import javax.management.NotCompliantMBeanException;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
@@ -47,6 +49,7 @@
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.pool.ReadWriteThreadModel;
 import org.apache.qpid.server.configuration.ServerConfiguration;
+import 
org.apache.qpid.server.configuration.management.ConfigurationManagementMBean;
 import org.apache.qpid.server.logging.management.LoggingManagementMBean;
 import org.apache.qpid.server.protocol.AMQPFastProtocolHandler;
 import org.apache.qpid.server.protocol.AMQPProtocolProvider;
@@ -267,6 +270,9 @@
 
 configureLoggingManagementMBean(logConfigFile, logWatchTime);
 
+ConfigurationManagementMBean configMBean = new 
ConfigurationManagementMBean();
+configMBean.register();
+
 //fixme .. use QpidProperties.getVersionString when we have fixed the 
classpath issues
 // that are causing the broker build to pick up the wrong properties 
file and hence say
 // Starting Qpid Client 

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=748561&r1=748560&r2=748561&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Fri Feb 27 15:40:56 2009
@@ -27,14 +27,23 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.management.NotCompliantMBeanException;
+
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.ConfigurationFactory;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
+import 
org.apache.qpid.server.configuration.management.ConfigurationManagementMBean;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+
+import sun.misc.Signal;
+import sun.misc.SignalHandler;
 
-public class ServerConfiguration
+public class ServerConfiguration implements SignalHandler
 {
 
 private static Configuration _config;
@@ -52,6 +61,10 @@
 private Map _virtualHosts = new 
HashMap();
 private SecurityConfiguration _securityConfiguration = null;
 
+private File _configFile;
+
+private ConfigurationManagementMBean _mbean;
+
 // Map of environment variables to config items
 private static final Map envVarMap = new HashMap();
 
@@ -82,6 +95,8 @@
 public ServerConfiguration(File configurationURL) throws 
ConfigurationException
 {
 this(parseConfig(configurationURL));
+_configFile = configurationURL;
+sun.misc.Signal.handle(new sun.misc.Signal("HUP"), this);
 }
 
 public ServerConfiguration(Configuration conf) throws 
ConfigurationException
@@ -94,8 +109,9 @@
 _securityConf

svn commit: r748591 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration: ServerConfiguration.java management/ConfigurationManagement.java

[aidan]

Author: aidan
Date: Fri Feb 27 16:57:22 2009
New Revision: 748591

URL: http://svn.apache.org/viewvc?rev=748591&view=rev
Log:
QPID-1699: fix mbean annotation, log failure to reload file. Address review 
comments from robbie.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=748591&r1=748590&r2=748591&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Fri Feb 27 16:57:22 2009
@@ -27,8 +27,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.management.NotCompliantMBeanException;
-
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -39,6 +37,9 @@
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.tools.messagestore.MessageStoreTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
@@ -62,8 +63,11 @@
 private SecurityConfiguration _securityConfiguration = null;
 
 private File _configFile;
+
+private Logger _log = LoggerFactory.getLogger(this.getClass());
 
 private ConfigurationManagementMBean _mbean;
+
 
 // Map of environment variables to config items
 private static final Map envVarMap = new HashMap();
@@ -206,7 +210,7 @@
 }
 catch (ConfigurationException e)
 {
-// Not much we can do about it really. 
+ _log.error("Could not reload configuration file", e);
 }
 }
 

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java?rev=748591&r1=748590&r2=748591&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
 Fri Feb 27 16:57:22 2009
@@ -20,8 +20,10 @@
  */
 package org.apache.qpid.server.configuration.management;
 
+import javax.management.MBeanOperationInfo;
+
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.management.MBeanAttribute;
+import org.apache.qpid.server.management.MBeanOperation;
 
 public interface ConfigurationManagement
 {
@@ -33,8 +35,9 @@
  * Reload the 
  * @throws ConfigurationException 
  */
-@MBeanAttribute(name="reloadSecurityConfiguration", 
-description = "Force a reload of the security 
configuration sections")
+@MBeanOperation(name="reloadSecurityConfiguration", 
+description = "Force a reload of the security 
configuration sections",
+impact = MBeanOperationInfo.ACTION)
 void reloadSecurityConfiguration() throws ConfigurationException;
 
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r749315 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/plugins/ main/java/org/apache/qpid/server/registry/ main/java/org/apache/qpid/server/security/access/ main/j

[aidan]

Author: aidan
Date: Mon Mar  2 14:30:25 2009
New Revision: 749315

URL: http://svn.apache.org/viewvc?rev=749315&view=rev
Log:
QPID-1583: Add test for reloading external firewall rules, fix buglets this 
test exposed.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLManager.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLPlugin.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLPluginFactory.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=749315&r1=749314&r2=749315&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
 Mon Mar  2 14:30:25 2009
@@ -35,6 +35,7 @@
 import org.apache.qpid.server.security.access.plugins.AllowAll;
 import org.apache.qpid.server.security.access.plugins.DenyAll;
 import org.apache.qpid.server.security.access.plugins.SimpleXML;
+import org.apache.qpid.server.security.access.plugins.network.FirewallPlugin;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleException;
 import org.osgi.util.tracker.ServiceTracker;
@@ -165,6 +166,7 @@
 _securityPlugins.put(SimpleXML.class.getName(), SimpleXML.FACTORY);
 _securityPlugins.put(AllowAll.class.getName(), AllowAll.FACTORY);
 _securityPlugins.put(DenyAll.class.getName(), DenyAll.FACTORY);
+_securityPlugins.put(FirewallPlugin.class.getName(), 
FirewallPlugin.FACTORY);
 }
 return _securityPlugins;
 }

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=749315&r1=749314&r2=749315&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
 Mon Mar  2 14:30:25 2009
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.configuration.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.qpid.server.configuration.ServerConfiguration;
@@ -261,7 +262,7 @@
 return _virtualHostRegistry;
 }
 
-public ACLManager getAccessManager()
+public ACLManager getAccessManager() throws ConfigurationException
 {
 return new ACLManager(_configuration.getSecurityConfiguration(), 
_pluginManager);
 }

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=749315&r1=749314&r2=749315&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
 Mon Mar  2 14:30:25 2009
@@ -24,6 +24,7 @@
 import java.net.InetSocketAddress;
 
 import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
 import org.apache.qpid.server.plugins.PluginManager;
@@ -64,7 +65,7 @@
 
 VirtualHostRegistry getVirtualHostRegistry();
 
-ACLMan

svn commit: r749340 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

[aidan]

Author: aidan
Date: Mon Mar  2 15:51:55 2009
New Revision: 749340

URL: http://svn.apache.org/viewvc?rev=749340&view=rev
Log:
QPID-1583: close all app registries after use.

Modified:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=749340&r1=749339&r2=749340&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Mon Mar  2 15:51:55 2009
@@ -54,6 +54,12 @@
 {
 _config = new XMLConfiguration();
 }
+
+@Override
+public void tearDown()
+{
+ApplicationRegistry.removeAll();
+}
 
 public void testSetJMXManagementPort() throws ConfigurationException
 {
@@ -743,7 +749,7 @@
 
 public void testCombinedConfigurationFirewallReload() throws Exception
 {
- // Write out config
+// Write out config
 File mainFile = File.createTempFile(getClass().getName(), null);
 File fileA = File.createTempFile(getClass().getName(), null);
 File fileB = File.createTempFile(getClass().getName(), null);
@@ -838,7 +844,6 @@
 reg.getConfiguration().reparseConfigFile();
 
 assertFalse(reg.getAccessManager().authoriseConnect(session, 
virtualHost));
-
 }
 
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r749572 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ test/java/org/apache/qpid/server/configuration/

[aidan]

Author: aidan
Date: Tue Mar  3 09:48:47 2009
New Revision: 749572

URL: http://svn.apache.org/viewvc?rev=749572&view=rev
Log:
QPID-430: Change configuration variable name in line with review remarks.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=749572&r1=749571&r2=749572&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Tue Mar  3 09:48:47 2009
@@ -505,8 +505,10 @@
 _config.setProperty("housekeeping.expiredMessageCheckPeriod", value);
 }
 
-public long getHousekeepingExpiredMessageCheckPeriod()
+public long getHousekeepingCheckPeriod()
 {
-return _config.getLong("housekeeping.expiredMessageCheckPeriod", 
DEFAULT_HOUSEKEEPING_PERIOD);
+return _config.getLong("housekeeping.checkPeriod", 
+   _config.getLong("housekeeping.expiredMessageCheckPeriod", 
+   DEFAULT_HOUSEKEEPING_PERIOD));
 }
 }

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=749572&r1=749571&r2=749572&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 Tue Mar  3 09:48:47 2009
@@ -92,7 +92,7 @@
 
 public long getHousekeepingExpiredMessageCheckPeriod()
 {
-return _config.getLong("housekeeping.expiredMessageCheckPeriod", 
_serverConfiguration.getHousekeepingExpiredMessageCheckPeriod());
+return _config.getLong("housekeeping.expiredMessageCheckPeriod", 
_serverConfiguration.getHousekeepingCheckPeriod());
 }
 
 public String getAuthenticationDatabase()

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=749572&r1=749571&r2=749572&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Tue Mar  3 09:48:47 2009
@@ -623,14 +623,14 @@
 {
 // Check default
 ServerConfiguration serverConfig = new ServerConfiguration(_config);
-assertEquals(3, 
serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+assertEquals(3, serverConfig.getHousekeepingCheckPeriod());
 
 // Check value we set
 _config.setProperty("housekeeping.expiredMessageCheckPeriod", 23L);
 serverConfig = new ServerConfiguration(_config);
-assertEquals(23, 
serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+assertEquals(23, serverConfig.getHousekeepingCheckPeriod());
 serverConfig.setHousekeepingExpiredMessageCheckPeriod(42L);
-assertEquals(42, 
serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+assertEquals(42, serverConfig.getHousekeepingCheckPeriod());
 }
 
 public void testSingleConfiguration() throws IOException, 
ConfigurationException



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r754934 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

[aidan]

Author: aidan
Date: Mon Mar 16 16:32:50 2009
New Revision: 754934

URL: http://svn.apache.org/viewvc?rev=754934&view=rev
Log:
QPID-1736: Timeout DNS lookups if they take more than 30 seconds.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java?rev=754934&r1=754933&r2=754934&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 Mon Mar 16 16:32:50 2009
@@ -25,6 +25,7 @@
 import java.net.SocketAddress;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
 import org.apache.commons.configuration.CompositeConfiguration;
@@ -42,6 +43,8 @@
 public class FirewallPlugin extends AbstractACLPlugin
 {
 
+public class FirewallPluginException extends Exception {}
+
 public static final ACLPluginFactory FACTORY = new ACLPluginFactory()
 {
 public boolean supportsTag(String name)
@@ -60,6 +63,7 @@
 public class FirewallRule
 {
 
+private static final long DNS_TIMEOUT = 3;
 private AuthzResult _access;
 private NetMatcher _network;
 private Pattern[] _hostnamePatterns;
@@ -97,11 +101,15 @@
 return networkStrings;
 }
 
-public boolean match(InetAddress remote)
+public boolean match(InetAddress remote) throws FirewallPluginException
 {
 if (_hostnamePatterns != null)
 {
-String hostname = remote.getCanonicalHostName();
+String hostname = getHostname(remote);
+if (hostname == null)
+{
+throw new FirewallPluginException();
+}
 for (Pattern pattern : _hostnamePatterns)
 {
 if (pattern.matcher(hostname).matches())
@@ -117,6 +125,48 @@
 }
 }
 
+/**
+ * @param remote the InetAddress to look up
+ * @return the hostname, null if not found or takes longer than 30s to 
find
+ */
+private String getHostname(final InetAddress remote)
+{
+final String[] hostname = new String[]{null};
+final AtomicBoolean done = new AtomicBoolean(false);
+// Spawn thread
+Thread thread = new Thread(new Runnable()
+{
+   public void run()
+   {
+   hostname[0] = remote.getCanonicalHostName();
+   done.getAndSet(true);
+   synchronized (done)
+   {
+   done.notifyAll();
+   }
+   }
+});
+
+thread.run();
+long endTime = System.currentTimeMillis() + DNS_TIMEOUT;
+
+while (System.currentTimeMillis() < endTime && !done.get())
+{
+try
+{
+synchronized (done)
+{
+done.wait(endTime - System.currentTimeMillis());
+}
+}
+catch (InterruptedException e)
+{
+// Check the time and if necessary sleep for a bit longer
+}
+}
+return hostname[0];
+}
+
 public AuthzResult getAccess()
 {
 return _access;
@@ -146,7 +196,14 @@
 boolean match = false;
 for (FirewallRule rule : _rules)
 {
-match = rule.match(addr);
+try
+{
+match = rule.match(addr);
+}
+catch (FirewallPluginException e)
+{
+return AuthzResult.DENIED;
+}
 if (match)
 {
 return rule.getAccess();



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r754958 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server: plugins/PluginManager.java security/access/plugins/LegacyAccessPlugin.java

[aidan]

Author: aidan
Date: Mon Mar 16 16:53:59 2009
New Revision: 754958

URL: http://svn.apache.org/viewvc?rev=754958&view=rev
Log:
QPID-1626: handle legacy config file a bit more gracefully.

Added:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccessPlugin.java
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=754958&r1=754957&r2=754958&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
 Mon Mar 16 16:53:59 2009
@@ -34,6 +34,7 @@
 import org.apache.qpid.server.security.access.ACLPluginFactory;
 import org.apache.qpid.server.security.access.plugins.AllowAll;
 import org.apache.qpid.server.security.access.plugins.DenyAll;
+import org.apache.qpid.server.security.access.plugins.LegacyAccessPlugin;
 import org.apache.qpid.server.security.access.plugins.SimpleXML;
 import org.apache.qpid.server.security.access.plugins.network.FirewallPlugin;
 import org.osgi.framework.BundleActivator;
@@ -166,6 +167,7 @@
 _securityPlugins.put(SimpleXML.class.getName(), SimpleXML.FACTORY);
 _securityPlugins.put(AllowAll.class.getName(), AllowAll.FACTORY);
 _securityPlugins.put(DenyAll.class.getName(), DenyAll.FACTORY);
+_securityPlugins.put(LegacyAccessPlugin.class.getName(), 
LegacyAccessPlugin.FACTORY);
 _securityPlugins.put(FirewallPlugin.class.getName(), 
FirewallPlugin.FACTORY);
 }
 return _securityPlugins;

Added: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccessPlugin.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccessPlugin.java?rev=754958&view=auto
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccessPlugin.java
 (added)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccessPlugin.java
 Mon Mar 16 16:53:59 2009
@@ -0,0 +1,71 @@
+/*
+ *  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.
+ *
+ *
+ */
+package org.apache.qpid.server.security.access.plugins;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.security.access.ACLPlugin;
+import org.apache.qpid.server.security.access.ACLPluginFactory;
+
+/**
+ * 
+ * Used to suppress warnings in legacy config files that have things in 
 which aren't handled by a plugin directly. 
+ *
+ */
+public class LegacyAccessPlugin extends BasicACLPlugin
+{
+public static final ACLPluginFactory FACTORY = new ACLPluginFactory()
+{
+private Collection maskedTags = new HashSet();
+{
+maskedTags.add("principal-databases");
+maskedTags.add("access");
+maskedTags.add("msg-auth");
+maskedTags.add("false");
+maskedTags.add("jmx");
+}
+
+public boolean supportsTag(String name)
+{
+return maskedTags .contains(name);
+}
+
+public ACLPlugin newInstance(Configuration config)
+{
+return new LegacyAccessPlugin();
+}
+};
+
+public String getPluginName()
+{
+return getClass().getSimpleName();
+}
+
+@Override 
+protected AuthzResult getResult()
+{
+// Always abstain
+return AuthzResult.ABSTAIN;
+}
+
+}



---

svn commit: r758730 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ServerConfiguration.java test/java/org/apache/qpid/server/configuration/ServerConfigurationTes

[aidan]

Author: aidan
Date: Thu Mar 26 16:38:29 2009
New Revision: 758730

URL: http://svn.apache.org/viewvc?rev=758730&view=rev
Log:
QPID-1776: fix interpolation of variables.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=758730&r1=758729&r2=758730&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Thu Mar 26 16:38:29 2009
@@ -130,10 +130,16 @@
 for (int j = 0; j < hosts.size(); j++)
 {
 String name = (String) hosts.get(j);
-CompositeConfiguration mungedConf = new 
CompositeConfiguration();
-
mungedConf.addConfiguration(conf.subset("virtualhosts.virtualhost."+name));
-
mungedConf.addConfiguration(vhostConfiguration.subset("virtualhost." + name));
-VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, mungedConf, this);
+// Add the keys of the virtual host to the main config 
then bail out
+
+Configuration myConf = 
vhostConfiguration.subset("virtualhost." + name);
+Iterator k = myConf.getKeys();
+while (k.hasNext())
+{
+String key = (String) k.next();
+
conf.setProperty("virtualhosts.virtualhost."+name+"."+key, 
myConf.getProperty(key));
+}
+VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name), 
this);
 _virtualHosts.put(vhostConfig.getName(), vhostConfig);
 }
 }

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=758730&r1=758729&r2=758730&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Thu Mar 26 16:38:29 2009
@@ -677,6 +677,24 @@
 assertEquals(true, config.getQpidNIO()); // From the second file, not
  // present in the first
 }
+
+public void testVariableInterpolation() throws Exception
+{
+File mainFile = File.createTempFile(getClass().getName(), null);
+
+mainFile.deleteOnExit();
+
+FileWriter out = new FileWriter(mainFile);
+out.write("\n");
+out.write("\tfoo\n");
+
out.write("\t${work}\n");
+out.write("\n");
+out.close();
+
+ServerConfiguration config = new 
ServerConfiguration(mainFile.getAbsoluteFile());
+assertEquals("Did not get correct interpolated value", 
+"foo", config.getManagementKeyStorePath());
+}
 
 public void testCombinedConfigurationFirewall() throws Exception
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r758749 - in /qpid/branches/0.5-release/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ServerConfiguration.java test/java/org/apache/qpid/server/configuration/ServerC

[aidan]

Author: aidan
Date: Thu Mar 26 17:12:19 2009
New Revision: 758749

URL: http://svn.apache.org/viewvc?rev=758749&view=rev
Log:
QPID-1776: fix interpolation of variables.

Modified:

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=758749&r1=758748&r2=758749&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Thu Mar 26 17:12:19 2009
@@ -130,10 +130,16 @@
 for (int j = 0; j < hosts.size(); j++)
 {
 String name = (String) hosts.get(j);
-CompositeConfiguration mungedConf = new 
CompositeConfiguration();
-
mungedConf.addConfiguration(conf.subset("virtualhosts.virtualhost."+name));
-
mungedConf.addConfiguration(vhostConfiguration.subset("virtualhost." + name));
-VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, mungedConf, this);
+// Add the keys of the virtual host to the main config 
then bail out
+
+Configuration myConf = 
vhostConfiguration.subset("virtualhost." + name);
+Iterator k = myConf.getKeys();
+while (k.hasNext())
+{
+String key = (String) k.next();
+
conf.setProperty("virtualhosts.virtualhost."+name+"."+key, 
myConf.getProperty(key));
+}
+VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name), 
this);
 _virtualHosts.put(vhostConfig.getName(), vhostConfig);
 }
 }

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=758749&r1=758748&r2=758749&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Thu Mar 26 17:12:19 2009
@@ -677,6 +677,24 @@
 assertEquals(true, config.getQpidNIO()); // From the second file, not
  // present in the first
 }
+
+public void testVariableInterpolation() throws Exception
+{
+File mainFile = File.createTempFile(getClass().getName(), null);
+
+mainFile.deleteOnExit();
+
+FileWriter out = new FileWriter(mainFile);
+out.write("\n");
+out.write("\tfoo\n");
+
out.write("\t${work}\n");
+out.write("\n");
+out.close();
+
+ServerConfiguration config = new 
ServerConfiguration(mainFile.getAbsoluteFile());
+assertEquals("Did not get correct interpolated value", 
+"foo", config.getManagementKeyStorePath());
+}
 
 public void testCombinedConfigurationFirewall() throws Exception
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r760477 - /qpid/trunk/qpid/java/default.testprofile

[aidan]

Author: aidan
Date: Tue Mar 31 15:19:55 2009
New Revision: 760477

URL: http://svn.apache.org/viewvc?rev=760477&view=rev
Log:
Dial down default log output to warn for non-qpid classes.

Modified:
qpid/trunk/qpid/java/default.testprofile

Modified: qpid/trunk/qpid/java/default.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=760477&r1=760476&r2=760477&view=diff
==
--- qpid/trunk/qpid/java/default.testprofile (original)
+++ qpid/trunk/qpid/java/default.testprofile Tue Mar 31 15:19:55 2009
@@ -9,7 +9,7 @@
 log=debug
 amqj.logging.level=${log}
 amqj.protocol.logging.level=${log}
-root.logging.level=${log}
+root.logging.level=warn
 log4j.configuration=file:///${project.root}/log4j-test.xml
 log4j.debug=false
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r760919 - /qpid/trunk/qpid/java/broker/bin/qpid-server

[aidan]

Author: aidan
Date: Wed Apr  1 15:27:19 2009
New Revision: 760919

URL: http://svn.apache.org/viewvc?rev=760919&view=rev
Log:
Dial up default server threads to 32. Red ones go faster.

Modified:
qpid/trunk/qpid/java/broker/bin/qpid-server

Modified: qpid/trunk/qpid/java/broker/bin/qpid-server
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server?rev=760919&r1=760918&r2=760919&view=diff
==
--- qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-server Wed Apr  1 15:27:19 2009
@@ -34,4 +34,6 @@
QPID_CLASSPATH=$QPID_LIBS \
QPID_RUN_LOG=2
 
+QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32"
+
 . qpid-run org.apache.qpid.server.Main "$@"



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r761721 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ main/java/org/apache/qpid/server/queue/ test/java/org/apache/qpid/server/configuration/ test/

[aidan]

Author: aidan
Date: Fri Apr  3 16:36:14 2009
New Revision: 761721

URL: http://svn.apache.org/viewvc?rev=761721&view=rev
Log:
QPID-1730: make it easy to configure queues, fix inheriting settings from the 
virtualhost.

AMQQueue.configure: new method
AMQQueueFactory: use AMQQueue.configure, don't set things directly
SimpleAMQQueue.configure, MockAMQQueue.configure: implement new method from the 
interface
QueueConfiguration: use VirtualHostConfiguration for default values if they're 
unset
VirtualHostConfiguration: if a queue doesn't exist, give it a default 
configuration. Add methods to get default settings for configuration items
QueueConfigurationTest: test case, checks that inheritance and defaults work 
along with explicitly set values.

Added:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=761721&r1=761720&r2=761721&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 Fri Apr  3 16:36:14 2009
@@ -21,30 +21,26 @@
 package org.apache.qpid.server.configuration;
 
 import java.util.List;
-import java.io.File;
 
 import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 
 public class QueueConfiguration
 {
-
-// FIXME AIDAN XXX -- deal with defaults
 
 private Configuration _config;
 private String _name;
-private VirtualHostConfiguration _virtualHostConfiguration;
+private VirtualHostConfiguration _vHostConfig;
 
 public QueueConfiguration(String name, Configuration config, 
VirtualHostConfiguration virtualHostConfiguration)
 {
-_virtualHostConfiguration = virtualHostConfiguration;
+_vHostConfig = virtualHostConfiguration;
 _config = config;
 _name = name;
 }
 
 public VirtualHostConfiguration getVirtualHostConfiguration()
 {
-return _virtualHostConfiguration;
+return _vHostConfig;
 }
 
 public boolean getDurable()
@@ -87,29 +83,29 @@
 return _name;
 }
 
-public long getMaximumMessageAge()
+public int getMaximumMessageAge()
 {
-return _config.getLong("maximumMessageAge", 0);
+return _config.getInt("maximumMessageAge", 
_vHostConfig.getMaximumMessageAge());
 }
 
 public long getMaximumQueueDepth()
 {
-return _config.getLong("maximumQueueDepth", 0);
+return _config.getLong("maximumQueueDepth", 
_vHostConfig.getMaximumQueueDepth());
 }
 
 public long getMaximumMessageSize()
 {
-return _config.getLong("maximumMessageSize", 0);
+return _config.getLong("maximumMessageSize", 
_vHostConfig.getMaximumMessageSize());
 }
 
 public long getMaximumMessageCount()
 {
-return _config.getLong("maximumMessageCount", 0);
+return _config.getLong("maximumMessageCount", 
_vHostConfig.getMaximumMessageCount());
 }
 
 public long getMinimumAlertRepeatGap()
 {
-return _config.getLong("minimumAlertRepeatGap", 0);
+return _config.getLong("minimumAlertRepeatGap", 
_vHostConfig.getMinimumAlertRepeatGap());
 }
 
 public long getMemoryUsageMaximum()

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=761721&r1=761720&r2=761721&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org

svn commit: r761733 - in /qpid/branches/0.5-release/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ main/java/org/apache/qpid/server/queue/ test/java/org/apache/qpid/server/confi

[aidan]

Author: aidan
Date: Fri Apr  3 17:22:46 2009
New Revision: 761733

URL: http://svn.apache.org/viewvc?rev=761733&view=rev
Log:
QPID-1730: make it easy to configure queues, fix inheriting settings from the 
virtualhost.

AMQQueue.configure: new method
AMQQueueFactory: use AMQQueue.configure, don't set things directly
SimpleAMQQueue.configure, MockAMQQueue.configure: implement new method from the 
interface
QueueConfiguration: use VirtualHostConfiguration for default values if they're 
unset
VirtualHostConfiguration: if a queue doesn't exist, give it a default 
configuration. Add methods to get default settings for configuration items
QueueConfigurationTest: test case, checks that inheritance and defaults work 
along with explicitly set values.

Added:

qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
Modified:

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=761733&r1=761732&r2=761733&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 (original)
+++ 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 Fri Apr  3 17:22:46 2009
@@ -21,30 +21,26 @@
 package org.apache.qpid.server.configuration;
 
 import java.util.List;
-import java.io.File;
 
 import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 
 public class QueueConfiguration
 {
-
-// FIXME AIDAN XXX -- deal with defaults
 
 private Configuration _config;
 private String _name;
-private VirtualHostConfiguration _virtualHostConfiguration;
+private VirtualHostConfiguration _vHostConfig;
 
 public QueueConfiguration(String name, Configuration config, 
VirtualHostConfiguration virtualHostConfiguration)
 {
-_virtualHostConfiguration = virtualHostConfiguration;
+_vHostConfig = virtualHostConfiguration;
 _config = config;
 _name = name;
 }
 
 public VirtualHostConfiguration getVirtualHostConfiguration()
 {
-return _virtualHostConfiguration;
+return _vHostConfig;
 }
 
 public boolean getDurable()
@@ -87,29 +83,29 @@
 return _name;
 }
 
-public long getMaximumMessageAge()
+public int getMaximumMessageAge()
 {
-return _config.getLong("maximumMessageAge", 0);
+return _config.getInt("maximumMessageAge", 
_vHostConfig.getMaximumMessageAge());
 }
 
 public long getMaximumQueueDepth()
 {
-return _config.getLong("maximumQueueDepth", 0);
+return _config.getLong("maximumQueueDepth", 
_vHostConfig.getMaximumQueueDepth());
 }
 
 public long getMaximumMessageSize()
 {
-return _config.getLong("maximumMessageSize", 0);
+return _config.getLong("maximumMessageSize", 
_vHostConfig.getMaximumMessageSize());
 }
 
 public long getMaximumMessageCount()
 {
-return _config.getLong("maximumMessageCount", 0);
+return _config.getLong("maximumMessageCount", 
_vHostConfig.getMaximumMessageCount());
 }
 
 public long getMinimumAlertRepeatGap()
 {
-return _config.getLong("minimumAlertRepeatGap", 0);
+return _config.getLong("minimumAlertRepeatGap", 
_vHostConfig.getMinimumAlertRepeatGap());
 }
 
 public long getMemoryUsageMaximum()

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=761733&r1=761732&r2=761733&view=diff

svn commit: r764428 [2/2] - in /qpid/branches/0.5-fix/qpid/java/broker/src: main/java/org/apache/qpid/server/ main/java/org/apache/qpid/server/configuration/ main/java/org/apache/qpid/server/exchange/

[aidan]

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java?rev=764428&r1=764427&r2=764428&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
 Mon Apr 13 12:42:38 2009
@@ -34,6 +34,7 @@
 
 import org.apache.qpid.configuration.PropertyUtils;
 import org.apache.qpid.configuration.PropertyException;
+import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
 import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
@@ -46,20 +47,18 @@
 {
 private static final Logger _logger = 
Logger.getLogger(ConfigurationFilePrincipalDatabaseManager.class);
 
-private static final String _base = 
"security.principal-databases.principal-database";
-
 Map _databases;
 
-public ConfigurationFilePrincipalDatabaseManager(Configuration 
configuration) throws Exception
+public ConfigurationFilePrincipalDatabaseManager(ServerConfiguration 
_configuration) throws Exception
 {
 _logger.info("Initialising PrincipleDatabase authentication manager");
-_databases = initialisePrincipalDatabases(configuration);
+_databases = initialisePrincipalDatabases(_configuration);
 }
 
-private Map 
initialisePrincipalDatabases(Configuration configuration) throws Exception
+private Map 
initialisePrincipalDatabases(ServerConfiguration _configuration) throws 
Exception
 {
-List databaseNames = configuration.getList(_base + ".name");
-List databaseClasses = configuration.getList(_base + ".class");
+List databaseNames = 
_configuration.getPrincipalDatabaseNames();
+List databaseClasses = 
_configuration.getPrincipalDatabaseClass();
 Map databases = new HashMap();
 
 if (databaseNames.size() == 0)
@@ -84,7 +83,7 @@
 throw new Exception("Principal databases must implement the 
PrincipalDatabase interface");
 }
 
-initialisePrincipalDatabase((PrincipalDatabase) o, configuration, 
i);
+initialisePrincipalDatabase((PrincipalDatabase) o, _configuration, 
i);
 
 String name = databaseNames.get(i);
 if ((name == null) || (name.length() == 0))
@@ -105,12 +104,11 @@
 return databases;
 }
 
-private void initialisePrincipalDatabase(PrincipalDatabase 
principalDatabase, Configuration config, int index)
+private void initialisePrincipalDatabase(PrincipalDatabase 
principalDatabase, ServerConfiguration _configuration, int index)
 throws FileNotFoundException, ConfigurationException
 {
-String baseName = _base + "(" + index + ").attributes.attribute.";
-List argumentNames = config.getList(baseName + "name");
-List argumentValues = config.getList(baseName + "value");
+List argumentNames = 
_configuration.getPrincipalDatabaseAttributeNames(index);
+List argumentValues = 
_configuration.getPrincipalDatabaseAttributeValues(index);
 for (int i = 0; i < argumentNames.size(); i++)
 {
 String argName = argumentNames.get(i);
@@ -166,18 +164,17 @@
 return _databases;
 }
 
-public void initialiseManagement(Configuration config) throws 
ConfigurationException
+public void initialiseManagement(ServerConfiguration config) throws 
ConfigurationException
 {
 try
 {
 AMQUserManagementMBean _mbean = new AMQUserManagementMBean();
 
-String baseSecurity = "security.jmx";
-List principalDBs = config.getList(baseSecurity + 
".principal-database");
+List principalDBs = config.getManagementPrincipalDBs();
 
 if (principalDBs.size() == 0)
 {
-throw new ConfigurationException("No principal-database 
specified for jmx security(" + baseSecurity + ".principal-database)");
+throw new ConfigurationException("No principal-database 
specified for jmx security");
 }
 
 String databaseName = principalDBs.get(0);
@@ -191,11 +188,11 @@
 
 _mbean.setPrincipalDatabase(database);
 
-List jmxaccesslist = config.getList(baseSecurity + 
".access");
+List jmxaccesslist = config.getManagementAccessList();
 
 if (jmxaccesslist.size() == 0

svn commit: r764430 - in /qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration: ExchangeConfiguration.java QueueConfiguration.java SecurityConfiguration.java Serve

[aidan]

Author: aidan
Date: Mon Apr 13 12:57:54 2009
New Revision: 764430

URL: http://svn.apache.org/viewvc?rev=764430&view=rev
Log:
QPID-1621: forgot to svn add. oops.

Added:

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SecurityConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

Added: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java?rev=764430&view=auto
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
 (added)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
 Mon Apr 13 12:57:54 2009
@@ -0,0 +1,58 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.configuration;
+
+import org.apache.commons.configuration.Configuration;
+
+
+public class ExchangeConfiguration
+{
+
+private Configuration _config;
+private String _name;
+
+public ExchangeConfiguration(String exchName, Configuration subset)
+{
+_name = exchName;
+_config = subset;
+}
+
+public String getName()
+{
+return _name;
+}
+
+public String getType()
+{
+return _config.getString("type","direct");
+}
+
+public boolean getDurable()
+{
+return _config.getBoolean("durable", false);
+}
+
+public boolean getAutoDelete()
+{
+return _config.getBoolean("autodelete",false);
+}
+
+}

Added: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=764430&view=auto
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 (added)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 Mon Apr 13 12:57:54 2009
@@ -0,0 +1,106 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.configuration;
+
+import java.util.List;
+
+import org.apache.commons.configuration.Configuration;
+
+public class QueueConfiguration
+{
+
+// FIXME AIDAN XXX -- deal with defaults
+
+private Configuration _config;
+private String _name;
+
+public QueueConfiguration(String name, Configuration config)
+{
+_config = config;
+_name = name;
+}
+
+public boolean getDurable()
+{
+return _config.getBo

svn commit: r764448 - in /qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server: configuration/ management/ protocol/ queue/ transport/

[aidan]

Author: aidan
Date: Mon Apr 13 13:27:09 2009
New Revision: 764448

URL: http://svn.apache.org/viewvc?rev=764448&view=rev
Log:
QPID-1612: rm files, svn ftw

Removed:

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java


-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r764453 - /qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

[aidan]

Author: aidan
Date: Mon Apr 13 13:32:44 2009
New Revision: 764453

URL: http://svn.apache.org/viewvc?rev=764453&view=rev
Log:
QPID-1612 add missing method

Modified:

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=764453&r1=764452&r2=764453&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Mon Apr 13 13:32:44 2009
@@ -364,6 +364,11 @@
 {
 return _config.getBoolean("management.enabled", true);
 }
+ 
+public void setManagementEnabled(boolean enabled)
+{
+_config.setProperty("management.enabled", enabled);
+}
 
 public int getHeartBeatDelay()
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r764468 - in /qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid: client/ server/security/acl/ server/store/ test/client/timeouts/ test/utils/

[aidan]

Author: aidan
Date: Mon Apr 13 13:54:54 2009
New Revision: 764468

URL: http://svn.apache.org/viewvc?rev=764468&view=rev
Log:
QPID-1612: more fixups as other stuff hasnt followed

Modified:

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java?rev=764468&r1=764467&r2=764468&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
 Mon Apr 13 13:54:54 2009
@@ -61,7 +61,7 @@
 ConfigurationFileApplicationRegistry config = new 
ConfigurationFileApplicationRegistry(defaultaclConfigFile);
 
 // This is a bit evil it should be updated with QPID-1103
-config.getConfiguration().setProperty("management.enabled", "false");
+config.getConfiguration().setManagementEnabled(false);
 
 startBroker();
 }

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=764468&r1=764467&r2=764468&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
 Mon Apr 13 13:54:54 2009
@@ -63,7 +63,7 @@
 ConfigurationFileApplicationRegistry config = new 
ConfigurationFileApplicationRegistry(defaultaclConfigFile);
 
 // This is a bit evil it should be updated with QPID-1103
-config.getConfiguration().setProperty("management.enabled", "false");
+config.getConfiguration().setManagementEnabled(false);
 
 ApplicationRegistry.initialise(config, 1);
 

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=764468&r1=764467&r2=764468&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
 Mon Apr 13 13:54:54 2009
@@ -27,6 +27,7 @@
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
@@ -46,14 +47,14 @@
 private static final String POST = "post";
 private String DEFAULT_DELAY = "default";
 
-public void configure(VirtualHost virtualHost, String base, Configuration 
config) throws Exception
+public void configure(VirtualHost virtualHost, String base, 
VirtualHostConfiguration config) throws Exception
 {
 _logger.info("Starting SlowMessageStore on Virtualhost:" + 
virtualHost.getName());
-Configuration delays = config.subset(base + "." + DELAYS);
+Configuration delays = config.getStoreConfiguration().subset(DELAYS);
 
 configureDelays(delays);
 
-String messageStoreClass = config.getString(base + ".store.class");
+String messageStoreClass = config.getMessageStoreClass();
 
 if (delays.containsKey(DEFAULT_DELAY))
 {

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeout

svn commit: r764477 - /qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

[aidan]

Author: aidan
Date: Mon Apr 13 14:10:25 2009
New Revision: 764477

URL: http://svn.apache.org/viewvc?rev=764477&view=rev
Log:
Fix method call from merge gubbins

Modified:

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=764477&r1=764476&r2=764477&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 Mon Apr 13 14:10:25 2009
@@ -73,7 +73,7 @@
 
public long getHousekeepingExpiredMessageCheckPeriod()
{
-   return 
_config.getLong("housekeeping.expiredMessageCheckPeriod", 
ApplicationRegistry.getInstance().getConfiguration().getHousekeepingExpiredMessageCheckPeriod());
+   return 
_config.getLong("housekeeping.expiredMessageCheckPeriod", 
ApplicationRegistry.getInstance().getConfiguration().getHousekeepingCheckPeriod());
}
 
public String getAuthenticationDatabase()



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r764493 - in /qpid/branches/0.5-fix/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ main/java/org/apache/qpid/server/queue/ test/java/org/apache/qpid/server/configura

[aidan]

Author: aidan
Date: Mon Apr 13 14:48:45 2009
New Revision: 764493

URL: http://svn.apache.org/viewvc?rev=764493&view=rev
Log:
Fix misc compile errors.

Modified:

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java

qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java

qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=764493&r1=764492&r2=764493&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
 Mon Apr 13 14:48:45 2009
@@ -31,7 +31,7 @@
 private String _name;
 private VirtualHostConfiguration _vHostConfig;
 
-public QueueConfiguration(String name, Configuration config)
+public QueueConfiguration(String name, Configuration config, 
VirtualHostConfiguration virtualHostConfiguration)
 {
 _vHostConfig = virtualHostConfiguration;
 _config = config;

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=764493&r1=764492&r2=764493&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Mon Apr 13 14:48:45 2009
@@ -139,7 +139,7 @@
 String key = (String) k.next();
 
conf.setProperty("virtualhosts.virtualhost."+name+"."+key, 
myConf.getProperty(key));
 }
-VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name), 
this);
+VirtualHostConfiguration vhostConfig = new 
VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name));
 _virtualHosts.put(vhostConfig.getName(), vhostConfig);
 }
 }

Modified: 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=764493&r1=764492&r2=764493&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
 Mon Apr 13 14:48:45 2009
@@ -28,6 +28,7 @@
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.MemoryMessageStore;
 
@@ -50,7 +51,7 @@
CompositeConfiguration mungedConf = new 
CompositeConfiguration();

mungedConf.addConfiguration(_config.subset("queues.queue." + queueName));
mungedConf.addConfiguration(_config.subset("queues"));
-   _queues.put(queueName, new 
QueueConfiguration(queueName, mungedConf));
+   _queues.

svn commit: r764506 - in /qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid: server/store/SlowMessageStore.java test/client/timeouts/SyncWaitDelayTest.java

[aidan]

Author: aidan
Date: Mon Apr 13 15:27:32 2009
New Revision: 764506

URL: http://svn.apache.org/viewvc?rev=764506&view=rev
Log:
Fix config problem with SlowMessageStore

Modified:

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java

qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=764506&r1=764505&r2=764506&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
 Mon Apr 13 15:27:32 2009
@@ -54,7 +54,7 @@
 
 configureDelays(delays);
 
-String messageStoreClass = config.getMessageStoreClass();
+String messageStoreClass = 
config.getStoreConfiguration().getString("realStore");
 
 if (delays.containsKey(DEFAULT_DELAY))
 {

Modified: 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=764506&r1=764505&r2=764506&view=diff
==
--- 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
 (original)
+++ 
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
 Mon Apr 13 15:27:32 2009
@@ -70,6 +70,7 @@
 
 XMLConfiguration configuration = new XMLConfiguration(_configFile); 
 configuration.setProperty("virtualhosts.virtualhost." + 
VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+configuration.setProperty("virtualhosts.virtualhost." + 
VIRTUALHOST+".store.realStore", 
"org.apache.qpid.server.store.MemoryMessageStore");
 configuration.setProperty("virtualhosts.virtualhost." + 
VIRTUALHOST+".store.delays.commitTran.post", POST_COMMIT_DELAY);
 configuration.setProperty("management.enabled", "false");
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r765250 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java test/java/org/apache/qpid/server/configuration/ServerCon

[aidan]

Author: aidan
Date: Wed Apr 15 15:55:36 2009
New Revision: 765250

URL: http://svn.apache.org/viewvc?rev=765250&view=rev
Log:
QPID-1812: Fix firewall rule parsing, add test for this.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java?rev=765250&r1=765249&r2=765250&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
 Wed Apr 15 15:55:36 2009
@@ -55,7 +55,7 @@
 public ACLPlugin newInstance(Configuration config) throws 
ConfigurationException
 {
 FirewallPlugin plugin = new FirewallPlugin();
-plugin.setConfiguration(config);
+plugin.setConfiguration(config.subset("firewall"));
 return plugin;
 }
 };
@@ -245,7 +245,7 @@
 }
 CompositeConfiguration finalConfig = new 
CompositeConfiguration(config);
 
-List subFiles = config.getList("firewall.x...@filename]");
+List subFiles = config.getList("x...@filename]");
 for (Object subFile : subFiles)
 {
 finalConfig.addConfiguration(new XMLConfiguration((String) 
subFile));

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=765250&r1=765249&r2=765250&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
 Wed Apr 15 15:55:36 2009
@@ -696,6 +696,64 @@
 "foo", config.getManagementKeyStorePath());
 }
 
+public void testFirewallConfiguration() throws Exception
+{
+ // Write out config
+File mainFile = File.createTempFile(getClass().getName(), null);
+mainFile.deleteOnExit();
+FileWriter out = new FileWriter(mainFile);
+
+out.write("\n");
+out.write("\tfalse\n");
+out.write("\t\n");
+out.write("\t\t\n");
+out.write("\t\t\t\n");
+out.write("\t\t\t\tpasswordfile\n");
+
out.write("\t\t\t\torg.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase\n");
+out.write("\t\t\t\t\n");
+out.write("\t\t\t\t\t\n");
+out.write("\t\t\t\t\t\tpasswordFile\n");
+out.write("\t\t\t\t\t\t/dev/null\n");
+out.write("\t\t\t\t\t\n");
+out.write("\t\t\t\t\n");
+out.write("\t\t\t\n");
+out.write("\t\t\n");
+out.write("\t\t\n");
+out.write("\t\t\t/dev/null\n");
+
out.write("\t\t\tpasswordfile\n");
+out.write("\t\t\n");
+out.write("\t\t\n");
+out.write("\t\t\t");
+out.write("\t\t\n");
+out.write("\t\n");
+out.write("\t\n");
+out.write("\t\t\n");
+out.write("\t\t\ttest\n");
+out.write("\t\t\n");
+out.write("\t\n");
+out.write("\n");
+out.close();
+
+// Load config
+ApplicationRegistry reg = new 
ConfigurationFileApplicationRegistry(mainFile);
+ApplicationRegistry.initialise(reg, 1);
+
+// Test config
+VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry();
+VirtualHost virtualHost = virtualHostRegistry.getVirtualHost("test");
+AMQCodecFactory codecFactory = new AMQCodecFactory(true);
+
+TestIoSession iosession = new TestIoSession();
+iosession.setAddress("127.0.0.1");
+
+AMQProtocolSession session = new AMQMinaProtocolSession(iosession, 
virtualHostRegistry, codecFactory);
+assertFalse(reg.getAccessManager().authoriseConnec

svn commit: r766004 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java

[aidan]

Author: aidan
Date: Fri Apr 17 13:46:59 2009
New Revision: 766004

URL: http://svn.apache.org/viewvc?rev=766004&view=rev
Log:
QPID-1820: configure queues on creation

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=766004&r1=766003&r2=766004&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
 Fri Apr 17 13:46:59 2009
@@ -38,7 +38,6 @@
   VirtualHost virtualHost, final 
FieldTable arguments)
 throws AMQException
 {
-
 final int priorities = arguments == null ? 1 : 
arguments.containsKey(X_QPID_PRIORITIES) ? 
arguments.getInteger(X_QPID_PRIORITIES) : 1;
 
 AMQQueue q = null;
@@ -53,6 +52,7 @@
 
 //Register the new queue
 virtualHost.getQueueRegistry().registerQueue(q);
+
q.configure(virtualHost.getConfiguration().getQueueConfiguration(name.asString()));
 return q;
 }
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r766025 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

[aidan]

Author: aidan
Date: Fri Apr 17 14:23:03 2009
New Revision: 766025

URL: http://svn.apache.org/viewvc?rev=766025&view=rev
Log:
Eat IllegalArgumentException when creating the signal handler, fixes startup on 
Windows.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=766025&r1=766024&r2=766025&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Fri Apr 17 14:23:03 2009
@@ -100,7 +100,15 @@
 {
 this(parseConfig(configurationURL));
 _configFile = configurationURL;
-sun.misc.Signal.handle(new sun.misc.Signal("HUP"), this);
+try 
+{
+Signal sig = new sun.misc.Signal("HUP");
+sun.misc.Signal.handle(sig, this);
+} 
+catch (IllegalArgumentException e)
+{
+// We're on something that doesn't handle SIGHUP, how sad, 
Windows. 
+}
 }
 
 public ServerConfiguration(Configuration conf) throws 
ConfigurationException



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r766042 - /qpid/trunk/qpid/java/08ExcludeList

[aidan]

Author: aidan
Date: Fri Apr 17 15:05:38 2009
New Revision: 766042

URL: http://svn.apache.org/viewvc?rev=766042&view=rev
Log:
Turn off NoLocalAfterRecoveryTest until it's fixed.

Modified:
qpid/trunk/qpid/java/08ExcludeList

Modified: qpid/trunk/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/08ExcludeList?rev=766042&r1=766041&r2=766042&view=diff
==
--- qpid/trunk/qpid/java/08ExcludeList (original)
+++ qpid/trunk/qpid/java/08ExcludeList Fri Apr 17 15:05:38 2009
@@ -7,3 +7,6 @@
 // Those tests are written against the 0.10 path
 org.apache.qpid.test.unit.message.UTF8Test#*
 org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait
+
+//QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
+org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r766043 - /qpid/branches/0.5-release/qpid/java/08ExcludeList

[aidan]

Author: aidan
Date: Fri Apr 17 15:07:48 2009
New Revision: 766043

URL: http://svn.apache.org/viewvc?rev=766043&view=rev
Log:
Turn off NoLocalAfterRecoveryTest until it's fixed.

Modified:
qpid/branches/0.5-release/qpid/java/08ExcludeList

Modified: qpid/branches/0.5-release/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/08ExcludeList?rev=766043&r1=766042&r2=766043&view=diff
==
--- qpid/branches/0.5-release/qpid/java/08ExcludeList (original)
+++ qpid/branches/0.5-release/qpid/java/08ExcludeList Fri Apr 17 15:07:48 2009
@@ -7,3 +7,6 @@
 // Those tests are written against the 0.10 path
 org.apache.qpid.test.unit.message.UTF8Test#*
 org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait
+
+//QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
+org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r767185 - in /qpid/trunk/qpid/java: ./ client/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/test/unit/client/

[aidan]

Author: aidan
Date: Tue Apr 21 15:23:17 2009
New Revision: 767185

URL: http://svn.apache.org/viewvc?rev=767185&view=rev
Log:
QPID-1823: Allow recycling of channel IDs

AMQConnection.getNextChannelID: add method to abstract channel id assignment, 
allow max to be set
AMQConnectionDelegate*: add getMaxChannelID
AMQConnectionDelegate_0_10: use getNextChannelID for this session-id
SessionCreateTest: add test that attempts to create 6 sessions on one 
connection
AMQConnectionTest: add unit test for getNextChannelID

SessionCreateTest takes a long, long time to run so is excluded by default

Added:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
Modified:
qpid/trunk/qpid/java/010ExcludeList
qpid/trunk/qpid/java/08ExcludeList
qpid/trunk/qpid/java/08ExcludeList-nonvm

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java

qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java

Modified: qpid/trunk/qpid/java/010ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/010ExcludeList?rev=767185&r1=767184&r2=767185&view=diff
==
--- qpid/trunk/qpid/java/010ExcludeList (original)
+++ qpid/trunk/qpid/java/010ExcludeList Tue Apr 21 15:23:17 2009
@@ -69,3 +69,7 @@
 
 //QPID-1818 : 0-10 Client code path does not correctly restore a transacted 
session after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*
+

Modified: qpid/trunk/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/08ExcludeList?rev=767185&r1=767184&r2=767185&view=diff
==
--- qpid/trunk/qpid/java/08ExcludeList (original)
+++ qpid/trunk/qpid/java/08ExcludeList Tue Apr 21 15:23:17 2009
@@ -10,3 +10,6 @@
 
 //QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*

Modified: qpid/trunk/qpid/java/08ExcludeList-nonvm
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/08ExcludeList-nonvm?rev=767185&r1=767184&r2=767185&view=diff
==
--- qpid/trunk/qpid/java/08ExcludeList-nonvm (original)
+++ qpid/trunk/qpid/java/08ExcludeList-nonvm Tue Apr 21 15:23:17 2009
@@ -36,3 +36,6 @@
 org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#*
 //QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*
+

Modified: 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=767185&r1=767184&r2=767185&view=diff
==
--- 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 (original)
+++ 
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 Tue Apr 21 15:23:17 2009
@@ -90,6 +90,9 @@
 private final LinkedHashMap _slowAccessSessions = 
new LinkedHashMap();
 private int _size = 0;
 private static final int FAST_CHANNEL_ACCESS_MASK = 0xFFF0;
+private AtomicInteger _idFactory = new AtomicInteger(0);
+private int _maxChannelID;
+private boolean _cycledIds;
 
 public AMQSession get(int channelId)
 {
@@ -179,11 +182,57 @@
 _fastAccessSessions[i] = null;
 }
 }
+
+/*
+ * Synchronized on whole method so that we don't need to consider the
+ * increment-then-reset path in too much detail
+ */
+public synchronized int getNextChannelId()
+{
+int id = 0;
+if (!_cycledIds)
+{
+id = _idFactory.incrementAndGet();
+if (id == _maxChannelID)
+{
+_cycledIds = true;
+_idFactory.set(0); // Go back to the start
+}
+}
+else
+{
+  

svn commit: r767201 - in /qpid/branches/0.5-release/qpid/java: ./ client/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/client/ systests/src/main/java/org/apache/qpid/tes

[aidan]

Author: aidan
Date: Tue Apr 21 16:04:55 2009
New Revision: 767201

URL: http://svn.apache.org/viewvc?rev=767201&view=rev
Log:
QPID-1823: Allow recycling of channel IDs

AMQConnection.getNextChannelID: add method to abstract channel id assignment, 
allow max to be set
AMQConnectionDelegate*: add getMaxChannelID
AMQConnectionDelegate_0_10: use getNextChannelID for this session-id
SessionCreateTest: add test that attempts to create 6 sessions on one 
connection
AMQConnectionTest: add unit test for getNextChannelID

SessionCreateTest takes a long, long time to run so is excluded by default

Added:

qpid/branches/0.5-release/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
Modified:
qpid/branches/0.5-release/qpid/java/010ExcludeList
qpid/branches/0.5-release/qpid/java/08ExcludeList
qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm

qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java

qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java

qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java

qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java

qpid/branches/0.5-release/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java

Modified: qpid/branches/0.5-release/qpid/java/010ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/010ExcludeList?rev=767201&r1=767200&r2=767201&view=diff
==
--- qpid/branches/0.5-release/qpid/java/010ExcludeList (original)
+++ qpid/branches/0.5-release/qpid/java/010ExcludeList Tue Apr 21 16:04:55 2009
@@ -69,3 +69,7 @@
 
 //QPID-1818 : 0-10 Client code path does not correctly restore a transacted 
session after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*
+

Modified: qpid/branches/0.5-release/qpid/java/08ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/08ExcludeList?rev=767201&r1=767200&r2=767201&view=diff
==
--- qpid/branches/0.5-release/qpid/java/08ExcludeList (original)
+++ qpid/branches/0.5-release/qpid/java/08ExcludeList Tue Apr 21 16:04:55 2009
@@ -10,3 +10,6 @@
 
 //QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*

Modified: qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm?rev=767201&r1=767200&r2=767201&view=diff
==
--- qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm (original)
+++ qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm Tue Apr 21 16:04:55 
2009
@@ -36,3 +36,6 @@
 org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#*
 //QPID-1818 : Client code path does not correctly restore a transacted session 
after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
+// QPID-1823: this takes ages to run
+org.apache.qpid.client.SessionCreateTest#*
+

Modified: 
qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=767201&r1=767200&r2=767201&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 (original)
+++ 
qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 Tue Apr 21 16:04:55 2009
@@ -90,6 +90,9 @@
 private final LinkedHashMap _slowAccessSessions = 
new LinkedHashMap();
 private int _size = 0;
 private static final int FAST_CHANNEL_ACCESS_MASK = 0xFFF0;
+private AtomicInteger _idFactory = new AtomicInteger(0);
+private int _maxChannelID;
+private boolean _cycledIds;
 
 public AMQSession get(int channelId)
 {
@@ -179,11 +182,57 @@
 _fastAccessSessions[i] = null;
 }
 }
+
+/*
+ * Synchronized on whole method so that we don't need to consider the
+ * increment-then-reset path in too much detail
+ */
+public synchronized int getNextChannelId()
+  

svn commit: r767951 - in /qpid/trunk/qpid/java/broker: etc/ src/main/java/org/apache/qpid/server/configuration/ src/test/java/org/apache/qpid/server/configuration/

[aidan]

Author: aidan
Date: Thu Apr 23 16:05:34 2009
New Revision: 767951

URL: http://svn.apache.org/viewvc?rev=767951&view=rev
Log:
QPID-1826: Ensure that server-wide configuration variables in virtualhosts.xml 
are honored. Add sample-flattened parse tree from M4 and test to ensure that 
values are parsed appropriately.

Added:
qpid/trunk/qpid/java/broker/etc/persistent_config-config-test.xml
qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml
qpid/trunk/qpid/java/broker/etc/virtualhosts-config-test.xml
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Added: qpid/trunk/qpid/java/broker/etc/persistent_config-config-test.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/persistent_config-config-test.xml?rev=767951&view=auto
==
--- qpid/trunk/qpid/java/broker/etc/persistent_config-config-test.xml (added)
+++ qpid/trunk/qpid/java/broker/etc/persistent_config-config-test.xml Thu Apr 
23 16:05:34 2009
@@ -0,0 +1,93 @@
+
+
+
+
+${QPID_WORK}
+${QPID_HOME}/etc
+${conf}
+
+nio
+5672
+32768
+32768
+
+
+false
+8999
+
+
+
+false
+false
+65535
+false
+
+
+
+
+
+passwordfile
+
org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase
+
+
+passwordFile
+${passwordDir}/passwd
+
+
+
+
+
+
+
org.apache.qpid.server.security.access.plugins.AllowAll
+
+
+${passwordDir}/jmxremote.access
+passwordfile
+
+
+
+
+
+dev-only
+
+
+
org.apache.qpid.server.store.MemoryMessageStore
+
${work}/bdbstore/dev-only-store
+
+
+
+
+
+0
+2.0
+
+
+true
+
+
+${conf}/virtualhosts-config-test.xml
+
+
+

Added: qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml?rev=767951&view=auto
==
--- qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml (added)
+++ qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml Thu Apr 23 
16:05:34 2009
@@ -0,0 +1,76 @@
+
+
+${QPID_WORK}
+${QPID_HOME}/etc
+${conf}
+
+nio
+5672
+32768
+32768
+
+
+false
+8999
+
+
+
+false
+false
+65535
+false
+
+
+
+
+passwordfile
+org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase
+
+
+passwordFile
+${passwordDir}/passwd
+
+
+
+
+
+org.apache.qpid.server.security.access.plugins.AllowAll
+
+
+${passwordDir}/jmxremote.access
+passwordfile
+
+
+${conf}/virtualhosts-config-test.xml
+dev-only
+
+
+org.apache.qpid.server.store.MemoryMessageStore
+${work}/bdbstore/dev-only-store
+
+
+
+
+
+0
+2.0
+
+
+true
+
+dev-only
+
+dev-only
+
+
+amq.direct
+102400
+20480
+6
+
+dev-queue
+
+
+
+
+

Added: qpid/trunk/qpid/java/broker/etc/virtualhosts-config-test.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/virtualhosts-config-test.xml?rev=767951&view=auto
==
--- qpid/trunk/qpid/java/broker/etc/virtualhosts-config-test.xml (added)
+++ qpid/trunk/qpid/java/broker/etc/virtualhosts-config-test.xml Thu Apr 23 
16:05:34 2009
@@ -0,0 +1,40 @@
+
+
+
+dev-only
+
+dev-only
+
+
+amq.direct
+   
+102400  
+20480 
+6  
+
+
+dev-queue
+
+
+
+
+

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=767951&r1=767950&r2=767951&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Thu Apr 23 16:05:34 2009
@@ -47,7 +47,7 @@
 public class ServerConfiguration implements SignalHandler
 {
 
-private static Configuration _config;
+private Configura

svn commit: r767952 - in /qpid/branches/0.5-release/qpid/java/broker: etc/ src/main/java/org/apache/qpid/server/configuration/ src/test/java/org/apache/qpid/server/configuration/

[aidan]

Author: aidan
Date: Thu Apr 23 16:07:43 2009
New Revision: 767952

URL: http://svn.apache.org/viewvc?rev=767952&view=rev
Log:
QPID-1826: Ensure that server-wide configuration variables in virtualhosts.xml 
are honored. Add sample-flattened parse tree from M4 and test to ensure that 
values are parsed appropriately.

Added:

qpid/branches/0.5-release/qpid/java/broker/etc/persistent_config-config-test.xml
qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
qpid/branches/0.5-release/qpid/java/broker/etc/virtualhosts-config-test.xml
Modified:

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

qpid/branches/0.5-release/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Added: 
qpid/branches/0.5-release/qpid/java/broker/etc/persistent_config-config-test.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/persistent_config-config-test.xml?rev=767952&view=auto
==
--- 
qpid/branches/0.5-release/qpid/java/broker/etc/persistent_config-config-test.xml
 (added)
+++ 
qpid/branches/0.5-release/qpid/java/broker/etc/persistent_config-config-test.xml
 Thu Apr 23 16:07:43 2009
@@ -0,0 +1,93 @@
+
+
+
+
+${QPID_WORK}
+${QPID_HOME}/etc
+${conf}
+
+nio
+5672
+32768
+32768
+
+
+false
+8999
+
+
+
+false
+false
+65535
+false
+
+
+
+
+
+passwordfile
+
org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase
+
+
+passwordFile
+${passwordDir}/passwd
+
+
+
+
+
+
+
org.apache.qpid.server.security.access.plugins.AllowAll
+
+
+${passwordDir}/jmxremote.access
+passwordfile
+
+
+
+
+
+dev-only
+
+
+
org.apache.qpid.server.store.MemoryMessageStore
+
${work}/bdbstore/dev-only-store
+
+
+
+
+
+0
+2.0
+
+
+true
+
+
+${conf}/virtualhosts-config-test.xml
+
+
+

Added: qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml?rev=767952&view=auto
==
--- qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml 
(added)
+++ qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml Thu 
Apr 23 16:07:43 2009
@@ -0,0 +1,76 @@
+
+
+${QPID_WORK}
+${QPID_HOME}/etc
+${conf}
+
+nio
+5672
+32768
+32768
+
+
+false
+8999
+
+
+
+false
+false
+65535
+false
+
+
+
+
+passwordfile
+org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase
+
+
+passwordFile
+${passwordDir}/passwd
+
+
+
+
+
+org.apache.qpid.server.security.access.plugins.AllowAll
+
+
+${passwordDir}/jmxremote.access
+passwordfile
+
+
+${conf}/virtualhosts-config-test.xml
+dev-only
+
+
+org.apache.qpid.server.store.MemoryMessageStore
+${work}/bdbstore/dev-only-store
+
+
+
+
+
+0
+2.0
+
+
+true
+
+dev-only
+
+dev-only
+
+
+amq.direct
+102400
+20480
+6
+
+dev-queue
+
+
+
+
+

Added: 
qpid/branches/0.5-release/qpid/java/broker/etc/virtualhosts-config-test.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/virtualhosts-config-test.xml?rev=767952&view=auto
==
--- qpid/branches/0.5-release/qpid/java/broker/etc/virtualhosts-config-test.xml 
(added)
+++ qpid/branches/0.5-release/qpid/java/broker/etc/virtualhosts-config-test.xml 
Thu Apr 23 16:07:43 2009
@@ -0,0 +1,40 @@
+
+
+
+dev-only
+
+dev-only
+
+
+amq.direct
+   
+102400  
+20480 
+6  
+
+
+dev-queue
+
+
+
+
+

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=767952&r1=767951&r2=767952&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerC

svn commit: r767989 - in /qpid/trunk/qpid/java/broker: etc/sample-parsed-config.xml src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

[aidan]

Author: aidan
Date: Thu Apr 23 17:35:43 2009
New Revision: 767989

URL: http://svn.apache.org/viewvc?rev=767989&view=rev
Log:
QPID-1826: brown paper bag commit

Modified:
qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

Modified: qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml?rev=767989&r1=767988&r2=767989&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/sample-parsed-config.xml Thu Apr 23 
17:35:43 2009
@@ -41,27 +41,15 @@
 passwordfile
 
 
-${conf}/virtualhosts-config-test.xml
+${conf}/virtualhosts-config-test.xml
+dev-only
+
 dev-only
 
 
 org.apache.qpid.server.store.MemoryMessageStore
 ${work}/bdbstore/dev-only-store
 
-
-
-
-
-0
-2.0
-
-
-true
-
-dev-only
-
-dev-only
-
 
 amq.direct
 102400
@@ -73,4 +61,12 @@
 
 
 
+
+
+0
+2.0
+
+
+true
+
 

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=767989&r1=767988&r2=767989&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Thu Apr 23 17:35:43 2009
@@ -155,7 +155,7 @@
 while (keys.hasNext())
 {
 String key = (String) keys.next();
-conf.setProperty(key, vhostConfiguration.getProperty(key));
+conf.setProperty("virtualhosts."+key, 
vhostConfiguration.getProperty(key));
 }
 }
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r767990 - in /qpid/branches/0.5-release/qpid/java/broker: etc/sample-parsed-config.xml src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

[aidan]

Author: aidan
Date: Thu Apr 23 17:36:25 2009
New Revision: 767990

URL: http://svn.apache.org/viewvc?rev=767990&view=rev
Log:
QPID-1826: brown paper bag commit

Modified:
qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml

qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java

Modified: 
qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml?rev=767990&r1=767989&r2=767990&view=diff
==
--- qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml 
(original)
+++ qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml Thu 
Apr 23 17:36:25 2009
@@ -41,27 +41,15 @@
 passwordfile
 
 
-${conf}/virtualhosts-config-test.xml
+${conf}/virtualhosts-config-test.xml
+dev-only
+
 dev-only
 
 
 org.apache.qpid.server.store.MemoryMessageStore
 ${work}/bdbstore/dev-only-store
 
-
-
-
-
-0
-2.0
-
-
-true
-
-dev-only
-
-dev-only
-
 
 amq.direct
 102400
@@ -73,4 +61,12 @@
 
 
 
+
+
+0
+2.0
+
+
+true
+
 

Modified: 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=767990&r1=767989&r2=767990&view=diff
==
--- 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Thu Apr 23 17:36:25 2009
@@ -155,7 +155,7 @@
 while (keys.hasNext())
 {
 String key = (String) keys.next();
-conf.setProperty(key, vhostConfiguration.getProperty(key));
+conf.setProperty("virtualhosts."+key, 
vhostConfiguration.getProperty(key));
 }
 }
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r769406 - in /qpid/trunk/qpid/java: 010ExcludeList java.testprofile systests/src/main/java/org/apache/qpid/server/AlertingTest.java systests/src/main/java/org/apache/qpid/test/utils/QpidTe

[aidan]

Author: aidan
Date: Tue Apr 28 14:04:36 2009
New Revision: 769406

URL: http://svn.apache.org/viewvc?rev=769406&view=rev
Log:
QPID-1730: add AlertingTest, although not to 010

java.testprofile: Make sure that the broker can always find the log 
configuration file even if we've used a different directory for the config file

QpidTestCase: expose the file that the output is being written to as a 
protected variable.

Added:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
Modified:
qpid/trunk/qpid/java/010ExcludeList
qpid/trunk/qpid/java/java.testprofile

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

Modified: qpid/trunk/qpid/java/010ExcludeList
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/010ExcludeList?rev=769406&r1=769405&r2=769406&view=diff
==
--- qpid/trunk/qpid/java/010ExcludeList (original)
+++ qpid/trunk/qpid/java/010ExcludeList Tue Apr 28 14:04:36 2009
@@ -73,3 +73,6 @@
 // QPID-1823: this takes ages to run
 org.apache.qpid.client.SessionCreateTest#*
 
+// QPID-1730: the C++ server has a totally different logging mechanism. We 
should split this file differently
+org.apache.qpid.server.AlertingTest#*
+

Modified: qpid/trunk/qpid/java/java.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=769406&r1=769405&r2=769406&view=diff
==
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java.testprofile Tue Apr 28 14:04:36 2009
@@ -1,5 +1,5 @@
 broker.language=java
-broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE
+broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c 
@CONFIG_FILE -l ${project.root}/log4j-test.xml
 broker.clean=${project.root}/clean-dir ${build.data}
 broker.ready=Qpid Broker Ready
 

Added: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java?rev=769406&view=auto
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 (added)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 Tue Apr 28 14:04:36 2009
@@ -0,0 +1,159 @@
+/*
+*
+* 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.
+*
+*/
+package org.apache.qpid.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
+import org.apache.qpid.server.store.DerbyMessageStore;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+public class AlertingTest extends QpidTestCase
+{
+private String VIRTUALHOST = "test";
+private Session _session;
+private Connection _connection;
+private Queue _destination;
+private MessageConsumer _consumer; // Never read, but does need to be here 
to create the destination.
+private File _logfile;
+private XMLConfiguration _configuration;
+
+public void setUp() throws Exception
+{
+// First we munge the config file and, if we're in a VM, set up an 
additional logfile
+
+_configuration = new XMLConfiguration(_configFile); 
+_configuration.setProperty("management.enabled", "false");
+Class storeClass = DerbyMessageStore.class;
+try {
+Class bdb = 
Class.forName("org.apache.qpid.store.berkleydb.BDBMessageStore");
+}
+catch (ClassNotFoundException e)
+{
+// No BDB store, we'll use Derby instead. 
+}
+
+   

svn commit: r774543 - /qpid/branches/0.5-release/qpid/java/broker/etc/config.xml

[aidan]

Author: aidan
Date: Wed May 13 21:25:45 2009
New Revision: 774543

URL: http://svn.apache.org/viewvc?rev=774543&view=rev
Log:
QPID-1858: use the generated keystore by default 

Modified:
qpid/branches/0.5-release/qpid/java/broker/etc/config.xml

Modified: qpid/branches/0.5-release/qpid/java/broker/etc/config.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/config.xml?rev=774543&r1=774542&r2=774543&view=diff
==
--- qpid/branches/0.5-release/qpid/java/broker/etc/config.xml (original)
+++ qpid/branches/0.5-release/qpid/java/broker/etc/config.xml Wed May 13 
21:25:45 2009
@@ -48,7 +48,7 @@
 
 true
 
-
${prefix}/../test_resources/ssl/keystore.jks
+${conf}/qpid.keystore
 password
 
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r777601 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java

[aidan]

Author: aidan
Date: Fri May 22 16:25:04 2009
New Revision: 777601

URL: http://svn.apache.org/viewvc?rev=777601&view=rev
Log:
Use alert level in the config file, don't try to set one (since that won't 
always work. *sigh*). Need a test-config really.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java?rev=777601&r1=777600&r2=777601&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 Fri May 22 16:25:04 2009
@@ -46,6 +46,7 @@
 private MessageConsumer _consumer; // Never read, but does need to be here 
to create the destination.
 private File _logfile;
 private XMLConfiguration _configuration;
+private int _numMessages;
 
 public void setUp() throws Exception
 {
@@ -63,12 +64,13 @@
 }
 
 _configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST + 
".store.class", storeClass.getName());
-_configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST + 
".queues.maximumMessageCount", 2);
+_numMessages = 5000;
 
 File tmpFile = File.createTempFile("configFile", "test");
 tmpFile.deleteOnExit();
 _configuration.save(tmpFile);
 _configFile = tmpFile;
+
 
 if (_outputFile != null)  
 {
@@ -82,7 +84,7 @@
 appender.setFile(_logfile.getAbsolutePath());
 appender.setImmediateFlush(true);
 Logger.getRootLogger().addAppender(appender);
-_logfile.deleteOnExit();
+//_logfile.deleteOnExit();
 }
 
 // Then we do the normal setup stuff like starting the broker, getting 
a connection etc.
@@ -123,14 +125,14 @@
 public void testAlertingReallyWorks() throws Exception
 {
 // Send 5 messages, make sure that the alert was fired properly. 
-sendMessage(_session, _destination, 4);
+sendMessage(_session, _destination, _numMessages + 1);
 boolean found = wasAlertFired();
 assertTrue("no alert generated in "+_logfile.getAbsolutePath(), found);
 }
 
 public void testAlertingReallyWorksWithRestart() throws Exception
 {
-sendMessage(_session, _destination, 4);
+sendMessage(_session, _destination, _numMessages + 1);
 stopBroker();
 (new FileOutputStream(_logfile)).getChannel().truncate(0);
 startBroker();



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r778415 - in /qpid/trunk/qpid/java: default.testprofile java.testprofile

[aidan]

Author: aidan
Date: Mon May 25 13:19:49 2009
New Revision: 778415

URL: http://svn.apache.org/viewvc?rev=778415&view=rev
Log:
Nuke derby.log and derbyDB in broker cleanup. Also, why does Derby not honor 
QPID_HOME? Lame.

Modified:
qpid/trunk/qpid/java/default.testprofile
qpid/trunk/qpid/java/java.testprofile

Modified: qpid/trunk/qpid/java/default.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=778415&r1=778414&r2=778415&view=diff
==
--- qpid/trunk/qpid/java/default.testprofile (original)
+++ qpid/trunk/qpid/java/default.testprofile Mon May 25 13:19:49 2009
@@ -1,6 +1,6 @@
 broker.version=0-8
 broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
${project.root}/derby.log
 broker.ready=Listening on TCP port
 
 java.naming.provider.url=${project.root}/test-provider.properties

Modified: qpid/trunk/qpid/java/java.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=778415&r1=778414&r2=778415&view=diff
==
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java.testprofile Mon May 25 13:19:49 2009
@@ -1,6 +1,6 @@
 broker.language=java
 broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c 
@CONFIG_FILE -l ${project.root}/log4j-test.xml
-broker.clean=${project.root}/clean-dir ${build.data}
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
${project.root}/derby.log
 broker.ready=Qpid Broker Ready
 
 test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList 
${project.root}/08ExcludeList-nonvm



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r778707 - /qpid/trunk/qpid/java/log4j-test.xml

[aidan]

Author: aidan
Date: Tue May 26 14:03:54 2009
New Revision: 778707

URL: http://svn.apache.org/viewvc?rev=778707&view=rev
Log:
Turn on immediate flush on the console appender.

Modified:
qpid/trunk/qpid/java/log4j-test.xml

Modified: qpid/trunk/qpid/java/log4j-test.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/log4j-test.xml?rev=778707&r1=778706&r2=778707&view=diff
==
--- qpid/trunk/qpid/java/log4j-test.xml (original)
+++ qpid/trunk/qpid/java/log4j-test.xml Tue May 26 14:03:54 2009
@@ -32,6 +32,7 @@
 
   
 
+
   
 
   



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r778723 - in /qpid/trunk/qpid/java: broker/etc/config-systests.xml broker/etc/virtualhosts-systests.xml default.testprofile java.testprofile systests/src/main/java/org/apache/qpid/server/A

[aidan]

Author: aidan
Date: Tue May 26 14:41:05 2009
New Revision: 778723

URL: http://svn.apache.org/viewvc?rev=778723&view=rev
Log:
Don't delete derby.log. Use virtualhost-systests.xml for testing purpouses. 
Minor code cleanup in AlertingTest.

Added:
qpid/trunk/qpid/java/broker/etc/virtualhosts-systests.xml
Modified:
qpid/trunk/qpid/java/broker/etc/config-systests.xml
qpid/trunk/qpid/java/default.testprofile
qpid/trunk/qpid/java/java.testprofile

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java

Modified: qpid/trunk/qpid/java/broker/etc/config-systests.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config-systests.xml?rev=778723&r1=778722&r2=778723&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/config-systests.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config-systests.xml Tue May 26 14:41:05 2009
@@ -132,7 +132,7 @@
 true
 
 
-${conf}/virtualhosts.xml
+${conf}/virtualhosts-systests.xml
 
 
 

Added: qpid/trunk/qpid/java/broker/etc/virtualhosts-systests.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/virtualhosts-systests.xml?rev=778723&view=auto
==
--- qpid/trunk/qpid/java/broker/etc/virtualhosts-systests.xml (added)
+++ qpid/trunk/qpid/java/broker/etc/virtualhosts-systests.xml Tue May 26 
14:41:05 2009
@@ -0,0 +1,124 @@
+
+
+
+test
+
+localhost
+
+
+
+direct
+test.direct
+true
+
+
+topic
+test.topic
+
+
+
+amq.direct
+4235264  
+2117632 
+60  
+50 
+
+
+queue
+
+
+ping
+
+
+test-queue
+
+test.direct
+true
+
+
+
+test-ping
+
+test.direct
+
+
+
+
+
+
+
+
+
+development
+
+
+3
+50
+
+queue
+
+amq.direct
+4235264  
+2117632 
+60  
+
+
+
+ping
+
+amq.direct
+4235264  
+2117632 
+60  
+
+
+
+
+
+
+test
+
+
+3
+50
+
+queue
+
+amq.direct
+4235264  

+2117632 

+60  

+
+
+
+ping
+
+amq.direct
+4235264  

+2117632 

+60  

+
+
+
+
+
+

Modified: qpid/trunk/qpid/java/default.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=778723&r1=778722&r2=778723&view=diff
==
--- qpid/trunk/qpid/java/default.testprofile (original)
+++ qpid/trunk/qpid/java/default.testprofile Tue May 26 14:41:05 2009
@@ -1,6 +1,6 @@
 broker.version=0-8
 broker=vm
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
${project.root}/derby.log
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
 broker.ready=Listening on TCP port
 
 java.naming.provider.url=${project.root}/test-provider.properties

Modified: qpid/trunk/qpid/java/java.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=778723&r1=778722&r2=778723&view=diff
==
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java.testprofile Tue May 26 14:41:05 2009
@@ -1,6 +1,6 @@
 broker.language=java
 broker=${project.

svn commit: r779557 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java

[aidan]

Author: aidan
Date: Thu May 28 10:46:37 2009
New Revision: 779557

URL: http://svn.apache.org/viewvc?rev=779557&view=rev
Log:
Fail the test when we can't find the alert and surface the contents of the 
logfile. Ugly but effective for debugging occasional failures in CI.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java?rev=779557&r1=779556&r2=779557&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/AlertingTest.java
 Thu May 28 10:46:37 2009
@@ -104,9 +104,14 @@
 _consumer = _session.createConsumer(_destination);
 }
 
-private boolean wasAlertFired() throws Exception
+/**
+ * Checks the log file for MESSAGE_COUNT_ALERT, fails() the test if it's 
not found and
+ * places the entire contents in the message to help debug cruise control 
failures.
+ * @throws Exception
+ */
+private void wasAlertFired() throws Exception
 {
-// Loop throught alerts until we're done or 5 seconds have passed, 
+// Loop through alerts until we're done or 5 seconds have passed, 
 // just in case the logfile takes a while to flush. 
 BufferedReader reader = new BufferedReader(new FileReader(_logfile));
 boolean found = false;
@@ -122,15 +127,26 @@
 }
 }
 }
-return found;
+if (!found)
+{
+StringBuffer message = new StringBuffer("Could not find alert in 
log file: "+_logfile.getAbsolutePath());
+message.append("\n");
+reader = new BufferedReader(new FileReader(_logfile));
+for (int i = 0; i < 79; i++) { message.append("-"); };
+message.append("\n");
+while (reader.ready()) { message.append(reader.readLine() + "\n");}
+message.append("\n");
+for (int i = 0; i < 79; i++) { message.append("-"); };
+message.append("\n");
+fail(message.toString());
+}
 }
 
 public void testAlertingReallyWorks() throws Exception
 {
 // Send 5 messages, make sure that the alert was fired properly. 
 sendMessage(_session, _destination, _numMessages + 1);
-boolean found = wasAlertFired();
-assertTrue("no alert generated in "+_logfile.getAbsolutePath(), found);
+wasAlertFired();
 }
 
 public void testAlertingReallyWorksWithRestart() throws Exception
@@ -139,8 +155,7 @@
 stopBroker();
 (new FileOutputStream(_logfile)).getChannel().truncate(0);
 startBroker();
-boolean found = wasAlertFired();
-assertTrue("no alert generated in "+_logfile.getAbsolutePath(), found);
+wasAlertFired();
 }
 
 public void testAlertingReallyWorksWithChanges() throws Exception
@@ -158,7 +173,6 @@
 
 // Trigger the new value
 sendMessage(_session, _destination, 3);
-boolean found = wasAlertFired();
-assertTrue("no alert generated in "+_logfile.getAbsolutePath(), found);
+wasAlertFired();
 }
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787248 - in /qpid/trunk/qpid/java: broker/etc/config-systests.xml default.testprofile java.testprofile systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

[aidan]

Author: aidan
Date: Mon Jun 22 14:36:40 2009
New Revision: 787248

URL: http://svn.apache.org/viewvc?rev=787248&view=rev
Log:
Use DerbyMessageStore for config-systests.xml, ensure it's cleaned up

Modified:
qpid/trunk/qpid/java/broker/etc/config-systests.xml
qpid/trunk/qpid/java/default.testprofile
qpid/trunk/qpid/java/java.testprofile

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

Modified: qpid/trunk/qpid/java/broker/etc/config-systests.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config-systests.xml?rev=787248&r1=787247&r2=787248&view=diff
==
--- qpid/trunk/qpid/java/broker/etc/config-systests.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config-systests.xml Mon Jun 22 14:36:40 2009
@@ -95,7 +95,7 @@
 localhost
 
 
-
org.apache.qpid.server.store.MemoryMessageStore
+
org.apache.qpid.server.store.DerbyMessageStore
 
 
 
@@ -109,7 +109,7 @@
 development
 
 
-
org.apache.qpid.server.store.MemoryMessageStore
+
org.apache.qpid.server.store.DerbyMessageStore
 
 
 
@@ -118,7 +118,7 @@
 test
 
 
-
org.apache.qpid.server.store.MemoryMessageStore
+
org.apache.qpid.server.store.DerbyMessageStore
 
 
 

Modified: qpid/trunk/qpid/java/default.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=787248&r1=787247&r2=787248&view=diff
==
--- qpid/trunk/qpid/java/default.testprofile (original)
+++ qpid/trunk/qpid/java/default.testprofile Mon Jun 22 14:36:40 2009
@@ -3,7 +3,7 @@
 
 broker.version=0-8
 broker=vm
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB
+broker.clean=${project.root}/clean-dir ${build.data} 
${project.root}/build/work/derbyDB
 broker.ready=Listening on TCP port
 
 max_prefetch=1000

Modified: qpid/trunk/qpid/java/java.testprofile
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=787248&r1=787247&r2=787248&view=diff
==
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java.testprofile Mon Jun 22 14:36:40 2009
@@ -1,6 +1,6 @@
 broker.language=java
 broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c 
@CONFIG_FILE -l ${project.root}/log4j-test.xml
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
+broker.clean=${project.root}/clean-dir ${build.data} 
${project.root}/build/work/derbyDB 
 broker.ready=Qpid Broker Ready
 
 test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList 
${project.root}/08ExcludeList-nonvm

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787248&r1=787247&r2=787248&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 Mon Jun 22 14:36:40 2009
@@ -22,6 +22,8 @@
 
 import javax.jms.Connection;
 
+import org.apache.qpid.util.FileUtils;
+
 public class FailoverBaseCase extends QpidTestCase
 {
 
@@ -81,6 +83,7 @@
 port = FAILING_PORT;
 }
 stopBroker(port);
+
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 super.tearDown();
 }
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787250 - in /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test: client/QueueBrowserAutoAckTest.java unit/ack/AcknowledgeTest.java

[aidan]

Author: aidan
Date: Mon Jun 22 14:39:08 2009
New Revision: 787250

URL: http://svn.apache.org/viewvc?rev=787250&view=rev
Log:
QPID-1914: make send() transacted so we know the messages got there.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=787250&r1=787249&r2=787250&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 Mon Jun 22 14:39:08 2009
@@ -116,7 +116,7 @@
 {
 producerConnection.start();
 
-Session producerSession = producerConnection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+Session producerSession = producerConnection.createSession(true, 
Session.AUTO_ACKNOWLEDGE);
 
 //Ensure _queue is created
 producerSession.createConsumer(_queue).close();
@@ -129,6 +129,7 @@
 textMsg.setIntProperty(MESSAGE_ID_PROPERTY, messsageID);
 producer.send(textMsg);
 }
+producerSession.commit();
 
 producerConnection.close();
 }

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=787250&r1=787249&r2=787250&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
 Mon Jun 22 14:39:08 2009
@@ -57,22 +57,12 @@
 }
 
private void init(boolean transacted, int mode) throws JMSException {
-   _producerSession = _con.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+   _producerSession = _con.createSession(true, 
Session.AUTO_ACKNOWLEDGE);
 _consumerSession = _con.createSession(transacted, mode);
 _producer = _producerSession.createProducer(_queue);
 _consumerA = _consumerSession.createConsumer(_queue);
}
 
-
-
-private void sendMessages(int totalMessages) throws JMSException
-{
-for (int i = 0; i < totalMessages; i++)
-{
-_producer.send(_producerSession.createTextMessage("message " + i));
-}
-}
-
 /**
  * Produces and consumes messages an either ack or commit the receipt of 
those messages
  *
@@ -83,10 +73,11 @@
 private void testMessageAck(boolean transacted, int mode) throws Exception
 {
init(transacted, mode);
-sendMessages(NUM_MESSAGES/2);
-Thread.sleep(1500);
+sendMessage(_producerSession, _queue, NUM_MESSAGES/2);
+_producerSession.commit();
 MessageConsumer consumerB = _consumerSession.createConsumer(_queue);
-sendMessages(NUM_MESSAGES/2);
+sendMessage(_producerSession, _queue, NUM_MESSAGES/2);
+_producerSession.commit();
 int count = 0;
 Message msg = consumerB.receive(1500);
 while (msg != null) 
@@ -146,7 +137,8 @@
 public void testIndividualAck() throws Exception
 {
 init(false, Session.CLIENT_ACKNOWLEDGE);
-sendMessages(3);
+sendMessage(_producerSession, _queue, 3);
+_producerSession.commit();
 Message msg = null;
 for (int i = 0; i < 2; i++)
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787254 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/store/ systests/src/main/java/org/apache/qpid/test/utils/

[aidan]

Author: aidan
Date: Mon Jun 22 14:41:10 2009
New Revision: 787254

URL: http://svn.apache.org/viewvc?rev=787254&view=rev
Log:
QPID-1924: Make DerbyMessageStore honor $QPID_WORK.

DerbyMessageStore: pick up QPID_WORK
FailoverBaseCase: set QPID_WORK for the second broker
QpidTestCase: pass on QPID_WORK

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=787254&r1=787253&r2=787254&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 Mon Jun 22 14:41:10 2009
@@ -155,7 +155,7 @@
 QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
 
 //Update to pick up QPID_WORK and use that as the default location not 
just derbyDB
-final String databasePath = 
config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY, "derbyDB");
+final String databasePath = 
config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY, 
System.getProperty("QPID_WORK")+"/derbyDB");
 
 File environmentPath = new File(databasePath);
 if (!environmentPath.exists())

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787254&r1=787253&r2=787254&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 Mon Jun 22 14:41:10 2009
@@ -54,6 +54,7 @@
 protected void setUp() throws java.lang.Exception
 {
 super.setUp();
+System.setProperty("QPID_WORK", 
System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 startBroker(getFailingPort());
 }
 

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=787254&r1=787253&r2=787254&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
 Mon Jun 22 14:41:10 2009
@@ -387,7 +387,7 @@
 
 //Add the test name to the broker run.
 env.put("QPID_PNAME", "-DPNAME=\"" + _testName + "\"");
-
+env.put("QPID_WORK", System.getProperty("QPID_WORK"));
 process = pb.start();
 
 Piper p = new Piper(process.getInputStream(),
@@ -469,6 +469,34 @@
 ApplicationRegistry.remove(port);
 }
 }
+
+public void nukeBroker() throws Exception
+{
+nukeBroker(0);
+}
+
+public void nukeBroker(int port) throws Exception
+{
+Process proc = _brokers.get(getPort(port));
+if (proc == null)
+{
+stopBroker(port);
+}
+else
+{
+String command = "pkill -KILL -f "+getBrokerCommand(getPort(port));
+try 
+{
+Runtime.getRuntime().exec(command);
+}
+catch (Exception e)
+{
+// Can't do that, try the old fashioned way
+_logger.warn("Could not run "+command+", killing with 
stopBroker()");
+stopBroker(port);
+}
+}
+}
 
 protected void setSystemProperty(String property, String value)
 {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787266 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java

[aidan]

Author: aidan
Date: Mon Jun 22 15:08:28 2009
New Revision: 787266

URL: http://svn.apache.org/viewvc?rev=787266&view=rev
Log:
QPID-1914 use one queue per test so failures dont spiral

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=787266&r1=787265&r2=787266&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 Mon Jun 22 15:08:28 2009
@@ -53,7 +53,6 @@
 {
 super.setUp();
 
-_queue = (Queue) getInitialContext().lookup("queue");
 
 //Create Client
 _clientConnection = getConnection();
@@ -62,6 +61,8 @@
 
 setupSession();
 
+_queue = _clientSession.createQueue(getName());
+
 //Ensure there are no messages on the queue to start with.
 checkQueueDepth(0);
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787294 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/

[aidan]

Author: aidan
Date: Mon Jun 22 16:01:58 2009
New Revision: 787294

URL: http://svn.apache.org/viewvc?rev=787294&view=rev
Log:
QPID-1914: Create the queue properly

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=787294&r1=787293&r2=787294&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 Mon Jun 22 16:01:58 2009
@@ -62,6 +62,7 @@
 setupSession();
 
 _queue = _clientSession.createQueue(getName());
+_clientSession.createConsumer(_queue).close();
 
 //Ensure there are no messages on the queue to start with.
 checkQueueDepth(0);

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java?rev=787294&r1=787293&r2=787294&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
 Mon Jun 22 16:01:58 2009
@@ -29,9 +29,6 @@
 protected void setupSession() throws Exception
 {
  _clientSession = _clientConnection.createSession(false, 
Session.CLIENT_ACKNOWLEDGE);
-
-//Ensure _queue is created
-_clientSession.createConsumer(_queue).close();
 }
 
 }

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java?rev=787294&r1=787293&r2=787294&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
 Mon Jun 22 16:01:58 2009
@@ -27,8 +27,5 @@
 protected void setupSession() throws Exception
 {
   _clientSession = _clientConnection.createSession(false, 
Session.DUPS_OK_ACKNOWLEDGE);
-
-//Ensure _queue is created
-_clientSession.createConsumer(_queue).close();
 }
 }

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java?rev=787294&r1=787293&r2=787294&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
 Mon Jun 22 16:01:58 2009
@@ -29,8 +29,5 @@
 protected void setupSession() throws Exception
 {
  _clientSession = _clientConnection.createSession(false, 
AMQSession.NO_ACKNOWLEDGE);
-
-//Ensure _queue is created
-_clientSession.createConsumer(_queue).close();
 }
 }

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java?rev=787294&r1=787293&r2=787294&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/t

svn commit: r787623 - in /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client: QueueBrowserAutoAckTest.java failover/FailoverTest.java

[aidan]

Author: aidan
Date: Tue Jun 23 10:13:12 2009
New Revision: 787623

URL: http://svn.apache.org/viewvc?rev=787623&view=rev
Log:
QPID-1935: Use unique queue name per test run. *sigh*.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=787623&r1=787622&r2=787623&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
 Tue Jun 23 10:13:12 2009
@@ -61,7 +61,7 @@
 
 setupSession();
 
-_queue = _clientSession.createQueue(getName());
+_queue = 
_clientSession.createQueue(getName()+System.currentTimeMillis());
 _clientSession.createConsumer(_queue).close();
 
 //Ensure there are no messages on the queue to start with.

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java?rev=787623&r1=787622&r2=787623&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
 Tue Jun 23 10:13:12 2009
@@ -82,9 +82,8 @@
 
 protected void init(boolean transacted, int mode) throws JMSException, 
NamingException
 {
-queue = (Queue) getInitialContext().lookup(QUEUE);
-
 consumerSession = connection.createSession(transacted, mode);
+queue = 
consumerSession.createQueue(getName()+System.currentTimeMillis());
 consumer = consumerSession.createConsumer(queue);
 
 producerSession = connection.createSession(transacted, mode);



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787626 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

[aidan]

Author: aidan
Date: Tue Jun 23 10:47:16 2009
New Revision: 787626

URL: http://svn.apache.org/viewvc?rev=787626&view=rev
Log:
QPID-1935: Clean up brokers before starting them everytime.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787626&r1=787625&r2=787626&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 Tue Jun 23 10:47:16 2009
@@ -54,6 +54,8 @@
 protected void setUp() throws java.lang.Exception
 {
 super.setUp();
+cleanBroker();
+
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 System.setProperty("QPID_WORK", 
System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 startBroker(getFailingPort());
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r787701 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

[aidan]

Author: aidan
Date: Tue Jun 23 15:16:39 2009
New Revision: 787701

URL: http://svn.apache.org/viewvc?rev=787701&view=rev
Log:
QPID-1935: Reset QPID_WORK after modifying it. handy that.

Modified:

qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787701&r1=787700&r2=787701&view=diff
==
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 Tue Jun 23 15:16:39 2009
@@ -33,6 +33,7 @@
 protected int failingPort;
 
 private boolean failedOver = false;
+private String _oldWork;
 
 public FailoverBaseCase()
 {
@@ -56,6 +57,7 @@
 super.setUp();
 cleanBroker();
 
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+_oldWork = System.getProperty("QPID_WORK");
 System.setProperty("QPID_WORK", 
System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 startBroker(getFailingPort());
 }
@@ -76,18 +78,10 @@
 
 public void tearDown() throws Exception
 {
-int port;
-if (_broker.equals(VM))
-{
-port = FAILING_VM_PORT;
-}
-else
-{
-port = FAILING_PORT;
-}
-stopBroker(port);
-
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+stopBroker(getFailingPort());
+System.setProperty("QPID_WORK", _oldWork);
 super.tearDown();
+
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
 }
 
 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org