roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r369254 - in /incubator/roller/trunk: sandbox/atomprotocol/src/org/roller/presentation/atomapi/ src/org/roller/presentation/ src/org/roller/presentation/planet/ src/org/roller/presentation/servlets/ src/org/roller/presentation/velocity/ src...
Date Sun, 15 Jan 2006 19:26:45 GMT
Author: agilliland
Date: Sun Jan 15 11:26:04 2006
New Revision: 369254

URL: http://svn.apache.org/viewcvs?rev=369254&view=rev
Log:
refactoring RollerContext.getRollerContext(request) to just RollerContext.getRollerContext().


Modified:
    incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/RollerAtomHandler.java
    incubator/roller/trunk/src/org/roller/presentation/BasePageModel.java
    incubator/roller/trunk/src/org/roller/presentation/MainPageAction.java
    incubator/roller/trunk/src/org/roller/presentation/RollerContext.java
    incubator/roller/trunk/src/org/roller/presentation/planet/PlanetAction.java
    incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java
    incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java
    incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
    incubator/roller/trunk/src/org/roller/presentation/velocity/FoafServlet.java
    incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
    incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
    incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java
    incubator/roller/trunk/web/theme/bannerStatus.jsp
    incubator/roller/trunk/web/theme/footer.jsp
    incubator/roller/trunk/web/theme/footerMain.jsp

