Merge lp:~bac/launchpad/bug-604488 into lp:launchpad

[Brad Crittenden]

Register missing zcml for production.

= Summary =

Refactoring of salesforce proxy code created a new configure.zcml file
that was not registered.

== Proposed fix ==

Add registration information to lib/canonical/configure.zcml

== Pre-implementation notes ==

Talk with Curtis.

== Implementation details ==

As above.

== Tests ==

None, as all testing uses zcml overrides and therefore didn't fail as
they were handled properly.

== Demo and Q/A ==

Visit https://launchpad.net/people/+me/+vouchers.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/canonical/configure.zcml
  lib/lp/services/salesforce/configure.zcml
  lib/lp/services/salesforce/interfaces.py

[Curtis Hovey (sinzui)]

Thanks for identifying the problem. The test you demonstrated from make harness convinced me that this is the correct fix.

review: Approve

=== modified file 'lib/canonical/configure.zcml'
--- lib/canonical/configure.zcml	2010-03-24 15:22:26 +0000
+++ lib/canonical/configure.zcml	2010-07-12 08:41:09 +0000
@@ -22,6 +22,7 @@
     <include package="lp.services.memcache" />
     <include package="lp.services.scripts" />
     <include package="lp.services.worlddata" />
+    <include package="lp.services.salesforce" />
     <include package="lazr.uri" />
     <include package="canonical.librarian" />
 
@@ -75,7 +76,7 @@
          virtual host layers.  The directives come in pairs.
          The separate registration for the resources namespace (@@) is needed
          because otherwise the lookup for /@@/ will fail because the
-         layer-specific defaultView directive also registers the 
+         layer-specific defaultView directive also registers the
          default view name as an unnamed adapter.
          -->
       -->
 
=== modified file 'lib/lp/services/salesforce/configure.zcml'
--- lib/lp/services/salesforce/configure.zcml	2010-07-07 19:41:07 +0000
+++ lib/lp/services/salesforce/configure.zcml	2010-07-12 08:41:09 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
      GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
 
=== modified file 'lib/lp/services/salesforce/interfaces.py'
--- lib/lp/services/salesforce/interfaces.py	2010-07-07 19:41:07 +0000
+++ lib/lp/services/salesforce/interfaces.py	2010-07-12 08:41:09 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213