incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Glen Mazza <glen.ma...@gmail.com>
Subject Re: svn commit: r1470319 - in /incubator/jspwiki/trunk: ChangeLog src/org/apache/wiki/Release.java src/org/apache/wiki/util/UtilJ2eeCompat.java tests/org/apache/wiki/util/UtilJ2eeCompatTest.java
Date Mon, 22 Apr 2013 21:16:31 GMT
Hi Juan Pablo, I've been out of town (visiting family) and haven't had 
much time to devote to JSPWiki, so unfortunately no further 
pom.xml/standardization improvements in trunk from me yet.  Hopefully it 
will pick up again in a few days, of course others that have time are 
welcome to jump in as well.

I'm not sure what you mean by "commit dependencyMngmt section + 
2.9.1-incubating-1" -- do you mean to trunk or MVN3_Branch? If you're 
comfortable putting more of the Maven config into trunk, go ahead.  I 
don't care what is done to MVN3_Branch, that's your scratchpad to do as 
you please.  The problem with making MVN3_Branch the future trunk branch 
IMO is that it will still take a long time before we're ready to be off 
Ant; therefore we'll end up needing to maintain two separate branches 
for that long time, slowing us down and hampering rather than helping 
Mavenization (but if you don't think so, please advise--you're doing 
most of this right now, not me.)  As I see it, if there's a change in 
trunk that would alter the poms in MVN3_Branch (for example, a new 
dependency being used), go ahead and commit the change to MVN3_Branch.  
But if we were to make a UI design change, that wouldn't effect the 
poms, so I would ignore that on your branch and instead concentrate on 
creating poms that can be used in trunk.

I'd recommend holding off on more releases, seeing as the last one 
failed and the release process is more of a time-consuming political 
matter more than an architectural one.  But just my $0.02 on that point.

Glen