Modified: incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/RollerAtomHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/RollerAtomHandler.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/RollerAtomHandler.java
(original)
+++ incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/RollerAtomHandler.java
Sun Jan 15 11:26:04 2006
@@ -100,7 +100,7 @@
     public RollerAtomHandler(HttpServletRequest request) {
         mRequest = request;
         mRoller = RollerFactory.getRoller();
-        mRollerContext = RollerContext.getRollerContext(request);
+        mRollerContext = RollerContext.getRollerContext();
         
         // TODO: decide what to do about authentication, is WSSE going to fly?
         //mUsername = authenticateWSSE(request);

Modified: incubator/roller/trunk/src/org/roller/presentation/BasePageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/BasePageModel.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/BasePageModel.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/BasePageModel.java Sun Jan 15 11:26:04
2006
@@ -63,7 +63,7 @@
     
     public String getBaseURL()
     {
-        RollerContext rctx = RollerContext.getRollerContext(request);
+        RollerContext rctx = RollerContext.getRollerContext();
 		return rctx.getAbsoluteContextUrl(request);
 	}
 

Modified: incubator/roller/trunk/src/org/roller/presentation/MainPageAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/MainPageAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/MainPageAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/MainPageAction.java Sun Jan 15 11:26:04
2006
@@ -37,7 +37,7 @@
             ActionMapping mapping, ActionForm form,
             HttpServletRequest req, HttpServletResponse res)
             throws Exception {
-        RollerContext rctx = RollerContext.getRollerContext(req);
+        RollerContext rctx = RollerContext.getRollerContext();
         
         req.setAttribute("version",rctx.getRollerVersion());
         req.setAttribute("buildTime",rctx.getRollerBuildTime());

Modified: incubator/roller/trunk/src/org/roller/presentation/RollerContext.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/RollerContext.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/RollerContext.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/RollerContext.java Sun Jan 15 11:26:04
2006
@@ -94,14 +94,15 @@
     
     
     /* Returns Roller instance for specified app */
-    public static RollerContext getRollerContext(ServletContext sc) {
+    public static RollerContext getRollerContext(ServletContext scc) {
         // get roller from servlet context
+        ServletContext sc = RollerContext.getServletContext();
         return (RollerContext) sc.getAttribute(ROLLER_CONTEXT);
     }
     
     
     /* Returns Roller instance for specified app */
-    public static RollerContext getRollerContext(HttpServletRequest req) {
+    public static RollerContext getRollerContext() {
         // get roller from servlet context
         ServletContext sc = RollerContext.getServletContext();
         return (RollerContext) sc.getAttribute(ROLLER_CONTEXT);

Modified: incubator/roller/trunk/src/org/roller/presentation/planet/PlanetAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/planet/PlanetAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/planet/PlanetAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/planet/PlanetAction.java Sun Jan 15
11:26:04 2006
@@ -42,7 +42,7 @@
 		HttpServletRequest req, HttpServletResponse res)
 		throws Exception
 	{        
-        RollerContext rctx = RollerContext.getRollerContext(req);		
+        RollerContext rctx = RollerContext.getRollerContext();		
         req.setAttribute("version",rctx.getRollerVersion());
         req.setAttribute("buildTime",rctx.getRollerBuildTime());
         req.setAttribute("baseURL", rctx.getContextUrl(req));

Modified: incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/servlets/CommentServlet.java Sun Jan
15 11:26:04 2006
@@ -273,7 +273,7 @@
                         CommentData cd) 
             throws MalformedURLException {
         
-        RollerContext rc = RollerContext.getRollerContext(request);
+        RollerContext rc = RollerContext.getRollerContext();
         ResourceBundle resources = ResourceBundle.getBundle(
                 "ApplicationResources",LanguageUtil.getViewLocale(request));
 

Modified: incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/servlets/TrackbackServlet.java Sun
Jan 15 11:26:04 2006
@@ -159,7 +159,7 @@
                            "site.trackbackVerification.enabled")) {
                         
                         // ...ensure trackbacker actually links to us
-                        RollerContext rctx= RollerContext.getRollerContext(req);
+                        RollerContext rctx= RollerContext.getRollerContext();
                         String absurl = rctx.getAbsoluteContextUrl();
                         LinkbackExtractor linkback = new LinkbackExtractor(
                             comment.getUrl(), absurl + entry.getPermaLink());

Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java Sun Jan
15 11:26:04 2006
@@ -74,7 +74,7 @@
         mLogger.debug("setupContext( ctx = "+ctx+")");
         
         HttpServletRequest request = rreq.getRequest();
-        RollerContext rollerCtx = RollerContext.getRollerContext( request );
+        RollerContext rollerCtx = RollerContext.getRollerContext( );
         
         try {
             // Add page model object to context

Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/FoafServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/FoafServlet.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/FoafServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/FoafServlet.java Sun Jan 15
11:26:04 2006
@@ -98,7 +98,7 @@
     private void setupContext(Context ctx, RollerRequest rreq) throws RollerException {
         
         HttpServletRequest request = rreq.getRequest();
-        RollerContext rollerCtx = RollerContext.getRollerContext( request );
+        RollerContext rollerCtx = RollerContext.getRollerContext( );
         RollerSession rses = RollerSession.getRollerSession(request);
         Roller roller = RollerFactory.getRoller();
         // ROLLER_2.0 : figure out how to fix FOAF servlet (does anybody use it?)

Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java Sun Jan 15
11:26:04 2006
@@ -90,8 +90,8 @@
         PagePluginManager ppmgr = roller.getPagePluginManager();
         mPagePlugins = ppmgr.createAndInitPagePlugins(
                 mWebsite, 
-                RollerContext.getRollerContext(request).getServletContext(),
-                RollerContext.getRollerContext(request).getAbsoluteContextUrl(),
+                RollerContext.getRollerContext().getServletContext(),
+                RollerContext.getRollerContext().getAbsoluteContextUrl(),
                 mVelocityContext);
     }
    

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
Sun Jan 15 11:26:04 2006
@@ -233,7 +233,7 @@
         try
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(req);
-            String absoluteUrl = RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
+            String absoluteUrl = RollerContext.getRollerContext().getAbsoluteContextUrl(req);
             PingTargetData pingTarget = select(rreq);
             WebsiteData website = rreq.getWebsite();
             try

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
Sun Jan 15 11:26:04 2006
@@ -431,7 +431,7 @@
                 to = (String[])reviewers.toArray(new String[reviewers.size()]);
                 
                 // Figure URL to entry edit page
-                RollerContext rc = RollerContext.getRollerContext(request);
+                RollerContext rc = RollerContext.getRollerContext();
                 String rootURL = rc.getAbsoluteContextUrl(request);
                 if (rootURL == null || rootURL.trim().length()==0)
                 {
@@ -803,7 +803,7 @@
                    request.getParameter(RollerRequest.WEBLOGENTRYID_KEY);
            }
            Roller roller = RollerFactory.getRoller();
-           RollerContext rctx= RollerContext.getRollerContext(request);
+           RollerContext rctx= RollerContext.getRollerContext();
            WeblogManager wmgr= roller.getWeblogManager();
            entry = wmgr.retrieveWeblogEntry(entryid);
 
@@ -814,8 +814,8 @@
                PagePluginManager ppmgr = roller.getPagePluginManager();
                Map plugins = ppmgr.createAndInitPagePlugins( 
                    entry.getWebsite(),
-                   RollerContext.getRollerContext(request).getServletContext(),
-                   RollerContext.getRollerContext(request).getAbsoluteContextUrl(),
+                   RollerContext.getRollerContext().getServletContext(),
+                   RollerContext.getRollerContext().getAbsoluteContextUrl(),
                    new VelocityContext());
                
                WeblogEntryData applied = 

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
Sun Jan 15 11:26:04 2006
@@ -208,8 +208,8 @@
                 PagePluginManager ppmgr = roller.getPagePluginManager();
                 Map plugins = ppmgr.createAndInitPagePlugins(
                     getWebsite(),
-                    RollerContext.getRollerContext(request).getServletContext(),
-                    RollerContext.getRollerContext(request).getAbsoluteContextUrl(),
+                    RollerContext.getRollerContext().getServletContext(),
+                    RollerContext.getRollerContext().getAbsoluteContextUrl(),
                     new VelocityContext());
                 Iterator it = plugins.values().iterator();
                 while (it.hasNext()) list.add(it.next());
@@ -280,7 +280,7 @@
     public String getPermaLink() throws RollerException
     {
         String context = RollerContext
-            .getRollerContext(rollerRequest.getRequest())
+            .getRollerContext()
             .getAbsoluteContextUrl(rollerRequest.getRequest());
         return context + getWeblogEntry().getPermaLink();
     }

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java Sun
Jan 15 11:26:04 2006
@@ -52,7 +52,7 @@
         if (entry.getPlugins() != null) {
             RollerContext rctx = 
                 RollerContext.getRollerContext(
-                    (HttpServletRequest)pageContext.getRequest());
+);
             try {
                 PagePluginManager ppmgr = roller.getPagePluginManager();
                 Map plugins = ppmgr.createAndInitPagePlugins(

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
Sun Jan 15 11:26:04 2006
@@ -122,7 +122,7 @@
         }
         else try
         {
-            RollerContext rollerContext = RollerContext.getRollerContext(request);
+            RollerContext rollerContext = RollerContext.getRollerContext();
             UserData user = 
                 RollerSession.getRollerSession(request).getAuthenticatedUser();
             UserManager mgr = roller.getUserManager(); 
@@ -218,7 +218,7 @@
             throws RollerException
         {
             super("createWebsite.title", request, response, mapping);
-            RollerContext rollerContext = RollerContext.getRollerContext(request);
+            RollerContext rollerContext = RollerContext.getRollerContext();
             Roller roller = RollerFactory.getRoller();
             ThemeManager themeMgr = roller.getThemeManager();
             themes = themeMgr.getEnabledThemesList();

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java
Sun Jan 15 11:26:04 2006
@@ -212,7 +212,7 @@
                 String content;
                 
                 // Figure URL to entry edit page
-                RollerContext rc = RollerContext.getRollerContext(request);
+                RollerContext rc = RollerContext.getRollerContext();
                 String rootURL = rc.getAbsoluteContextUrl(request);
                 if (rootURL == null || rootURL.trim().length()==0)
                 {

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
Sun Jan 15 11:26:04 2006
@@ -326,8 +326,8 @@
                     PagePluginManager ppmgr = roller.getPagePluginManager();
                     Map plugins = ppmgr.createAndInitPagePlugins(
                             getWebsite(),
-                            RollerContext.getRollerContext(request).getServletContext(),
-                            RollerContext.getRollerContext(request).getAbsoluteContextUrl(),
+                            RollerContext.getRollerContext().getServletContext(),
+                            RollerContext.getRollerContext().getAbsoluteContextUrl(),
                             new VelocityContext());
                     Iterator it = plugins.values().iterator();
                     while (it.hasNext()) list.add(it.next());

Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java Sun Jan
15 11:26:04 2006
@@ -118,7 +118,7 @@
             {    
                 // are passwords encrypted?
                 RollerContext rollerContext = 
-                    RollerContext.getRollerContext(rreq.getRequest());
+                    RollerContext.getRollerContext();
                 String encrypted = 
                         RollerConfig.getProperty("passwds.encryption.enabled");
                 //System.out.print("password was [" + password + "] ");
@@ -193,7 +193,7 @@
             {    
                 // are passwords encrypted?
                 RollerContext rollerContext = 
-                    RollerContext.getRollerContext(rreq.getRequest());
+                    RollerContext.getRollerContext();
                 String encrypted = 
                         RollerConfig.getProperty("passwds.encryption.enabled");
                 //System.out.print("password was [" + password + "] ");

Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java Sun Jan
15 11:26:04 2006
@@ -243,7 +243,7 @@
             RollerRequest rreq = RollerRequest.getRollerRequest();
             HttpServletRequest req = rreq.getRequest();
             String contextUrl =
-                RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
+                RollerContext.getRollerContext().getAbsoluteContextUrl(req);
             
             // populates user information to return as a result
             Hashtable result = new Hashtable();
@@ -290,7 +290,7 @@
                 RollerRequest rreq = RollerRequest.getRollerRequest();
                 HttpServletRequest req = rreq.getRequest();
                 String contextUrl =
-                    RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
+                    RollerContext.getRollerContext().getAbsoluteContextUrl(req);
                 
                 UserManager umgr = RollerFactory.getRoller().getUserManager();
                 UserData user = umgr.getUser(userid);

Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java Sun
Jan 15 11:26:04 2006
@@ -450,7 +450,7 @@
     {       
         RollerRequest rreq = RollerRequest.getRollerRequest();
         HttpServletRequest request = rreq.getRequest();
-        RollerContext rollerCtx = RollerContext.getRollerContext(request);
+        RollerContext rollerCtx = RollerContext.getRollerContext();
         String permalink = 
             rollerCtx.getAbsoluteContextUrl(request) + entry.getPermaLink();
         
@@ -480,7 +480,7 @@
     {
         RollerRequest rreq = RollerRequest.getRollerRequest();
         HttpServletRequest req = rreq.getRequest();
-        String contextUrl = RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
+        String contextUrl = RollerContext.getRollerContext().getAbsoluteContextUrl(req);
 
         Hashtable struct = new Hashtable();
         struct.put("description", category.getPath());

Modified: incubator/roller/trunk/web/theme/bannerStatus.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/bannerStatus.jsp?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/bannerStatus.jsp (original)
+++ incubator/roller/trunk/web/theme/bannerStatus.jsp Sun Jan 15 11:26:04 2006
@@ -1,6 +1,6 @@
 <%@ include file="/taglibs.jsp" %>
 <%
-RollerContext rctx = RollerContext.getRollerContext(request);
+RollerContext rctx = RollerContext.getRollerContext();
 RollerSession rollerSession = RollerSession.getRollerSession(request);
 RollerRequest rreq = RollerRequest.getRollerRequest(request);
 UserData user = rollerSession.getAuthenticatedUser();

Modified: incubator/roller/trunk/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/footer.jsp?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/footer.jsp (original)
+++ incubator/roller/trunk/web/theme/footer.jsp Sun Jan 15 11:26:04 2006
@@ -1,7 +1,7 @@
 <%@ include file="/taglibs.jsp" %>
 
 Powered by <a href="http://www.rollerweblogger.org">Roller Weblogger</a> 
-<%= RollerContext.getRollerContext(request).getRollerVersion() %> |
+<%= RollerContext.getRollerContext().getRollerVersion() %> |
 
 <a href="http://opensource2.atlassian.com/projects/roller/">
     <fmt:message key="footer.reportIssue" /></a> | 

Modified: incubator/roller/trunk/web/theme/footerMain.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/footerMain.jsp?rev=369254&r1=369253&r2=369254&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/footerMain.jsp (original)
+++ incubator/roller/trunk/web/theme/footerMain.jsp Sun Jan 15 11:26:04 2006
@@ -2,7 +2,7 @@
 
 <div style="border-top: 1px solid grey">
     Powered by <a href="http://www.rollerweblogger.org/">Roller Weblogger</a>

-    Version: <%= RollerContext.getRollerContext(request).getRollerVersion() %>
+    Version: <%= RollerContext.getRollerContext().getRollerVersion() %>
 </div>
 
 



Mime
View raw message