Include the full comment used on the alternate branch when doing
merges. If I go and look at the history of this file all I see is
"Copying from Trunk" with a Branch_3_0 filter and I have to go
hunt down the other branch change to see the comment.
xxxxxxxxxxxxxxxxxxxxxxxx
Scott Stark
Chief Technology Officer
JBoss Group, LLC
xxxxxxxxxxxxxxxxxxxxxxxx
----- Original Message -----
From: "Larry Sanderson" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, April 17, 2002 6:55 PM
Subject: [JBoss-dev] CVS update: jboss/src/main/org/jboss/web
AbstractWebContainer.java
> User: lsanders
> Date: 02/04/17 18:55:23
>
> Modified: src/main/org/jboss/web Tag: Branch_3_0
> AbstractWebContainer.java
> Log:
> Copying from Trunk
>
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.44.2.1 +5 -1
jboss/src/main/org/jboss/web/AbstractWebContainer.java
>
> Index: AbstractWebContainer.java
> ===================================================================
> RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
> retrieving revision 1.44
> retrieving revision 1.44.2.1
> diff -u -r1.44 -r1.44.2.1
> --- AbstractWebContainer.java 15 Apr 2002 02:48:53 -0000 1.44
> +++ AbstractWebContainer.java 18 Apr 2002 01:55:23 -0000 1.44.2.1
> @@ -159,7 +159,7 @@
> @see org.jboss.security.SecurityAssociation;
>
> @author [EMAIL PROTECTED]
> -@version $Revision: 1.44 $
> +@version $Revision: 1.44.2.1 $
> */
> public abstract class AbstractWebContainer
> extends SubDeployerSupport
> @@ -258,6 +258,10 @@
> {
> log.error("Problem in init ", e); throw new
DeploymentException(e);
> }
> +
> + // invoke super-class initialization
> + processNestedDeployments(di);
> +
> log.debug("End init");
> }
>
>
>
>
>
> _______________________________________________
> Jboss-development mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/jboss-development
>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
