Index: org/apache/catalina/deploy/ApplicationParameter.java
===================================================================
--- org/apache/catalina/deploy/ApplicationParameter.java	(revision 831814)
+++ org/apache/catalina/deploy/ApplicationParameter.java	(working copy)
@@ -102,7 +102,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ApplicationParameter[");
+        StringBuilder sb = new StringBuilder("ApplicationParameter[");
         sb.append("name=");
         sb.append(name);
         if (description != null) {
Index: org/apache/catalina/deploy/ContextEjb.java
===================================================================
--- org/apache/catalina/deploy/ContextEjb.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextEjb.java	(working copy)
@@ -87,7 +87,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextEjb[");
+        StringBuilder sb = new StringBuilder("ContextEjb[");
         sb.append("name=");
         sb.append(getName());
         if (getDescription() != null) {
Index: org/apache/catalina/deploy/ContextEnvironment.java
===================================================================
--- org/apache/catalina/deploy/ContextEnvironment.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextEnvironment.java	(working copy)
@@ -113,7 +113,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextEnvironment[");
+        StringBuilder sb = new StringBuilder("ContextEnvironment[");
         sb.append("name=");
         sb.append(name);
         if (description != null) {
Index: org/apache/catalina/deploy/ContextHandler.java
===================================================================
--- org/apache/catalina/deploy/ContextHandler.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextHandler.java	(working copy)
@@ -122,7 +122,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextHandler[");
+        StringBuilder sb = new StringBuilder("ContextHandler[");
         sb.append("name=");
         sb.append(getName());
         if (handlerclass != null) {
Index: org/apache/catalina/deploy/ContextLocalEjb.java
===================================================================
--- org/apache/catalina/deploy/ContextLocalEjb.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextLocalEjb.java	(working copy)
@@ -86,7 +86,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextLocalEjb[");
+        StringBuilder sb = new StringBuilder("ContextLocalEjb[");
         sb.append("name=");
         sb.append(getName());
         if (getDescription() != null) {
Index: org/apache/catalina/deploy/ContextResource.java
===================================================================
--- org/apache/catalina/deploy/ContextResource.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextResource.java	(working copy)
@@ -73,7 +73,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextResource[");
+        StringBuilder sb = new StringBuilder("ContextResource[");
         sb.append("name=");
         sb.append(getName());
         if (getDescription() != null) {
Index: org/apache/catalina/deploy/ContextResourceEnvRef.java
===================================================================
--- org/apache/catalina/deploy/ContextResourceEnvRef.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextResourceEnvRef.java	(working copy)
@@ -57,7 +57,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextResourceEnvRef[");
+        StringBuilder sb = new StringBuilder("ContextResourceEnvRef[");
         sb.append("name=");
         sb.append(getName());
         if (getType() != null) {
Index: org/apache/catalina/deploy/ContextService.java
===================================================================
--- org/apache/catalina/deploy/ContextService.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextService.java	(working copy)
@@ -185,7 +185,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ContextService[");
+        StringBuilder sb = new StringBuilder("ContextService[");
         sb.append("name=");
         sb.append(getName());
         if (getDescription() != null) {
Index: org/apache/catalina/deploy/ContextTransaction.java
===================================================================
--- org/apache/catalina/deploy/ContextTransaction.java	(revision 831814)
+++ org/apache/catalina/deploy/ContextTransaction.java	(working copy)
@@ -79,7 +79,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("Transaction[");
+        StringBuilder sb = new StringBuilder("Transaction[");
         sb.append("]");
         return (sb.toString());
 
Index: org/apache/catalina/deploy/ErrorPage.java
===================================================================
--- org/apache/catalina/deploy/ErrorPage.java	(revision 831814)
+++ org/apache/catalina/deploy/ErrorPage.java	(working copy)
@@ -152,7 +152,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ErrorPage[");
+        StringBuilder sb = new StringBuilder("ErrorPage[");
         if (exceptionType == null) {
             sb.append("errorCode=");
             sb.append(errorCode);
Index: org/apache/catalina/deploy/FilterDef.java
===================================================================
--- org/apache/catalina/deploy/FilterDef.java	(revision 831814)
+++ org/apache/catalina/deploy/FilterDef.java	(working copy)
@@ -158,7 +158,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("FilterDef[");
+        StringBuilder sb = new StringBuilder("FilterDef[");
         sb.append("filterName=");
         sb.append(this.filterName);
         sb.append(", filterClass=");
Index: org/apache/catalina/deploy/FilterMap.java
===================================================================
--- org/apache/catalina/deploy/FilterMap.java	(revision 831814)
+++ org/apache/catalina/deploy/FilterMap.java	(working copy)
@@ -229,7 +229,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("FilterMap[");
+        StringBuilder sb = new StringBuilder("FilterMap[");
         sb.append("filterName=");
         sb.append(this.filterName);
         for (int i = 0; i < servletNames.length; i++) {
Index: org/apache/catalina/deploy/LoginConfig.java
===================================================================
--- org/apache/catalina/deploy/LoginConfig.java	(revision 831814)
+++ org/apache/catalina/deploy/LoginConfig.java	(working copy)
@@ -143,7 +143,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("LoginConfig[");
+        StringBuilder sb = new StringBuilder("LoginConfig[");
         sb.append("authMethod=");
         sb.append(authMethod);
         if (realmName != null) {
Index: org/apache/catalina/deploy/MessageDestination.java
===================================================================
--- org/apache/catalina/deploy/MessageDestination.java	(revision 831814)
+++ org/apache/catalina/deploy/MessageDestination.java	(working copy)
@@ -113,7 +113,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("MessageDestination[");
+        StringBuilder sb = new StringBuilder("MessageDestination[");
         sb.append("name=");
         sb.append(name);
         if (displayName != null) {
Index: org/apache/catalina/deploy/MessageDestinationRef.java
===================================================================
--- org/apache/catalina/deploy/MessageDestinationRef.java	(revision 831814)
+++ org/apache/catalina/deploy/MessageDestinationRef.java	(working copy)
@@ -115,7 +115,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("MessageDestination[");
+        StringBuilder sb = new StringBuilder("MessageDestination[");
         sb.append("name=");
         sb.append(name);
         if (link != null) {
Index: org/apache/catalina/deploy/SecurityCollection.java
===================================================================
--- org/apache/catalina/deploy/SecurityCollection.java	(revision 831814)
+++ org/apache/catalina/deploy/SecurityCollection.java	(working copy)
@@ -317,7 +317,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SecurityCollection[");
+        StringBuilder sb = new StringBuilder("SecurityCollection[");
         sb.append(name);
         if (description != null) {
             sb.append(", ");
Index: org/apache/catalina/deploy/SecurityConstraint.java
===================================================================
--- org/apache/catalina/deploy/SecurityConstraint.java	(revision 831814)
+++ org/apache/catalina/deploy/SecurityConstraint.java	(working copy)
@@ -383,7 +383,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SecurityConstraint[");
+        StringBuilder sb = new StringBuilder("SecurityConstraint[");
         for (int i = 0; i < collections.length; i++) {
             if (i > 0)
                 sb.append(", ");
Index: org/apache/catalina/deploy/SecurityRoleRef.java
===================================================================
--- org/apache/catalina/deploy/SecurityRoleRef.java	(revision 831814)
+++ org/apache/catalina/deploy/SecurityRoleRef.java	(working copy)
@@ -72,7 +72,7 @@
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SecurityRoleRef[");
+        StringBuilder sb = new StringBuilder("SecurityRoleRef[");
         sb.append("name=");
         sb.append(name);
         if (link != null) {