← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to site.zcml

  • Committer: Jonathan Lange
  • Date: 2011-02-18 16:45:16 UTC
  • mto: This revision was merged to the branch mainline in revision 12472.
  • Revision ID: jml@canonical.com-20110218164516-hiqx3ayd2dt4tgfg
Move a lot more zcml into the zcml directory. Fix our 'entry level' files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
site.zcml
16
16
 
17
17
    <include package="canonical" />
18
18
 
19
 
    <include files="package-includes/*-meta.zcml" />
20
 
    <includeOverrides file="override-meta.zcml" />
 
19
    <include files="zcml/package-includes/*-meta.zcml" />
 
20
    <includeOverrides file="zcml/override-meta.zcml" />
21
21
 
22
22
    <!-- package-includes/*-configure.zcml contains package configuration
23
23
        shared between a normal launchpad instance and the test suite.
25
25
        package-includes/*-configure-testing.zcml contain configuration
26
26
        that needs to be different between normal and test modes.
27
27
    -->
28
 
    <include files="package-includes/*-configure.zcml" />
29
 
    <include files="package-includes/*-configure-normal.zcml" />
 
28
    <include files="zcml/package-includes/*-configure.zcml" />
 
29
    <include files="zcml/package-includes/*-configure-normal.zcml" />
30
30
 
31
31
    <!-- Provide local overrides of standard configurations-->
32
 
    <includeOverrides file="override-configure.zcml" />
33
 
    <includeOverrides file="override-configure-normal.zcml" />
 
32
    <includeOverrides file="zcml/override-configure.zcml" />
 
33
    <includeOverrides file="zcml/override-configure-normal.zcml" />
34
34
 
35
35
    <include file="zcml/securitypolicy.zcml" />
36
36