Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Jarek Gawor
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=724558view=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



Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods

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.




-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=724558view=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





Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Jason Dillon
Why do we need 2 sets of activemq modules?  If the new ones work, then  
lets just use them.


--jason


On Dec 9, 2008, at 9:26 PM, 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.




-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=724558view=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






Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Joe Bohn

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.


Sounds good to me.

Joe





-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=724558view=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 











Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods
The old AMQ4 modules just haven't been removed yet (David just made the 
switch to AMQ5 yesterday...)


I'll work on it today.


-Donald


Jason Dillon wrote:
Why do we need 2 sets of activemq modules?  If the new ones work, then 
lets just use them.


--jason


On Dec 9, 2008, at 9:26 PM, 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.




-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=724558view=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 








Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods
Cool.  I have trunk building again with my latest commits (using the 
activemq5-* named modules), so now I'll go remove the old AMQ4 modules 
and rename the AMQ5 ones back to the old names, so we don't break 
Samples and user apps. (And I'll also update the TCK porting files.)



-Donald


Joe Bohn wrote:

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.


Sounds good to me.

Joe





-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=724558view=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 












Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Jason Warner
Donald, you said it build for you?  I get the following error when I try to
build.

org.apache.maven.reactor.MavenExecutionException: Could not find the model
file '/Users/jason/trunk/plugins/activemq5'. for project unknown
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:378)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:292)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
Caused by: org.apache.maven.project.ProjectBuildingException: Could not find
the model file '/Users/jason/trunk/plugins/activemq5'. for project unknown
at
org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1557)
at
org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:504)
at
org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:198)
at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:583)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:461)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:365)
... 11 more
Caused by: java.io.FileNotFoundException:
/Users/jason/trunk/plugins/activemq5 (No such file or directory)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.init(FileInputStream.java:106)
at
hidden.org.codehaus.plexus.util.xml.XmlReader.init(XmlReader.java:123)
at
hidden.org.codehaus.plexus.util.xml.XmlStreamReader.init(XmlStreamReader.java:67)
at
hidden.org.codehaus.plexus.util.ReaderFactory.newXmlReader(ReaderFactory.java:113)
at
org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1552)
... 18 more

Any thoughts?  Is it an error on my part?  It's been that kind of day so
far.  :-P

Thanks!

On Tue, Dec 9, 2008 at 9:59 AM, Donald Woods [EMAIL PROTECTED] wrote:

 Cool.  I have trunk building again with my latest commits (using the
 activemq5-* named modules), so now I'll go remove the old AMQ4 modules and
 rename the AMQ5 ones back to the old names, so we don't break Samples and
 user apps. (And I'll also update the TCK porting files.)


 -Donald



 Joe Bohn wrote:

 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.


 Sounds good to me.

 Joe




 -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=724558view=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



Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods

It was working for about 30 mins (Rev724709 thru 724732).

Looks like you caught it in the middle of the activemq5 -- activemq 
renames after I had the old layout working.  I think all of the renames 
are in as of Rev724760, but my local build is still running...



-Donald



Jason Warner wrote:
Donald, you said it build for you?  I get the following error when I try 
to build.


org.apache.maven.reactor.MavenExecutionException: Could not find the 
model file '/Users/jason/trunk/plugins/activemq5'. for project unknown

at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:378)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:292)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

at java.lang.reflect.Method.invoke(Method.java:585)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
Caused by: org.apache.maven.project.ProjectBuildingException: Could not 
find the model file '/Users/jason/trunk/plugins/activemq5'. for project 
unknown
at 
org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1557)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:504)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:198)

at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:583)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:461)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:365)
... 11 more
Caused by: java.io.FileNotFoundException: 
/Users/jason/trunk/plugins/activemq5 (No such file or directory)

at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.init(FileInputStream.java:106)
at 
hidden.org.codehaus.plexus.util.xml.XmlReader.init(XmlReader.java:123)
at 
hidden.org.codehaus.plexus.util.xml.XmlStreamReader.init(XmlStreamReader.java:67)
at 
hidden.org.codehaus.plexus.util.ReaderFactory.newXmlReader(ReaderFactory.java:113)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1552)

... 18 more

Any thoughts?  Is it an error on my part?  It's been that kind of day so 
far.  :-P


Thanks!

On Tue, Dec 9, 2008 at 9:59 AM, Donald Woods [EMAIL PROTECTED] 
mailto:[EMAIL PROTECTED] wrote:


Cool.  I have trunk building again with my latest commits (using the
activemq5-* named modules), so now I'll go remove the old AMQ4
modules and rename the AMQ5 ones back to the old names, so we don't
break Samples and user apps. (And I'll also update the TCK porting
files.)


-Donald



Joe Bohn wrote:

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.


Sounds good to me.

Joe




-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]
mailto:[EMAIL PROTECTED] wrote:

Author: djencks
Date: Mon Dec  8 15:59:58 2008
New Revision: 724558

URL:
http://svn.apache.org/viewvc?rev=724558view=rev
http://svn.apache.org/viewvc?rev=724558view=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

  

Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Jason Warner
You are correct.  I'm just an eager beaver.  It's building fine now so far.


On Tue, Dec 9, 2008 at 10:43 AM, Donald Woods [EMAIL PROTECTED] wrote:

 It was working for about 30 mins (Rev724709 thru 724732).

 Looks like you caught it in the middle of the activemq5 -- activemq
 renames after I had the old layout working.  I think all of the renames are
 in as of Rev724760, but my local build is still running...


 -Donald



 Jason Warner wrote:

 Donald, you said it build for you?  I get the following error when I try
 to build.

 org.apache.maven.reactor.MavenExecutionException: Could not find the model
 file '/Users/jason/trunk/plugins/activemq5'. for project unknown
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:378)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:292)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at
 org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
 Caused by: org.apache.maven.project.ProjectBuildingException: Could not
 find the model file '/Users/jason/trunk/plugins/activemq5'. for project
 unknown
at
 org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1557)
at
 org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:504)
at
 org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:198)
at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:583)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:461)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:534)
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:365)
... 11 more
 Caused by: java.io.FileNotFoundException:
 /Users/jason/trunk/plugins/activemq5 (No such file or directory)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.init(FileInputStream.java:106)
at
 hidden.org.codehaus.plexus.util.xml.XmlReader.init(XmlReader.java:123)
at
 hidden.org.codehaus.plexus.util.xml.XmlStreamReader.init(XmlStreamReader.java:67)
at
 hidden.org.codehaus.plexus.util.ReaderFactory.newXmlReader(ReaderFactory.java:113)
at
 org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1552)
... 18 more

 Any thoughts?  Is it an error on my part?  It's been that kind of day so
 far.  :-P

 Thanks!

 On Tue, Dec 9, 2008 at 9:59 AM, Donald Woods [EMAIL PROTECTED] mailto:
 [EMAIL PROTECTED] wrote:

Cool.  I have trunk building again with my latest commits (using the
activemq5-* named modules), so now I'll go remove the old AMQ4
modules and rename the AMQ5 ones back to the old names, so we don't
break Samples and user apps. (And I'll also update the TCK porting
files.)


-Donald



Joe Bohn wrote:

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.


Sounds good to me.

Joe




-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]
mailto:[EMAIL PROTECTED] wrote:

Author: djencks
Date: Mon Dec  8 15:59:58 2008
New Revision: 724558

URL:
http://svn.apache.org/viewvc?rev=724558view=rev
http://svn.apache.org/viewvc?rev=724558view=rev
Log:
GERONIMO-4337 upgrade to activemq 5.2.  Reduced
console functionality

Added:

  
 

Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread David Jencks


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=724558view=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






Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods
I don't agree with changing module/config names just to denote we're 
using a newer version of a depend.  It had immediate impacts on 
Daytrader, Samples and any Users' app that had to refer to server 
plugins as a depend, like -


In daytrader/trunk -
daytrader-jetty/pom.xml - artifactIdgeronimo-activemq-ra/artifactId
daytrader-tomcat/pom.xml - artifactIdgeronimo-activemq-ra/artifactId

In samples/trunk -
samples/jms-mdb/jms-mdb-ear/pom.xml - 
artifactIdgeronimo-activemq-ra/artifactId


We could have used an artifactAlias, but that seems like a band-aide for 
something that was easy to avoid and would have required entries for all 
past release and potential 2.1.x future releases in order to not require 
users to update their existing JMS apps before moving to 2.2.



Also, AMQ5 support was agreed upon as required for Geronimo 2.2 months 
ago, so removing the AMQ4 bits just helps force the issue.



-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=724558view=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 

  

Re: svn commit: r724558 - in /geronimo/server/trunk: ./ plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/histo

2008-12-09 Thread Donald Woods
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=724558view=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