You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Allen Gilliland <Al...@Sun.COM> on 2006/01/13 18:07:20 UTC

Re: svn commit: r368584 - in /incubator/roller/trunk: src/org/roller/presentation/tags/menu/NavigationBarTag.java web/WEB-INF/classes/navbar.vm web/WEB-INF/velocity.properties

sorry, i didn't realize that there were macros in there that are used by the themes.  i don't think we need the jsp tag though right?

-- Allen


On Fri, 2006-01-13 at 07:51, David M Johnson wrote:
> Problem with this commit too. I'm using the #showBasicNavBar() on my  
> site and I suspect others (JRoller.com) are as well. I'm going to  
> restore these files.
> 
> - Dave
> 
> 
> On Jan 12, 2006, at 11:32 PM, agilliland@apache.org wrote:
> 
> > Author: agilliland
> > Date: Thu Jan 12 20:31:59 2006
> > New Revision: 368584
> >
> > URL: http://svn.apache.org/viewcvs?rev=368584&view=rev
> > Log:
> > deleting old navbar tag that is no longer used.
> >
> >
> > Removed:
> >     incubator/roller/trunk/src/org/roller/presentation/tags/menu/ 
> > NavigationBarTag.java
> >     incubator/roller/trunk/web/WEB-INF/classes/navbar.vm
> > Modified:
> >     incubator/roller/trunk/web/WEB-INF/velocity.properties
> >
> > Modified: incubator/roller/trunk/web/WEB-INF/velocity.properties
> > URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-
> > INF/velocity.properties?rev=368584&r1=368583&r2=368584&view=diff
> > ====================================================================== 
> > ========
> > --- incubator/roller/trunk/web/WEB-INF/velocity.properties (original)
> > +++ incubator/roller/trunk/web/WEB-INF/velocity.properties Thu Jan  
> > 12 20:31:59 2006
> > @@ -36,7 +36,7 @@
> >  runtime.log.logsystem.log4j.category=org.apache.velocity
> >
> >  # Override the default global library, set to blank to load no  
> > default
> > -velocimacro.library =  
> > roller.vm,bookmark.vm,comments.vm,navbar.vm,newsfeed.vm,referer.vm,ato 
> > mmacros.vm,rssmacros.vm,user.vm,weblog.vm,website.vm
> > +velocimacro.library =  
> > roller.vm,bookmark.vm,comments.vm,newsfeed.vm,referer.vm,atommacros.vm 
> > ,rssmacros.vm,user.vm,weblog.vm,website.vm
> >
> >  # Change to false for deployment environments.
> >  # Caching for the 'class' & 'webapp' ResourceLoaders must be false  
> > for this to work
> > @@ -52,4 +52,4 @@
> >  # set encoding/charset to UTF-8
> >  input.encoding=UTF-8
> >  output.encoding=UTF-8
> > -default.contentType=text/html; charset=utf-8
> > \ No newline at end of file
> > +default.contentType=text/html; charset=utf-8
> >
> 


Re: svn commit: r368584 - in /incubator/roller/trunk: src/org/roller/presentation/tags/menu/NavigationBarTag.java web/WEB-INF/classes/navbar.vm web/WEB-INF/velocity.properties

Posted by David M Johnson <Da...@Sun.COM>.
On Jan 13, 2006, at 12:07 PM, Allen Gilliland wrote:
> sorry, i didn't realize that there were macros in there that are  
> used by the themes.  i don't think we need the jsp tag though right?

Oops. I just restored everything. You are correct. That JSP tag can  
be blown away.

- Dave


