Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-29 Thread Justin Ross 
Without this, is the windows build broken, or does it just have
useless files hanging around in the windows distribution?

Justin

On Tue, Apr 23, 2013 at 10:36 AM, Alan Conway acon...@redhat.com wrote:
 On 04/18/2013 09:35 AM, Justin Ross wrote:

 Hey, Alan.  It looks like this one was garbled.  Were there other
 things you meant to request?

 Wow, that was garbled! I think this is the only one worth considering:


 commit 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40
 Author: Alan Conway acon...@apache.org
 Commit: Alan Conway acon...@apache.org

 QPID-4733: Fix windows problem introduced by installation of init
 scripts

 Do init script installation conditional on UNIX only.
 SYSCONF_INSTALL_DIR is not set on windows.

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054
 13f79535-47bb-0310-9956-ffa450edef68

 diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
 index f2dbc85..a8aae0e 100644
 --- a/qpid/cpp/etc/CMakeLists.txt
 +++ b/qpid/cpp/etc/CMakeLists.txt
 @@ -17,18 +17,23 @@
  # under the License.
  #

 -# Use automake variable names as these files are also configured by
 automake.
 -set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
 -set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
 -set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
 -
 -configure_file(qpidd.in
 -${CMAKE_CURRENT_BINARY_DIR}/qpidd
 -@ONLY)
 -
 -configure_file(qpidd-primary.in
 -${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
 -@ONLY)
 +if (UNIX)
 +
 +  # Use automake variable names as these files are also configured by
 automake.
 +  # Use absolute paths as these are substituted into init scripts.
 +  set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
 +  set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
 +  set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
 +
 +  configure_file(qpidd.in
 +${CMAKE_CURRENT_BINARY_DIR}/qpidd
 +@ONLY)
 +
 +  configure_file(qpidd-primary.in
 +${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
 +@ONLY)
 +
 +endif (UNIX)

  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd
 ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
 GROUP_EXECUTE WORLD_READ WORLD_EXECUTE


 -
 To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
 For additional commands, e-mail: dev-h...@qpid.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-29 Thread Gordon Sim 

On 04/18/2013 02:32 PM, Justin Ross wrote:

On Thu, Apr 11, 2013 at 9:45 AM, Chuck Rolke cro...@redhat.com wrote:

I think we ought to go ahead with the inclusion based on, as Steve says, our 
push to cmake.


I'm afraid I disagree.  That was our goal, but we missed.  The absence
of the uninstall target can't be considered a critical problem.
Rejected for 0.22.


I think it may be worse than simply the uninstall target not working. It 
looks to me like an autotools based source release can't be built with 
cmake... of course it may be something specific to me.



-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Request for inclusion in 0.22

2013-04-25 Thread Rajith Attapattu 
I would like to include r1475810 http://svn.apache.org/r1475810 in 0.22
The corresponding JIRA (patch attached) is QPID-4714

Rajith

Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-23 Thread Alan Conway 

On 04/18/2013 09:35 AM, Justin Ross wrote:

Hey, Alan.  It looks like this one was garbled.  Were there other
things you meant to request?


Wow, that was garbled! I think this is the only one worth considering:


commit 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40
Author: Alan Conway acon...@apache.org
Commit: Alan Conway acon...@apache.org

QPID-4733: Fix windows problem introduced by installation of init scripts

Do init script installation conditional on UNIX only.
SYSCONF_INSTALL_DIR is not set on windows.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054 
13f79535-47bb-0310-9956-ffa450edef68


diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
index f2dbc85..a8aae0e 100644
--- a/qpid/cpp/etc/CMakeLists.txt
+++ b/qpid/cpp/etc/CMakeLists.txt
@@ -17,18 +17,23 @@
 # under the License.
 #

-# Use automake variable names as these files are also configured by automake.
-set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
-set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
-set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
-
-configure_file(qpidd.in
-${CMAKE_CURRENT_BINARY_DIR}/qpidd
-@ONLY)
-
-configure_file(qpidd-primary.in
-${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
-@ONLY)
+if (UNIX)
+
+  # Use automake variable names as these files are also configured by automake.
+  # Use absolute paths as these are substituted into init scripts.
+  set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR})
+  set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR})
+  set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR})
+
+  configure_file(qpidd.in
+${CMAKE_CURRENT_BINARY_DIR}/qpidd
+@ONLY)
+
+  configure_file(qpidd-primary.in
+${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
+@ONLY)
+
+endif (UNIX)

 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd 
${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
 PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE


-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-18 Thread Justin Ross 
Hey, Alan.  It looks like this one was garbled.  Were there other
things you meant to request?

On Tue, Apr 16, 2013 at 10:35 AM, Alan Conway acon...@redhat.com wrote:
 On 04/11/2013 09:45 AM, Chuck Rolke wrote:

 I think it's across the board but I tried only on Windows. It's only an
 issue in the -cpp tarball, not on the complete kit which works just fine.

 I think we ought to go ahead with the inclusion based on, as Steve says,
 our push to cmake.


 I've been fixing cmake problems on trunk since the initial descision was not
 to include them. Do we want to port these?

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68
 commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
 Author: Robert Gemmell rob...@apache.org
 Commit: Robert Gemmell rob...@apache.org

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68
 commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
 Author: Robert Gemmell rob...@apache.org
 Commit: Robert Gemmell rob...@apache.org

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68
 commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
 Author: Robert Gemmell rob...@apache.org
 Commit: Robert Gemmell rob...@apache.org

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68
 commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
 Author: Robert Gemmell rob...@apache.org
 Commit: Robert Gemmell rob...@apache.org

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68
 commit 6d54493be7259eb7b56e6ea376fcb2959030d97d
 Author: Robert Gemmell rob...@apache.org
 Commit: Robert Gemmell rob...@apache.org

 QPID-4390, QPID-4743: generate ID's randomly at startup, for the broker
 and direct children in the configuration file

 makes ID generation behaviour consistent with that for objects added via
 the management interface

 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467940
 13f79535-47bb-0310-9956-ffa450edef68




 -
 To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
 For additional commands, e-mail: dev-h...@qpid.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-10 Thread Chuck Rolke 
I have a patch in QPID-4729 that really ought to go into 0.22 since without it 
cmake fails.

That said, I'm supplying the patch without actually doing a source tarball 
construction, a subsequent cmake build that produces the unistalll, an install, 
and finally an uninstall that proves it works. On Windows I never do a source 
kit install but just work within a source kit development environment.

Is the cmake uninstall ready for prime time?

-Chuck

-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Request for inclusion in 0.22: QPID-4734

2013-04-10 Thread Andrew Stitcher 
This is a simple build fix which allows the code to build without error
on RHEL6, I think it is very low risk.

Andrew



-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Re: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-10 Thread Justin Ross 
Steve, do you plan to use the uninstall facility?  That went in after
Beta, and subsequently had a couple problems.  I'm inclined to instead
revert the uninstall change, which should also return the cmake build
to working.

Justin

-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

RE: Request for inclusion into 0.22 - cmake-uninstall file not in -cpp source tarball

2013-04-10 Thread Steve Huston 
... but since we are encouraging users to use the cmake build mechanism, the 
uninstall feature may be important to allow more people to try cmake.

 -Original Message-
 From: Steve Huston
 Sent: Wednesday, April 10, 2013 5:14 PM
 To: dev@qpid.apache.org
 Subject: RE: Request for inclusion into 0.22 - cmake-uninstall file not in 
 -cpp
 source tarball
 
 No, I do not plan to use the cmake uninstall feature.
 
  -Original Message-
  From: Justin Ross [mailto:justin.r...@gmail.com]
  Sent: Wednesday, April 10, 2013 4:38 PM
  To: dev@qpid.apache.org
  Subject: Re: Request for inclusion into 0.22 - cmake-uninstall file
  not in -cpp source tarball
 
  Steve, do you plan to use the uninstall facility?  That went in after
  Beta, and subsequently had a couple problems.  I'm inclined to instead
  revert the uninstall change, which should also return the cmake build to
 working.
 
  Justin
 
  -
  To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org For additional
  commands, e-mail: dev-h...@qpid.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

request for inclusion in 0.22 - autodelete queue quota accounting fix

2013-04-03 Thread Chuck Rolke 


- Forwarded Message -
 From: c...@apache.org
 To: comm...@qpid.apache.org
 Sent: Tuesday, April 2, 2013 1:57:00 PM
 Subject: svn commit: r1463649 - /qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
 
 Author: chug
 Date: Tue Apr  2 17:57:00 2013
 New Revision: 1463649
 
 URL: http://svn.apache.org/r1463649
 Log:
 QPID-4692 ACL queue quotas did not count autodelete - patch by Ernie Allen
 
 
 Modified:
 qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
 
 Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
 URL:
 http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1463649r1=1463648r2=1463649view=diff
 ==
 --- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
 +++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Tue Apr  2 17:57:00 2013
 @@ -21,6 +21,7 @@
  
  #include qpid/broker/Queue.h
  #include qpid/broker/Broker.h
 +#include qpid/broker/AclModule.h
  #include qpid/broker/QueueCursor.h
  #include qpid/broker/QueueDepth.h
  #include qpid/broker/QueueSettings.h
 @@ -1170,6 +1171,9 @@ void tryAutoDeleteImpl(Broker broker, Q
  {
  if (broker.getQueues().destroyIf(queue-getName(),
   
 boost::bind(boost::mem_fn(Queue::canAutoDelete),
   queue))) {
 +if (broker.getAcl())
 +broker.getAcl()-recordDestroyQueue(queue-getName());
 +
  QPID_LOG_CAT(debug, model, Auto-delete queue:   queue-getName()
user:  userId
rhost:  connectionId );
 
 
 
 -
 To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
 For additional commands, e-mail: commits-h...@qpid.apache.org
 
 

-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org

Request for inclusion in 0.22 - trivial changes.

2013-04-01 Thread Alan Conway 


r1463146 | QPID-4686: Mention ldconfig in cpp/INSTALL instructions
r1463145 | QPID-4684: Remove obsolete options from example qpidd.conf file.

-
To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org
For additional commands, e-mail: dev-h...@qpid.apache.org