View | Details | Raw Unified | Return to bug 32771
Collapse All | Expand All

(-)ContextConfig.java (-1 / +1 lines)
Lines 971-977 Link Here
971
971
972
        // Dump the contents of this pipeline if requested
972
        // Dump the contents of this pipeline if requested
973
        if ((log.isDebugEnabled()) && (context instanceof ContainerBase)) {
973
        if ((log.isDebugEnabled()) && (context instanceof ContainerBase)) {
974
            log.debug("Pipline Configuration:");
974
            log.debug("Pipeline Configuration:");
975
            Pipeline pipeline = ((ContainerBase) context).getPipeline();
975
            Pipeline pipeline = ((ContainerBase) context).getPipeline();
976
            Valve valves[] = null;
976
            Valve valves[] = null;
977
            if (pipeline != null)
977
            if (pipeline != null)
(-)HostConfig.java (-3 / +4 lines)
Lines 554-561 Link Here
554
554
555
        // Assume this is a configuration descriptor and deploy it
555
        // Assume this is a configuration descriptor and deploy it
556
        log.debug(sm.getString("hostConfig.deployDescriptor", file));
556
        log.debug(sm.getString("hostConfig.deployDescriptor", file));
557
        Context context = null;
557
        try {
558
        try {
558
            Context context = null;
559
            synchronized (digester) {
559
            synchronized (digester) {
560
                try {
560
                try {
561
                    context = (Context) digester.parse(contextXml);
561
                    context = (Context) digester.parse(contextXml);
Lines 653-660 Link Here
653
            log.error(sm.getString("hostConfig.deployDescriptor.error",
653
            log.error(sm.getString("hostConfig.deployDescriptor.error",
654
                                   file), t);
654
                                   file), t);
655
        }
655
        }
656
656
        if (context != null && host.findChild(context.getName()) != null) {
657
        deployed.put(contextPath, deployedApp);
657
            deployed.put(contextPath, deployedApp);
658
        }
658
    }
659
    }
659
660
660
661
(-)LocalStrings.properties (-1 / +4 lines)
Lines 16-21 Link Here
16
contextConfig.defaultMissing=Missing default web.xml, using application web.xml only
16
contextConfig.defaultMissing=Missing default web.xml, using application web.xml only
17
contextConfig.defaultParse=Parse error in default web.xml
17
contextConfig.defaultParse=Parse error in default web.xml
18
contextConfig.defaultPosition=Occurred at line {0} column {1}
18
contextConfig.defaultPosition=Occurred at line {0} column {1}
19
contextConfig.fixDocBase=Exception fixing docBase: {0} 
20
contextConfig.init=ContextConfig: Initializing
19
contextConfig.missingRealm=No Realm has been configured to authenticate against
21
contextConfig.missingRealm=No Realm has been configured to authenticate against
20
contextConfig.role.auth=WARNING: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
22
contextConfig.role.auth=WARNING: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
21
contextConfig.role.link=WARNING: Security role name {0} used in a <role-link> without being defined in a <security-role>
23
contextConfig.role.link=WARNING: Security role name {0} used in a <role-link> without being defined in a <security-role>
Lines 57-63 Link Here
57
hostConfig.reload=Reloading context [{0}]
59
hostConfig.reload=Reloading context [{0}]
58
hostConfig.removeXML=Context [{0}] is undeployed
60
hostConfig.removeXML=Context [{0}] is undeployed
59
hostConfig.removeDIR=Directory {0} is undeployed
61
hostConfig.removeDIR=Directory {0} is undeployed
60
hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig: Processing START
62
hostConfig.removeWAR=War {0} is undeployed
63
hostConfig.start=HostConfig: Processing START
61
hostConfig.stop=HostConfig: Processing STOP
64
hostConfig.stop=HostConfig: Processing STOP
62
hostConfig.undeploy=Undeploying web application at context path {0}
65
hostConfig.undeploy=Undeploying web application at context path {0}
63
hostConfig.undeploy.error=Error undeploying web application at context path {0}
66
hostConfig.undeploy.error=Error undeploying web application at context path {0}

Return to bug 32771