geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim McConnell <tim.mcco...@gmail.com>
Subject Re: XALAN : Re: svn commit: r483346 - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties assemblies/geronimo-boilerplate-minimal/pom.xml
Date Sat, 09 Dec 2006 08:13:21 GMT
HI Vamsi, I'm not sure that comments in the commit would really help since the svk smerge 
only looks at the actual files. What I would suggest is that I attach the synchronization

patch to a JIRA and ask that it be reviewed before it gets committed, and allow a day or 
two for review. Would that work ??

Tim

Vamsavardhana Reddy wrote:
> In the commits to branch\1.2 may be we should indicate in the comment 
> that the commit is meant for branch only.  Will that help prevent those 
> being merged into trunk using SVK?
> 
> --vamsi
> 
> On 12/8/06, *anita kulshreshtha* <a_kulshre@yahoo.com 
> <mailto:a_kulshre@yahoo.com>> wrote:
> 
>        hmm... This change was only meant for the branch. I wonder what else
>     was synched up.. Is there a way to say that a certain change is meant
>     for a branch only, and should not be merged to the trunk?
> 
>     Thanks
>     Anita
> 
>     --- "Christopher M. Cardona" <chris.m.cardona@gmail.com
>     <mailto:chris.m.cardona@gmail.com>> wrote:
> 
>      > Anita,
>      >
>      > This change was made in branches/1.2 and so trunk is being synched
>      > up.
>      >
>      > Best wishes,
>      > chris
>      >
>      > anita kulshreshtha wrote:
>      > > Chris,
>      > >    This commit added xalan to the assembly. Is it intentional?
>      > >
>      > > Thanks
>      > > Anita
>      > >
>      > > --- ccardona@apache.org <mailto:ccardona@apache.org> wrote:
>      > >
>      > >
>      > >> Author: ccardona
>      > >> Date: Wed Dec  6 21:14:16 2006
>      > >> New Revision: 483346
>      > >>
>      > >> URL: http://svn.apache.org/viewvc?view=rev&rev=483346
>     <http://svn.apache.org/viewvc?view=rev&rev=483346>
>      > >> Log:
>      > >> GERONIMO-2633 : SVK synchronization patch for 12-06-2006. Thanks
>      > Tim.
>      > >>
>      > >> Changes:
>      > >>
>      > >>
>      > >
>      >
>     applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-
>     modules.properties:
>      > >
>      > >> – $Rev added
>      > >>
>      > >> assemblies/geronimo-boilerplate-minimal/pom.xml
>      > >> – xalan artifactItem added
>      > >>
>      > >> Modified:
>      > >>
>      > >>
>      > >>
>      > >
>      >
>     geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties
>      > >
>      > >>
>      > >>
>      > geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
>      > >>
>      > >> Modified:
>      > >>
>      > >>
>      > >
>      >
>     geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-
>     modules.properties
>      > >
>      > >> URL:
>      > >>
>      > >>
>      > >
>      >
>     http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties?view=diff&rev=483346&r1=483345&r2=483346
>     <http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties?view=diff&rev=483346&r1=483345&r2=483346>
>      > >
>      > >
>      >
>     ==============================================================================
>      > >
>      > >> ---
>      > >>
>      > >>
>      > >
>      >
>     geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-
>     modules.properties
>      > >
>      > >> (original)
>      > >> +++
>      > >>
>      > >>
>      > >
>      >
>     geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-
>     modules.properties
>      > >
>      > >> Wed Dec  6 21:14:16 2006
>      > >> @@ -14,6 +14,9 @@
>      > >>  #  See the License for the specific language governing
>      > permissions
>      > >> and
>      > >>  #  limitations under the License.
>      > >>
>      > >>
>      > >>
>      > >
>      >
>     #=====================================================================
>      > >
>      > >> +#
>      > >> +# $Rev$ $Date$
>      > >> +#
>      > >>  # SQL realm has special edit logic; don't bother with full list
>      > >>  module.sql.name=Database (SQL) Realm
>      > >>
>      > >>
>      > >>
>      > >
>      >
>     module.sql.class=org.apache.geronimo.security.realm.providers.SQLLoginModule
>      > >
>      > >> Modified:
>      > >>
>      >
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
>      > >> URL:
>      > >>
>      > >>
>      > >
>      >
>     http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=483346&r1=483345&r2=483346
>     <http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=483346&r1=483345&r2=483346>
>      > >
>      > >
>      >
>     ==============================================================================
> 
>      > >
>      > >> ---
>      > >>
>      > geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
>      > >> (original)
>      > >> +++
>      > >>
>      >
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
>      > >> Wed Dec  6 21:14:16 2006
>      > >> @@ -152,6 +152,12 @@
>      > >>                          </goals>
>      > >>                          <configuration>
>      > >>                              <artifactItems>
>      > >> +
>      > >> +                                <artifactItem>
>      > >> +                                    <groupId>xalan</groupId>
>      > >> +
>      > <artifactId>xalan</artifactId>
>      > >> +                                </artifactItem>
>      > >> +
>      > >>                                  <artifactItem>
>      > >>                                      <groupId>xerces</groupId>
>      > >>
>      > >> <artifactId>xercesImpl</artifactId>
>      > >>
>      > >>
>      > >>
>      > >>
>      > >
>      > >
>      > >
>      > >
>      > >
>      >
>     ____________________________________________________________________________________
>      > > Yahoo! Music Unlimited
>      > > Access over 1 million songs.
>      > > http://music.yahoo.com/unlimited
>      > >
>      > >
>      >
>      >
> 
> 
> 
> 
>     ____________________________________________________________________________________
> 
>     Have a burning question?
>     Go to www.Answers.yahoo.com <http://www.Answers.yahoo.com> and get
>     answers from real people who know.
> 
> 

Mime
View raw message