Sorry, but can you create a patch from your existing plugins/activemq5
dir, then rename the dir to something like activemq5.save, svn up, edit
the patch file to change the dir names from activemq5 to activemq and
then apply the patch to the renamed dirs? Maybe that will keep you from
a lot of manual edits/merging....
-Donald
David Jencks wrote:
On Dec 9, 2008, at 6:26 AM, Donald Woods wrote:
One of 2 good questions...
The ${activemqString} was put in there by Jencks, so I just kept using
it, but it should probably be removed.
Also, I don't like the renaming to activemq5-* for our modules/cars,
as now both our Samples and user apps will have to be updated to use
the new CAR names....
If there are no objections, I'll delete the old activemq plugins and
rename the activemq5 plugins, so we don't break everyone.
I strongly object. I'm still in the middle of working on this stuff so
even if I don't have any local uncommitted changes your unilateral
renames are going to cost me several hours rearranging my development
environment. I also think that there are good reasons to name the
integration code including the version of the integrated code. I'm not
convinced we will actually be able to get amq 5 into g 2.2 by
mid-january. I think there's value in letting people know which version
of the integrated product they are using. We did this for jetty6 and I
think it works OK. I think the latest actions on this were with jetty6
so the precedent is to use different names for different versions.
Changing this policy IMO ought to be discussed. Finally I think we may
want to support both amq 4 and 5 for 2.2.
What immediate problems was this causing you that you couldn't wait for
discussion? Since when is one hour sufficient time for discussion on a
change of this magnitude?
no thanks
david jencks
-Donald
Jarek Gawor wrote:
If we are switching to activemq5 why do we need this ${activemqString}
substitution?
Jarek
On Mon, Dec 8, 2008 at 6:59 PM, <[EMAIL PROTECTED]> wrote:
Author: djencks
Date: Mon Dec 8 15:59:58 2008
New Revision: 724558
URL: http://svn.apache.org/viewvc?rev=724558&view=rev
Log:
GERONIMO-4337 upgrade to activemq 5.2. Reduced console functionality
Added:
geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/management/ActiveMQTransportConnector.java
(with props)
Modified:
geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/plan/plan.xml
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/AmqJMSMessageHelper.java
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/BaseJMSPortlet.java
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/resources/jms-resource-providers.properties
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
geronimo/server/trunk/plugins/activemq5/activemq5-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
geronimo/server/trunk/plugins/activemq5/activemq5-server/pom.xml
geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
geronimo/server/trunk/plugins/activemq5/geronimo-activemq5/src/main/java/org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java
geronimo/server/trunk/plugins/activemq5/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml