You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2006/12/18 10:11:14 UTC
svn commit: r488163 [1/4] - in
/incubator/qpid/branches/new_persistence/java: ./ broker/ broker/bin/
broker/etc/ broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/exchange/
broker/src/main/java/org/apache/qpid/ser...
Author: rgreig
Date: Mon Dec 18 01:10:59 2006
New Revision: 488163
URL: http://svn.apache.org/viewvc?view=rev&rev=488163
Log:
Merged up to rev 485730 from trunk
Added:
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/publisher/FileMessageFactory.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/example/publisher/FileMessageFactory.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/
- copied from r485730, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/Content.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
incubator/qpid/branches/new_persistence/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/ (props changed)
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/META-INF/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/META-INF/MANIFEST.MF
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/README.txt
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/README.txt
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/bin/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/bin/qpidmc.bat
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.bat
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/bin/qpidmc.sh
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/Thumbs.db
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/Thumbs.db
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/add.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/add.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/delete.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/delete.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/mbean_view.png
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/mbean_view.png
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/notifications.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/notifications.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/qpidConnections.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/qpidmc.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/qpidmc16.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/qpidmc32.bmp
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/qpidmc32.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/reconnect.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/reconnect.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/refresh.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/refresh.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/splash.bmp
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/splash.bmp
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/icons/stop.gif
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/icons/stop.gif
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugin.properties
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugin.properties
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugin.xml
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/com.ibm.icu_3.4.4.1.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/com.ibm.icu_3.4.4.1.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/license.eclipse.txt
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/license.eclipse.txt
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.commands_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.commands_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.contenttype_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.contenttype_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.expressions_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.expressions_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.jobs_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.jobs_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/META-INF/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/META-INF/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/META-INF/MANIFEST.MF
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/META-INF/MANIFEST.MF
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/runtime_registry_compatibility.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0/runtime_registry_compatibility.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.core.runtime_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.equinox.common_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.equinox.common_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.equinox.preferences_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.equinox.preferences_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.equinox.registry_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.equinox.registry_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.help_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.help_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.jface_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.jface_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.osgi_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.osgi_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.swt.win32.win32.x86_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.swt.win32.win32.x86_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.swt_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.swt_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.forms_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.forms_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/META-INF/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/META-INF/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/META-INF/MANIFEST.MF
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/META-INF/MANIFEST.MF
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/compatibility.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench.compatibility_3.2.0/compatibility.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui.workbench_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/plugins/org.eclipse.ui_3.2.0.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/plugins/org.eclipse.ui_3.2.0.jar
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/pom.xml
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/pom.xml
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ICommandIds.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ICommandIds.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/config.ini
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/config.ini
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/.cp/
- copied from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/.cp/
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/.cp/swt-win32-3232.dll
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/configuration/org.eclipse.osgi/bundles/16/1/.cp/swt-win32-3232.dll
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/qpidmc.exe
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmc.exe
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/qpidmc.ini
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmc.ini
incubator/qpid/branches/new_persistence/java/management/eclipse-plugin/src/main/resources/startup.jar
- copied unchanged from r485730, incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar
Removed:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/publisher/MessageFactory.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/test/
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/FieldTableKeyEnumeration.java
Modified:
incubator/qpid/branches/new_persistence/java/broker/bin/qpid-server.bat
incubator/qpid/branches/new_persistence/java/broker/etc/qpid-server.conf
incubator/qpid/branches/new_persistence/java/broker/pom.xml
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/Main.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/security/auth/amqplain/AmqPlainSaslServer.java
incubator/qpid/branches/new_persistence/java/client/pom.xml
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
incubator/qpid/branches/new_persistence/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/publisher/Publisher.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/subscriber/Subscriber.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/framing/FieldTableTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/headers/MessageFactory.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
incubator/qpid/branches/new_persistence/java/cluster/pom.xml
incubator/qpid/branches/new_persistence/java/common/pom.xml
incubator/qpid/branches/new_persistence/java/common/protocol-version.xml
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
incubator/qpid/branches/new_persistence/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
incubator/qpid/branches/new_persistence/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
incubator/qpid/branches/new_persistence/java/pom.xml
incubator/qpid/branches/new_persistence/java/systests/pom.xml
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
Modified: incubator/qpid/branches/new_persistence/java/broker/bin/qpid-server.bat
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/bin/qpid-server.bat?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/bin/qpid-server.bat (original)
+++ incubator/qpid/branches/new_persistence/java/broker/bin/qpid-server.bat Mon Dec 18 01:10:59 2006
@@ -1,17 +1,20 @@
@REM
-@REM Copyright (c) 2006 The Apache Software Foundation
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
@REM
@echo off
@@ -46,8 +49,20 @@
goto exit
:okJavaHome
-set LAUNCH_JAR=%QPID_HOME%\lib\broker-launch.jar
-set MODULE_JARS=%QPID_HOME%\lib\bdbstore-launch.jar
-"%JAVA_HOME%"\bin\java -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%LAUNCH_JAR%;%MODULE_JARS%" org.apache.qpid.server.Main *
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of agruments (up to the command line limit, anyway).
+set QPID_ARGS=%1
+if ""%1""=="""" goto runCommand
+shift
+:loop
+if ""%1""=="""" goto runCommand
+set QPID_ARGS=%QPID_ARGS% %1
+shift
+goto loop
+
+:runCommand
+set LAUNCH_JAR=%QPID_HOME%\lib\qpid-incubating.jar
+set MODULE_JARS=%QPID_MODULE_JARS%
+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%LAUNCH_JAR%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%
:end
Modified: incubator/qpid/branches/new_persistence/java/broker/etc/qpid-server.conf
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/etc/qpid-server.conf?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/etc/qpid-server.conf (original)
+++ incubator/qpid/branches/new_persistence/java/broker/etc/qpid-server.conf Mon Dec 18 01:10:59 2006
@@ -14,7 +14,7 @@
# limitations under the License.
#
-QPID_LIBS=$QPID_HOME/lib/broker-launch.jar:$QPID_HOME/lib/bdbstore-launch.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
export JAVA=java \
JAVA_VM=-server \
Modified: incubator/qpid/branches/new_persistence/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/pom.xml?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/pom.xml (original)
+++ incubator/qpid/branches/new_persistence/java/broker/pom.xml Mon Dec 18 01:10:59 2006
@@ -41,7 +41,6 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-common</artifactId>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -66,7 +65,6 @@
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -76,13 +74,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Mon Dec 18 01:10:59 2006
@@ -89,8 +89,7 @@
private final Map<String, AMQQueue> _consumerTag2QueueMap = new TreeMap<String, AMQQueue>();
private final MessageStore _messageStore;
-
- //private Map<Long, UnacknowledgedMessage> _unacknowledgedMessageMap = new LinkedHashMap<Long, UnacknowledgedMessage>(DEFAULT_PREFETCH);
+
private UnacknowledgedMessageMap _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(DEFAULT_PREFETCH);
private final AtomicBoolean _suspended = new AtomicBoolean(false);
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/Main.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/Main.java Mon Dec 18 01:10:59 2006
@@ -20,25 +20,13 @@
*/
package org.apache.qpid.server;
-import org.apache.qpid.framing.ProtocolVersionList;
-import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.server.protocol.AMQPFastProtocolHandler;
-import org.apache.qpid.server.protocol.AMQPProtocolProvider;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.transport.ConnectorConfiguration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.management.*;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.url.URLSyntaxException;
-import org.apache.commons.cli.*;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;
@@ -48,20 +36,40 @@
import org.apache.mina.common.SimpleByteBufferAllocator;
import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
import org.apache.mina.transport.socket.nio.SocketSessionConfig;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.ProtocolVersionList;
+import org.apache.qpid.pool.ReadWriteThreadModel;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.management.AMQManagedObject;
+import org.apache.qpid.server.management.MBeanConstructor;
+import org.apache.qpid.server.management.MBeanDescription;
+import org.apache.qpid.server.management.ManagedBroker;
+import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.server.protocol.AMQPFastProtocolHandler;
+import org.apache.qpid.server.protocol.AMQPProtocolProvider;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.transport.ConnectorConfiguration;
+import org.apache.qpid.url.URLSyntaxException;
import javax.management.JMException;
import javax.management.MBeanException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
-
+import javax.management.ObjectName;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.util.StringTokenizer;
import java.util.Collection;
import java.util.List;
+import java.util.StringTokenizer;
/**
* Main entry point for AMQPD.
@@ -439,9 +447,9 @@
{
new AMQBrokerManager().register();
}
- catch (NotCompliantMBeanException ex)
+ catch (JMException ex)
{
- throw new AMQException("Exception occured in creating AMQBrokerManager MBean.");
+ throw new AMQException("Exception occured in creating AMQBrokerManager MBean");
}
}
@@ -450,8 +458,7 @@
* Broker level management features like creating and deleting exchanges and queue.
*/
@MBeanDescription("This MBean exposes the broker level management features")
- private final class AMQBrokerManager extends AMQManagedObject
- implements ManagedBroker
+ private final class AMQBrokerManager extends AMQManagedObject implements ManagedBroker
{
private final QueueRegistry _queueRegistry;
private final ExchangeRegistry _exchangeRegistry;
@@ -459,10 +466,9 @@
private final MessageStore _messageStore;
@MBeanConstructor("Creates the Broker Manager MBean")
- protected AMQBrokerManager() throws NotCompliantMBeanException
+ protected AMQBrokerManager() throws JMException
{
super(ManagedBroker.class, ManagedBroker.TYPE);
-
IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
_queueRegistry = appRegistry.getQueueRegistry();
_exchangeRegistry = appRegistry.getExchangeRegistry();
@@ -483,10 +489,7 @@
* @param autoDelete
* @throws JMException
*/
- public void createNewExchange(String exchangeName,
- String type,
- boolean durable,
- boolean autoDelete)
+ public void createNewExchange(String exchangeName, String type, boolean durable, boolean autoDelete)
throws JMException
{
try
@@ -494,14 +497,9 @@
synchronized(_exchangeRegistry)
{
Exchange exchange = _exchangeRegistry.getExchange(exchangeName);
-
if (exchange == null)
{
- exchange = _exchangeFactory.createExchange(exchangeName,
- type, //eg direct
- durable,
- autoDelete,
- 0); //ticket no
+ exchange = _exchangeFactory.createExchange(exchangeName, type, durable, autoDelete, 0);
_exchangeRegistry.registerExchange(exchange);
}
else
@@ -522,8 +520,7 @@
* @param exchangeName
* @throws JMException
*/
- public void unregisterExchange(String exchangeName)
- throws JMException
+ public void unregisterExchange(String exchangeName) throws JMException
{
boolean inUse = false;
// TODO
@@ -550,33 +547,28 @@
* @param autoDelete
* @throws JMException
*/
- public void createQueue(String queueName,
- boolean durable,
- String owner,
- boolean autoDelete)
+ public void createNewQueue(String queueName, boolean durable, String owner, boolean autoDelete)
throws JMException
{
AMQQueue queue = _queueRegistry.getQueue(queueName);
- if (queue == null)
+ if (queue != null)
{
- try
- {
- queue = new AMQQueue(queueName, durable, owner, autoDelete, _queueRegistry);
- if (queue.isDurable() && !queue.isAutoDelete())
- {
- _messageStore.createQueue(queue);
- }
- _queueRegistry.registerQueue(queue);
- }
- catch (AMQException ex)
+ throw new JMException("The queue \"" + queueName + "\" already exists.");
+ }
+
+ try
+ {
+ queue = new AMQQueue(queueName, durable, owner, autoDelete, _queueRegistry);
+ if (queue.isDurable() && !queue.isAutoDelete())
{
- _logger.error("Error in creating queue " + queueName, ex);
- throw new MBeanException(ex, ex.toString());
+ _messageStore.createQueue(queue);
}
+ _queueRegistry.registerQueue(queue);
}
- else
+ catch (AMQException ex)
{
- throw new JMException("The queue \"" + queueName + "\" already exists.");
+ _logger.error("Error in creating queue " + queueName, ex);
+ throw new MBeanException(ex, ex.toString());
}
}
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Mon Dec 18 01:10:59 2006
@@ -25,14 +25,16 @@
import org.apache.qpid.server.management.Managable;
import org.apache.qpid.server.management.ManagedObject;
+import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
public abstract class AbstractExchange implements Exchange, Managable
{
private String _name;
protected boolean _durable;
-
+ protected String _exchangeType;
protected int _ticket;
protected ExchangeMBean _exchangeMbean;
@@ -64,6 +66,11 @@
return _name;
}
+ public String getExchangeType()
+ {
+ return _exchangeType;
+ }
+
public Integer getTicketNo()
{
return _ticket;
@@ -77,6 +84,13 @@
public boolean isAutoDelete()
{
return _autoDelete;
+ }
+
+ public ObjectName getObjectName() throws MalformedObjectNameException
+ {
+ String objNameString = super.getObjectName().toString();
+ objNameString = objNameString + ",ExchangeType=" + _exchangeType;
+ return new ObjectName(objNameString);
}
} // End of MBean class
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java Mon Dec 18 01:10:59 2006
@@ -24,15 +24,14 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.management.MBeanDescription;
import org.apache.qpid.server.management.MBeanConstructor;
+import org.apache.qpid.server.management.MBeanDescription;
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.registry.ApplicationRegistry;
import javax.management.JMException;
import javax.management.MBeanException;
-import javax.management.NotCompliantMBeanException;
import javax.management.openmbean.*;
import java.util.ArrayList;
import java.util.List;
@@ -53,53 +52,36 @@
@MBeanDescription("Management Bean for Direct Exchange")
private final class DestNameExchangeMBean extends ExchangeMBean
{
- private String[] _bindingItemNames = {"BindingKey", "QueueNames"};
- private String[] _bindingItemDescriptions = {"Binding key", "Queue Names"};
- private String[] _bindingItemIndexNames = {"BindingKey"};
+ // open mbean data types for representing exchange bindings
+ private String[] _bindingItemNames = {"Routing Key", "Queue Names"};
+ private String[] _bindingItemIndexNames = {_bindingItemNames[0]};
private OpenType[] _bindingItemTypes = new OpenType[2];
-
private CompositeType _bindingDataType = null;
private TabularType _bindinglistDataType = null;
private TabularDataSupport _bindingList = null;
@MBeanConstructor("Creates an MBean for AMQ direct exchange")
- public DestNameExchangeMBean() throws NotCompliantMBeanException
+ public DestNameExchangeMBean() throws JMException
{
super();
+ _exchangeType = "direct";
init();
}
/**
* initialises the OpenType objects.
*/
- private void init()
+ private void init() throws OpenDataException
{
- try
- {
- _bindingItemTypes[0] = SimpleType.STRING;
- //_bindingItemTypes[1] = ArrayType.getArrayType(SimpleType.STRING);
- _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-
- _bindingDataType = new CompositeType("QueueBinding",
- "Queue and binding keye",
- _bindingItemNames,
- _bindingItemDescriptions,
- _bindingItemTypes);
- _bindinglistDataType = new TabularType("Bindings",
- "List of queues and binding keys",
- _bindingDataType,
- _bindingItemIndexNames);
- }
- catch(OpenDataException ex)
- {
- //It should never occur.
- _logger.error("OpenDataTypes could not be created.", ex);
- throw new RuntimeException(ex);
- }
+ _bindingItemTypes[0] = SimpleType.STRING;
+ _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
+ _bindingDataType = new CompositeType("Exchange Binding", "Routing key and Queue names",
+ _bindingItemNames, _bindingItemNames, _bindingItemTypes);
+ _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
+ _bindingDataType, _bindingItemIndexNames);
}
- public TabularData viewBindings()
- throws OpenDataException
+ public TabularData bindings() throws OpenDataException
{
Map<String, List<AMQQueue>> bindings = _index.getBindingsMap();
_bindingList = new TabularDataSupport(_bindinglistDataType);
@@ -116,20 +98,16 @@
}
Object[] bindingItemValues = {key, queueList.toArray(new String[0])};
- CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
- _bindingItemNames,
- bindingItemValues);
+ CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
_bindingList.put(bindingData);
}
return _bindingList;
}
- public void createBinding(String queueName, String binding)
- throws JMException
+ public void createNewBinding(String queueName, String binding) throws JMException
{
AMQQueue queue = ApplicationRegistry.getInstance().getQueueRegistry().getQueue(queueName);
-
if (queue == null)
{
throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");
@@ -155,10 +133,10 @@
{
return new DestNameExchangeMBean();
}
- catch (NotCompliantMBeanException ex)
+ catch (JMException ex)
{
- _logger.error("Exception occured in creating the DestNameExchenge", ex);
- throw new AMQException("Exception occured in creating the DestNameExchenge", ex);
+ _logger.error("Exception occured in creating the direct exchange mbean", ex);
+ throw new AMQException("Exception occured in creating the direct exchange mbean", ex);
}
}
@@ -172,8 +150,7 @@
}
else
{
- _logger.debug("Binding queue " + queue + " with routing key " + routingKey
- + " to exchange " + this);
+ _logger.debug("Binding queue " + queue + " with routing key " + routingKey + " to exchange " + this);
}
}
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java Mon Dec 18 01:10:59 2006
@@ -22,18 +22,17 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.management.MBeanConstructor;
+import org.apache.qpid.server.management.MBeanDescription;
import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.management.MBeanConstructor;
-import javax.management.openmbean.*;
import javax.management.JMException;
import javax.management.MBeanException;
-import javax.management.NotCompliantMBeanException;
+import javax.management.openmbean.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -53,55 +52,41 @@
@MBeanDescription("Management Bean for Topic Exchange")
private final class DestWildExchangeMBean extends ExchangeMBean
{
- private String[] _bindingItemNames = {"BindingKey", "QueueNames"};
- private String[] _bindingItemDescriptions = {"Binding key", "Queue Names"};
- private String[] _bindingItemIndexNames = {"BindingKey"};
+ // open mbean data types for representing exchange bindings
+ private String[] _bindingItemNames = {"Routing Key", "Queue Names"};
+ private String[] _bindingItemIndexNames = {_bindingItemNames[0]};
private OpenType[] _bindingItemTypes = new OpenType[2];
-
private CompositeType _bindingDataType = null;
private TabularType _bindinglistDataType = null;
private TabularDataSupport _bindingList = null;
@MBeanConstructor("Creates an MBean for AMQ topic exchange")
- public DestWildExchangeMBean() throws NotCompliantMBeanException
+ public DestWildExchangeMBean() throws JMException
{
super();
+ _exchangeType = "topic";
init();
}
/**
* initialises the OpenType objects.
*/
- private void init()
+ private void init() throws OpenDataException
{
- try
- {
- _bindingItemTypes[0] = SimpleType.STRING;
- _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-
- _bindingDataType = new CompositeType("QueueBinding",
- "Queue and binding keye",
- _bindingItemNames,
- _bindingItemDescriptions,
- _bindingItemTypes);
- _bindinglistDataType = new TabularType("Bindings",
- "List of queues and binding keys",
- _bindingDataType,
- _bindingItemIndexNames);
- }
- catch(OpenDataException ex)
- {
- //It should never occur.
- _logger.error("OpenDataTypes could not be created.", ex);
- throw new RuntimeException(ex);
- }
+ _bindingItemTypes[0] = SimpleType.STRING;
+ _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
+ _bindingDataType = new CompositeType("Exchange Binding", "Routing key and Queue names",
+ _bindingItemNames, _bindingItemNames, _bindingItemTypes);
+ _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
+ _bindingDataType, _bindingItemIndexNames);
}
- public TabularData viewBindings()
- throws OpenDataException
+ /**
+ * returns exchange bindings in tabular form
+ */
+ public TabularData bindings() throws OpenDataException
{
_bindingList = new TabularDataSupport(_bindinglistDataType);
-
for (Map.Entry<String, List<AMQQueue>> entry : _routingKey2queues.entrySet())
{
String key = entry.getKey();
@@ -114,20 +99,16 @@
}
Object[] bindingItemValues = {key, queueList.toArray(new String[0])};
- CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
- _bindingItemNames,
- bindingItemValues);
+ CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
_bindingList.put(bindingData);
}
return _bindingList;
}
- public void createBinding(String queueName, String binding)
- throws JMException
+ public void createNewBinding(String queueName, String binding) throws JMException
{
AMQQueue queue = ApplicationRegistry.getInstance().getQueueRegistry().getQueue(queueName);
-
if (queue == null)
throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");
@@ -217,10 +198,10 @@
{
return new DestWildExchangeMBean();
}
- catch (NotCompliantMBeanException ex)
+ catch (JMException ex)
{
- _logger.error("Exception occured in creating the DestWildExchenge", ex);
- throw new AMQException("Exception occured in creating the DestWildExchenge", ex);
+ _logger.error("Exception occured in creating the topic exchenge mbean", ex);
+ throw new AMQException("Exception occured in creating the topic exchenge mbean", ex);
}
}
}
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Mon Dec 18 01:10:59 2006
@@ -25,6 +25,7 @@
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.framing.FieldTableFactory;
import org.apache.qpid.server.management.MBeanConstructor;
import org.apache.qpid.server.management.MBeanDescription;
import org.apache.qpid.server.queue.AMQMessage;
@@ -32,7 +33,6 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import javax.management.JMException;
-import javax.management.NotCompliantMBeanException;
import javax.management.openmbean.*;
import java.util.ArrayList;
import java.util.Iterator;
@@ -80,53 +80,39 @@
@MBeanDescription("Management Bean for Headers Exchange")
private final class HeadersExchangeMBean extends ExchangeMBean
{
- private String[] _bindingItemNames = {"Queue", "HeaderBinding"};
- private String[] _bindingItemDescriptions = {"Queue Name", "Header attribute bindings"};
- private String[] _bindingItemIndexNames = {"HeaderBinding"};
- private OpenType[] _bindingItemTypes = new OpenType[2];
-
+ // open mbean data types for representing exchange bindings
+ private String[] _bindingItemNames = {"S.No.", "Queue Name", "Header Bindings"};
+ private String[] _bindingItemIndexNames = {_bindingItemNames[0]};
+ private OpenType[] _bindingItemTypes = new OpenType[3];
private CompositeType _bindingDataType = null;
private TabularType _bindinglistDataType = null;
private TabularDataSupport _bindingList = null;
@MBeanConstructor("Creates an MBean for AMQ Headers exchange")
- public HeadersExchangeMBean() throws NotCompliantMBeanException
+ public HeadersExchangeMBean() throws JMException
{
super();
+ _exchangeType = "headers";
init();
}
/**
* initialises the OpenType objects.
*/
- private void init()
+ private void init() throws OpenDataException
{
- try
- {
- _bindingItemTypes[0] = SimpleType.STRING;
- _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-
- _bindingDataType = new CompositeType("QueueAndHeaderAttributesBinding",
- "Queue name and header bindings",
- _bindingItemNames,
- _bindingItemDescriptions,
- _bindingItemTypes);
- _bindinglistDataType = new TabularType("HeaderBindings",
- "List of queue bindings for " + getName(),
- _bindingDataType,
- _bindingItemIndexNames);
- }
- catch(OpenDataException ex)
- {
- //It should never occur.
- _logger.error("OpenDataTypes could not be created.", ex);
- throw new RuntimeException(ex);
- }
+ _bindingItemTypes[0] = SimpleType.INTEGER;
+ _bindingItemTypes[1] = SimpleType.STRING;
+ _bindingItemTypes[2] = new ArrayType(1, SimpleType.STRING);
+ _bindingDataType = new CompositeType("Exchange Binding", "Queue name and header bindings",
+ _bindingItemNames, _bindingItemNames, _bindingItemTypes);
+ _bindinglistDataType = new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
+ _bindingDataType, _bindingItemIndexNames);
}
- public TabularData viewBindings()
- throws OpenDataException
+ public TabularData bindings() throws OpenDataException
{
_bindingList = new TabularDataSupport(_bindinglistDataType);
+ int count = 1;
for (Iterator<Registration> itr = _bindings.iterator(); itr.hasNext();)
{
Registration registration = itr.next();
@@ -144,10 +130,8 @@
mappingList.add(key + "=" + value);
}
- Object[] bindingItemValues = {queueName, mappingList.toArray(new String[0])};
- CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
- _bindingItemNames,
- bindingItemValues);
+ Object[] bindingItemValues = {count++, queueName, mappingList.toArray(new String[0])};
+ CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
_bindingList.put(bindingData);
}
@@ -161,8 +145,7 @@
* @param binding
* @throws javax.management.JMException
*/
- public void createBinding(String queueName, String binding)
- throws JMException
+ public void createNewBinding(String queueName, String binding) throws JMException
{
AMQQueue queue = ApplicationRegistry.getInstance().getQueueRegistry().getQueue(queueName);
@@ -172,7 +155,7 @@
}
String[] bindings = binding.split(",");
- FieldTable fieldTable = new FieldTable();
+ FieldTable fieldTable = FieldTableFactory.newFieldTable();
for (int i = 0; i < bindings.length; i++)
{
String[] keyAndValue = bindings[i].split("=");
@@ -240,7 +223,7 @@
{
return new HeadersExchangeMBean();
}
- catch (NotCompliantMBeanException ex)
+ catch (JMException ex)
{
_logger.error("Exception occured in creating the HeadersExchangeMBean", ex);
throw new AMQException("Exception occured in creating the HeadersExchangeMBean", ex);
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java Mon Dec 18 01:10:59 2006
@@ -23,6 +23,7 @@
import org.apache.qpid.server.management.MBeanAttribute;
import org.apache.qpid.server.management.MBeanOperation;
import org.apache.qpid.server.management.MBeanOperationParameter;
+import org.apache.qpid.server.queue.ManagedQueue;
import javax.management.openmbean.TabularData;
import javax.management.JMException;
@@ -44,9 +45,12 @@
* @return the name of the exchange.
* @throws IOException
*/
- @MBeanAttribute(name="Name", description="Name of exchange")
+ @MBeanAttribute(name="Name", description=TYPE + " Name")
String getName() throws IOException;
+ @MBeanAttribute(name="ExchangeType", description="Exchange Type")
+ String getExchangeType() throws IOException;
+
@MBeanAttribute(name="TicketNo", description="Exchange Ticket No")
Integer getTicketNo() throws IOException;
@@ -74,8 +78,8 @@
* @throws IOException
* @throws JMException
*/
- @MBeanOperation(name="viewBindings", description="view the queue bindings for this exchange")
- TabularData viewBindings() throws IOException, JMException;
+ @MBeanOperation(name="bindings", description="view the queue bindings for this exchange")
+ TabularData bindings() throws IOException, JMException;
/**
* Creates new binding with the given queue and binding.
@@ -83,11 +87,11 @@
* @param binding
* @throws JMException
*/
- @MBeanOperation(name="createBinding",
- description="create a new binding with this exchange",
- impact= MBeanOperationInfo.ACTION)
- void createBinding(@MBeanOperationParameter(name="queue name", description="queue name") String queueName,
- @MBeanOperationParameter(name="binding", description="queue binding")String binding)
+ @MBeanOperation(name="createNewBinding",
+ description="create a new binding with this exchange",
+ impact= MBeanOperationInfo.ACTION)
+ void createNewBinding(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue name") String queueName,
+ @MBeanOperationParameter(name="Binding", description="New binding")String binding)
throws JMException;
}
Modified: incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java?view=diff&rev=488163&r1=488162&r2=488163
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java (original)
+++ incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java Mon Dec 18 01:10:59 2006
@@ -21,6 +21,9 @@
package org.apache.qpid.server.management;
+import org.apache.qpid.server.exchange.ManagedExchange;
+import org.apache.qpid.server.queue.ManagedQueue;
+
import javax.management.JMException;
import javax.management.MBeanOperationInfo;
import java.io.IOException;
@@ -45,10 +48,9 @@
* @throws IOException
* @throws JMException
*/
- @MBeanOperation(name="createNewExchange", description="Creates a new Exchange",
- impact= MBeanOperationInfo.ACTION)
+ @MBeanOperation(name="createNewExchange", description="Creates a new Exchange", impact= MBeanOperationInfo.ACTION)
void createNewExchange(@MBeanOperationParameter(name="name", description="Name of the new exchange")String name,
- @MBeanOperationParameter(name="excahnge type", description="Type of the exchange")String type,
+ @MBeanOperationParameter(name="ExchangeType", description="Type of the exchange")String type,
@MBeanOperationParameter(name="durable", description="true if the Exchang should be durable")boolean durable,
@MBeanOperationParameter(name="passive", description="true of the Exchange should be passive")boolean passive)
throws IOException, JMException;
@@ -61,9 +63,9 @@
* @throws JMException
*/
@MBeanOperation(name="unregisterExchange",
- description="Unregisters all the related channels and queuebindings of this exchange",
- impact= MBeanOperationInfo.ACTION)
- void unregisterExchange(@MBeanOperationParameter(name="exchange name", description="Name of the exchange")String exchange)
+ description="Unregisters all the related channels and queuebindings of this exchange",
+ impact= MBeanOperationInfo.ACTION)
+ void unregisterExchange(@MBeanOperationParameter(name= ManagedExchange.TYPE, description="Exchange Name")String exchange)
throws IOException, JMException;
/**
@@ -75,12 +77,11 @@
* @throws IOException
* @throws JMException
*/
- @MBeanOperation(name="createQueue", description="Create a new Queue on the Broker server",
- impact= MBeanOperationInfo.ACTION)
- void createQueue(@MBeanOperationParameter(name="queue name", description="Name of the new queue")String queueName,
- @MBeanOperationParameter(name="durable", description="true if the queue should be durable")boolean durable,
- @MBeanOperationParameter(name="owner", description="Owner name")String owner,
- @MBeanOperationParameter(name="autoDelete", description="true if the queue should be auto delete") boolean autoDelete)
+ @MBeanOperation(name="createNewQueue", description="Create a new Queue on the Broker server", impact= MBeanOperationInfo.ACTION)
+ void createNewQueue(@MBeanOperationParameter(name="queue name", description="Name of the new queue")String queueName,
+ @MBeanOperationParameter(name="durable", description="true if the queue should be durable")boolean durable,
+ @MBeanOperationParameter(name="owner", description="Owner name")String owner,
+ @MBeanOperationParameter(name="autoDelete", description="true if the queue should be auto delete") boolean autoDelete)
throws IOException, JMException;
/**
@@ -93,6 +94,6 @@
@MBeanOperation(name="deleteQueue",
description="Unregisters the Queue bindings, removes the subscriptions and deletes the queue",
impact= MBeanOperationInfo.ACTION)
- void deleteQueue(@MBeanOperationParameter(name="queue name", description="Name of the queue")String queueName)
+ void deleteQueue(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue Name")String queueName)
throws IOException, JMException;
}