On 04/21/2013 05:40 PM, Juan Pablo Santos Rodríguez wrote:
> well I was just about to say the opposite O:-) so once we have the mvn
> config in place we could cleanly switch from one to another; I was about to
> commit the dependencyMngmt section + 2.9.1-incubating-1 changes.
>
> OTOH, what you say makes sense, + the mvn config is almost over (after the
> dependencyManagement commit, that is): the folder structure isn't going to
> change much more and, the parent pom isn't going to change that much..
>
> So what about
> - commit dependencyMngmt section + 2.9.1-incubating-1 (because it's a
> little less effort for me committing them than reverting O:-))
> - (try to, again,) tag and release current trunk, aka 2.9.1
> - move MVN3_Branch structure into trunk
> ?
>
> br,
> juan pablo
>
>
> On Sun, Apr 21, 2013 at 11:12 PM, Glen Mazza <glen.mazza@gmail.com> wrote:
>
>> I would hope not; as I understand that branch is just a scratchpad for how
>> to figure out to best create the parent POM, submodule POMs, etc.  Once
>> figured out, then the poms move to JSPWiki trunk.  Indeed the JSPWiki
>> webapp on MVN3_Branch might as well just be a simple "Hello World" webapp;
>> it's the folder structure and the POMs, not the webapp itself, that's of
>> importance.
>>
>> Glen
>>
>>
>> On 04/21/2013 12:44 PM, Harry Metske wrote:
>>
>>> Should we apply all patches to the MVN3_BRANCH too ?
>>>
>>> regards,
>>> Harry
>>>
>>>
>>> On 21 April 2013 18:39,  <metskem@apache.org> wrote:
>>>
>>>> Author: metskem
>>>> Date: Sun Apr 21 16:39:21 2013
>>>> New Revision: 1470319
>>>>
>>>> URL: http://svn.apache.org/r1470319
>>>> Log:
>>>>          * 2.9.1-incubating-1
>>>>
>>>>          * fixed JSPWIKI-396): UTF-8 characters in wiki pages incorrectly
>>>> rendered if served by Tomcat
>>>>
>>>> Modified:
>>>>       incubator/jspwiki/trunk/**ChangeLog
>>>>       incubator/jspwiki/trunk/src/**org/apache/wiki/Release.java
>>>>       incubator/jspwiki/trunk/src/**org/apache/wiki/util/**
>>>> UtilJ2eeCompat.java
>>>>       incubator/jspwiki/trunk/tests/**org/apache/wiki/util/**
>>>> UtilJ2eeCompatTest.java
>>>>
>>>> Modified: incubator/jspwiki/trunk/**ChangeLog
>>>> URL: http://svn.apache.org/viewvc/**incubator/jspwiki/trunk/**
>>>> ChangeLog?rev=1470319&r1=**1470318&r2=1470319&view=diff<http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1470319&r1=1470318&r2=1470319&view=diff>
>>>> ==============================**==============================**
>>>> ==================
>>>> --- incubator/jspwiki/trunk/**ChangeLog (original)
>>>> +++ incubator/jspwiki/trunk/**ChangeLog Sun Apr 21 16:39:21 2013
>>>> @@ -1,3 +1,9 @@
>>>> +2013-04-21  Harry Metske <metskem@apache.org>
>>>> +
>>>> +       * 2.9.1-incubating-1
>>>> +
>>>> +       * fixed JSPWIKI-396): UTF-8 characters in wiki pages incorrectly
>>>> rendered if served by Tomcat
>>>> +
>>>>    2013-04-14 Glen Mazza (glenmazza AT apache DOT org)
>>>>
>>>>           * Start of Selenium plugin (just testing prior to it moving
>>>> into its own module)
>>>>
>>>> Modified: incubator/jspwiki/trunk/src/**org/apache/wiki/Release.java
>>>> URL: http://svn.apache.org/viewvc/**incubator/jspwiki/trunk/src/**
>>>> org/apache/wiki/Release.java?**rev=1470319&r1=1470318&r2=**
>>>> 1470319&view=diff<http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1470319&r1=1470318&r2=1470319&view=diff>
>>>> ==============================**==============================**
>>>> ==================
>>>> --- incubator/jspwiki/trunk/src/**org/apache/wiki/Release.java
>>>> (original)
>>>> +++ incubator/jspwiki/trunk/src/**org/apache/wiki/Release.java Sun Apr
>>>> 21 16:39:21 2013
>>>> @@ -75,7 +75,7 @@ public final class Release
>>>>         *  <p>
>>>>         *  If the build identifier is empty, it is not added.
>>>>         */
>>>> -    public static final String     BUILD         = "0";
>>>> +    public static final String     BUILD         = "1";
>>>>
>>>>        /**
>>>>         *  This is the generic version string you should use
>>>>
>>>> Modified: incubator/jspwiki/trunk/src/**org/apache/wiki/util/**
>>>> UtilJ2eeCompat.java
>>>> URL: http://svn.apache.org/viewvc/**incubator/jspwiki/trunk/src/**
>>>> org/apache/wiki/util/**UtilJ2eeCompat.java?rev=**
>>>> 1470319&r1=1470318&r2=1470319&**view=diff<http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/UtilJ2eeCompat.java?rev=1470319&r1=1470318&r2=1470319&view=diff>
>>>> ==============================**==============================**
>>>> ==================
>>>> --- incubator/jspwiki/trunk/src/**org/apache/wiki/util/**UtilJ2eeCompat.java
>>>> (original)
>>>> +++ incubator/jspwiki/trunk/src/**org/apache/wiki/util/**UtilJ2eeCompat.java
>>>> Sun Apr 21 16:39:21 2013
>>>> @@ -111,6 +111,8 @@ public class UtilJ2eeCompat
>>>>            else if( serverInfo.indexOf( TOMCAT ) >= 0 )
>>>>            {
>>>>                log.info( TOMCAT + " detected" );
>>>> +            // use response.getOutputStream instead of
>>>> response.getWriter
>>>> +            useStream = true;
>>>>            }
>>>>            else if( serverInfo.indexOf( JRUN ) >= 0 )
>>>>            {
>>>>
>>>> Modified: incubator/jspwiki/trunk/tests/**org/apache/wiki/util/**
>>>> UtilJ2eeCompatTest.java
>>>> URL: http://svn.apache.org/viewvc/**incubator/jspwiki/trunk/tests/**
>>>> org/apache/wiki/util/**UtilJ2eeCompatTest.java?rev=**
>>>> 1470319&r1=1470318&r2=1470319&**view=diff<http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java?rev=1470319&r1=1470318&r2=1470319&view=diff>
>>>> ==============================**==============================**
>>>> ==================
>>>> --- incubator/jspwiki/trunk/tests/**org/apache/wiki/util/**UtilJ2eeCompatTest.java
>>>> (original)
>>>> +++ incubator/jspwiki/trunk/tests/**org/apache/wiki/util/**UtilJ2eeCompatTest.java
>>>> Sun Apr 21 16:39:21 2013
>>>> @@ -35,7 +35,7 @@ public class UtilJ2eeCompatTest extends
>>>>        {
>>>>            assertTrue( UtilJ2eeCompat.**useOutputStream( "Oracle
>>>> Containers for J2EE 10g(10.1.3.1.0 )", true ) );
>>>>            // Do not reinitialize
>>>> -        assertTrue( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/5.5.20" ) );
>>>> +        assertTrue( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/7.0.39" ) );
>>>>            // Do not reinitialize
>>>>            assertTrue( UtilJ2eeCompat.**useOutputStream( "Sun Java
>>>> System Application Server 9.1_02" ) );
>>>>        }
>>>> @@ -49,9 +49,9 @@ public class UtilJ2eeCompatTest extends
>>>>
>>>>        public void testTomcat()
>>>>        {
>>>> -        assertFalse( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/5.5.20", true ) );
>>>> +        assertTrue( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/7.0.39", true ) );
>>>>            // Reinitialize
>>>> -        assertFalse( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/5.5.20", true ) );
>>>> +        assertTrue( UtilJ2eeCompat.**useOutputStream( "Apache
>>>> Tomcat/7.0.39", true ) );
>>>>        }
>>>>
>>>>        public static Test suite()
>>>>
>>>>
>>>>


Mime
View raw message