← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to script.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:
script.zcml
6
6
    <include file="zopeapp.zcml" />
7
7
    <include package="canonical" />
8
8
 
9
 
    <include files="package-includes/*-meta.zcml" />
10
 
    <includeOverrides file="override-meta.zcml" />
 
9
    <include files="zcml/package-includes/*-meta.zcml" />
 
10
    <includeOverrides file="zcml/override-meta.zcml" />
11
11
 
12
12
    <!-- Add a hook to configure the email stuff using ZCML stored outside
13
13
        of the launchpad tree -->
19
19
        package-includes/*-configure-testing.zcml contain configuration
20
20
        that needs to be different between normal and test modes.
21
21
    -->
22
 
    <include files="package-includes/*-configure.zcml" />
23
 
    <include files="package-includes/*-configure-normal.zcml" />
 
22
    <include files="zcml/package-includes/*-configure.zcml" />
 
23
    <include files="zcml/package-includes/*-configure-normal.zcml" />
24
24
 
25
25
    <!--
26
26
        Overrides are currently disabled. Currently, nothing we
34
34
    <!-- Make sure that the scripts have access to to the error
35
35
         reporting utility.
36
36
    -->
37
 
    <includeOverrides file="override-includes/errorlog-configure.zcml" />
 
37
    <includeOverrides file="zcml/override-includes/errorlog-configure.zcml" />
38
38
</configure>