>
> -- Allen
>
>
> On Fri, 2006-01-13 at 07:51, David M Johnson wrote:
>> Problem with this commit too. I'm using the #showBasicNavBar() on my
>> site and I suspect others (JRoller.com) are as well. I'm going to
>> restore these files.
>>
>> - Dave
>>
>>
>> On Jan 12, 2006, at 11:32 PM, agilliland@apache.org wrote:
>>
>>> Author: agilliland
>>> Date: Thu Jan 12 20:31:59 2006
>>> New Revision: 368584
>>>
>>> URL: http://svn.apache.org/viewcvs?rev=368584&view=rev
>>> Log:
>>> deleting old navbar tag that is no longer used.
>>>
>>>
>>> Removed:
>>>     incubator/roller/trunk/src/org/roller/presentation/tags/menu/
>>> NavigationBarTag.java
>>>     incubator/roller/trunk/web/WEB-INF/classes/navbar.vm
>>> Modified:
>>>     incubator/roller/trunk/web/WEB-INF/velocity.properties
>>>
>>> Modified: incubator/roller/trunk/web/WEB-INF/velocity.properties
>>> URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-
>>> INF/velocity.properties?rev=368584&r1=368583&r2=368584&view=diff
>>> ==================================================================== 
>>> ==
>>> ========
>>> --- incubator/roller/trunk/web/WEB-INF/velocity.properties  
>>> (original)
>>> +++ incubator/roller/trunk/web/WEB-INF/velocity.properties Thu Jan
>>> 12 20:31:59 2006
>>> @@ -36,7 +36,7 @@
>>>  runtime.log.logsystem.log4j.category=org.apache.velocity
>>>
>>>  # Override the default global library, set to blank to load no
>>> default
>>> -velocimacro.library =
>>> roller.vm,bookmark.vm,comments.vm,navbar.vm,newsfeed.vm,referer.vm,a 
>>> to
>>> mmacros.vm,rssmacros.vm,user.vm,weblog.vm,website.vm
>>> +velocimacro.library =
>>> roller.vm,bookmark.vm,comments.vm,newsfeed.vm,referer.vm,atommacros. 
>>> vm
>>> ,rssmacros.vm,user.vm,weblog.vm,website.vm
>>>
>>>  # Change to false for deployment environments.
>>>  # Caching for the 'class' & 'webapp' ResourceLoaders must be false
>>> for this to work
>>> @@ -52,4 +52,4 @@
>>>  # set encoding/charset to UTF-8
>>>  input.encoding=UTF-8
>>>  output.encoding=UTF-8
>>> -default.contentType=text/html; charset=utf-8
>>> \ No newline at end of file
>>> +default.contentType=text/html; charset=utf-8
>>>
>>


Re: svn commit: r368584 - in /incubator/roller/trunk: src/org/roller/presentation/tags/menu/NavigationBarTag.java web/WEB-INF/classes/navbar.vm web/WEB-INF/velocity.properties

Posted by David M Johnson <Da...@Sun.COM>.
On Jan 13, 2006, at 12:07 PM, Allen Gilliland wrote:
> sorry, i didn't realize that there were macros in there that are  
> used by the themes.  i don't think we need the jsp tag though right?

Oops. I just restored everything. You are correct. That JSP tag can  
be blown away.

- Dave


>
> -- Allen
>
>
> On Fri, 2006-01-13 at 07:51, David M Johnson wrote:
>> Problem with this commit too. I'm using the #showBasicNavBar() on my
>> site and I suspect others (JRoller.com) are as well. I'm going to
>> restore these files.
>>
>> - Dave
>>
>>
>> On Jan 12, 2006, at 11:32 PM, agilliland@apache.org wrote:
>>
>>> Author: agilliland
>>> Date: Thu Jan 12 20:31:59 2006
>>> New Revision: 368584
>>>
>>> URL: http://svn.apache.org/viewcvs?rev=368584&view=rev
>>> Log:
>>> deleting old navbar tag that is no longer used.
>>>
>>>
>>> Removed:
>>>     incubator/roller/trunk/src/org/roller/presentation/tags/menu/
>>> NavigationBarTag.java
>>>     incubator/roller/trunk/web/WEB-INF/classes/navbar.vm
>>> Modified:
>>>     incubator/roller/trunk/web/WEB-INF/velocity.properties
>>>
>>> Modified: incubator/roller/trunk/web/WEB-INF/velocity.properties
>>> URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-
>>> INF/velocity.properties?rev=368584&r1=368583&r2=368584&view=diff
>>> ==================================================================== 
>>> ==
>>> ========
>>> --- incubator/roller/trunk/web/WEB-INF/velocity.properties  
>>> (original)
>>> +++ incubator/roller/trunk/web/WEB-INF/velocity.properties Thu Jan
>>> 12 20:31:59 2006
>>> @@ -36,7 +36,7 @@
>>>  runtime.log.logsystem.log4j.category=org.apache.velocity
>>>
>>>  # Override the default global library, set to blank to load no
>>> default
>>> -velocimacro.library =
>>> roller.vm,bookmark.vm,comments.vm,navbar.vm,newsfeed.vm,referer.vm,a 
>>> to
>>> mmacros.vm,rssmacros.vm,user.vm,weblog.vm,website.vm
>>> +velocimacro.library =
>>> roller.vm,bookmark.vm,comments.vm,newsfeed.vm,referer.vm,atommacros. 
>>> vm
>>> ,rssmacros.vm,user.vm,weblog.vm,website.vm
>>>
>>>  # Change to false for deployment environments.
>>>  # Caching for the 'class' & 'webapp' ResourceLoaders must be false
>>> for this to work
>>> @@ -52,4 +52,4 @@
>>>  # set encoding/charset to UTF-8
>>>  input.encoding=UTF-8
>>>  output.encoding=UTF-8
>>> -default.contentType=text/html; charset=utf-8
>>> \ No newline at end of file
>>> +default.contentType=text/html; charset=utf-8
>>>
>>