You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by "Martin Ritchie (JIRA)" <qp...@incubator.apache.org> on 2009/04/13 13:09:14 UTC
[jira] Created: (QPID-1807) Backout Flow to Disk from 0.5 to allow
more time for testing
Backout Flow to Disk from 0.5 to allow more time for testing
-------------------------------------------------------------
Key: QPID-1807
URL: https://issues.apache.org/jira/browse/QPID-1807
Project: Qpid
Issue Type: Task
Components: Java Broker
Affects Versions: M4, 0.5
Reporter: Martin Ritchie
Fix For: 0.5
>From Aidan's Email the plan is to:
1. copy trunk at a known good revision from before this work started
onto a "newtip"[1] branch
2. use the new 1.5 svn merge tooling to take the good patches from
trunk to newtip
2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
3. move trunk/qpid/java/broker to a holding branch so that the work
isn't lost and can be easily retrieved later
4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
to 0.5-release/qpid/java/broker
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Assigned: (QPID-1807) Backout Flow to Disk from 0.5 to allow
more time for testing
Posted by "Martin Ritchie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-1807?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Martin Ritchie reassigned QPID-1807:
------------------------------------
Assignee: Martin Ritchie
> Backout Flow to Disk from 0.5 to allow more time for testing
> -------------------------------------------------------------
>
> Key: QPID-1807
> URL: https://issues.apache.org/jira/browse/QPID-1807
> Project: Qpid
> Issue Type: Task
> Components: Java Broker
> Affects Versions: M4, 0.5
> Reporter: Martin Ritchie
> Assignee: Martin Ritchie
> Fix For: 0.5
>
>
> From Aidan's Email the plan is to:
> 1. copy trunk at a known good revision from before this work started
> onto a "newtip"[1] branch
> 2. use the new 1.5 svn merge tooling to take the good patches from
> trunk to newtip
> 2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
> 3. move trunk/qpid/java/broker to a holding branch so that the work
> isn't lost and can be easily retrieved later
> 4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
> to 0.5-release/qpid/java/broker
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Commented: (QPID-1807) Backout Flow to Disk from 0.5 to
allow more time for testing
Posted by "Martin Ritchie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-1807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12698372#action_12698372 ]
Martin Ritchie commented on QPID-1807:
--------------------------------------
The merged file do seem to maintain better info on who really did the work. This is the first commit applied to 0.5-fix.
Whilst not perfect adding -g to blame certainly gives more credit to the original author and less to the merging author which is a good thing.
$svn merge -c 742626 ../../../trunk/qpid/
$svn commit
$ svn blame java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java|grep 764412
764412 ritchiem import java.util.Timer;
764412 ritchiem import java.util.TimerTask;
764412 ritchiem
764412 ritchiem import org.apache.qpid.AMQException;
764412 ritchiem import org.apache.qpid.server.configuration.Configurator;
764412 ritchiem import org.apache.qpid.server.queue.AMQQueue;
764412 ritchiem import org.apache.qpid.server.security.access.ACLManager;
764412 ritchiem import org.apache.qpid.server.security.access.Accessable;
764412 ritchiem import org.apache.qpid.server.security.access.plugins.SimpleXML;
764412 ritchiem import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
764412 ritchiem import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
764412 ritchiem private ACLManager _accessManager;
764412 ritchiem _accessManager = ApplicationRegistry.getInstance().getAccessManager();
764412 ritchiem _accessManager.configureHostPlugins(hostConfig);
764412 ritchiem
764412 ritchiem public ACLManager getAccessManager()
$ svn blame -g java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java|grep 764412
764412 ritchiem import java.util.Timer;
764412 ritchiem import java.util.TimerTask;
764412 ritchiem
764412 ritchiem import org.apache.qpid.AMQException;
764412 ritchiem import org.apache.qpid.server.configuration.Configurator;
764412 ritchiem import org.apache.qpid.server.queue.AMQQueue;
> Backout Flow to Disk from 0.5 to allow more time for testing
> -------------------------------------------------------------
>
> Key: QPID-1807
> URL: https://issues.apache.org/jira/browse/QPID-1807
> Project: Qpid
> Issue Type: Task
> Components: Java Broker
> Affects Versions: M4, 0.5
> Reporter: Martin Ritchie
> Assignee: Martin Ritchie
> Fix For: 0.5
>
>
> From Aidan's Email the plan is to:
> 1. copy trunk at a known good revision from before this work started
> onto a "newtip"[1] branch
> 2. use the new 1.5 svn merge tooling to take the good patches from
> trunk to newtip
> 2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
> 3. move trunk/qpid/java/broker to a holding branch so that the work
> isn't lost and can be easily retrieved later
> 4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
> to 0.5-release/qpid/java/broker
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Updated: (QPID-1807) Backout Flow to Disk from 0.5 to allow
more time for testing
Posted by "Martin Ritchie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-1807?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Martin Ritchie updated QPID-1807:
---------------------------------
Status: Ready To Review (was: In Progress)
> Backout Flow to Disk from 0.5 to allow more time for testing
> -------------------------------------------------------------
>
> Key: QPID-1807
> URL: https://issues.apache.org/jira/browse/QPID-1807
> Project: Qpid
> Issue Type: Task
> Components: Java Broker
> Affects Versions: M4, 0.5
> Reporter: Martin Ritchie
> Assignee: Martin Ritchie
> Fix For: 0.5
>
>
> From Aidan's Email the plan is to:
> 1. copy trunk at a known good revision from before this work started
> onto a "newtip"[1] branch
> 2. use the new 1.5 svn merge tooling to take the good patches from
> trunk to newtip
> 2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
> 3. move trunk/qpid/java/broker to a holding branch so that the work
> isn't lost and can be easily retrieved later
> 4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
> to 0.5-release/qpid/java/broker
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Resolved: (QPID-1807) Backout Flow to Disk from 0.5 to allow
more time for testing
Posted by "Martin Ritchie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-1807?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Martin Ritchie resolved QPID-1807.
----------------------------------
Resolution: Fixed
> Backout Flow to Disk from 0.5 to allow more time for testing
> -------------------------------------------------------------
>
> Key: QPID-1807
> URL: https://issues.apache.org/jira/browse/QPID-1807
> Project: Qpid
> Issue Type: Task
> Components: Java Broker
> Affects Versions: M4, 0.5
> Reporter: Martin Ritchie
> Assignee: Martin Ritchie
> Fix For: 0.5
>
>
> From Aidan's Email the plan is to:
> 1. copy trunk at a known good revision from before this work started
> onto a "newtip"[1] branch
> 2. use the new 1.5 svn merge tooling to take the good patches from
> trunk to newtip
> 2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
> 3. move trunk/qpid/java/broker to a holding branch so that the work
> isn't lost and can be easily retrieved later
> 4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
> to 0.5-release/qpid/java/broker
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org