svn commit: r1306514 - in /incubator/wookie/trunk/src/org/apache/wookie/controller: Controller.java WidgetsController.java

[scottbw]

Author: scottbw
Date: Wed Mar 28 17:54:08 2012
New Revision: 1306514

URL: http://svn.apache.org/viewvc?rev=1306514&view=rev
Log:
Fixed an issue with the Widgets controller using a legacy "getLocalPath" method 
to prepend to icon URLs rather than the newer method that lets configuration 
properties (e.g. for virtual hosts) override the default request 
scheme/host/port. Thanks to Jasha for spotting this one.

Modified:
    incubator/wookie/trunk/src/org/apache/wookie/controller/Controller.java
    
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/controller/Controller.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/Controller.java?rev=1306514&r1=1306513&r2=1306514&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/controller/Controller.java 
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/controller/Controller.java Wed 
Mar 28 17:54:08 2012
@@ -236,23 +236,6 @@ public abstract class Controller extends
                        return false;
                }
        }
-
-       /**
-        * Get local path for server, for example to prepend
-        * onto icon URLs
-        * 
-        * @param request the request
-        * @return a string containing the local path
-        */
-       protected String getLocalPath(HttpServletRequest request){
-               try {
-                       URL path = new URL(request.getScheme(), 
request.getServerName(), request.getServerPort(),"");
-                       return path.toString();
-               } catch (MalformedURLException e) {
-                       e.printStackTrace();
-                       return null;
-               }
-       }
        
        /**
         * Send XML back to client

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java?rev=1306514&r1=1306513&r2=1306514&view=diff
==============================================================================
--- 
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java 
(original)
+++ 
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java 
Wed Mar 28 17:54:08 2012
@@ -119,9 +119,9 @@ public class WidgetsController extends C
       throw new ResourceNotFoundException();
 
     switch (format(request)) {
-    case 
XML:returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widget,getLocalPath(request),
 getLocales(request)), response);break;
+    case 
XML:returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widget,getWookieServerURL(request,
 "").toString(), getLocales(request)), response);break;
     case WIDGET:returnWidget(widget, response);break;
-    
default:returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widget,getLocalPath(request),
 getLocales(request)), response);
+    
default:returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widget,getWookieServerURL(request,
 "").toString(), getLocales(request)), response);
     }
   }
 
@@ -165,7 +165,7 @@ public class WidgetsController extends C
 
     IPersistenceManager persistenceManager = 
PersistenceManagerFactory.getPersistenceManager();
     IWidget[] widgets = persistenceManager.findAll(IWidget.class);
-               returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widgets, 
getLocalPath(request), getLocales(request)),response);
+               returnXml(WidgetAdvertHelper.createXMLWidgetsDocument(widgets, 
getWookieServerURL(request, "").toString(), getLocales(request)),response);
        }
        
   /* (non-Javadoc)
@@ -272,7 +272,7 @@ public class WidgetsController extends C
           // A new widget was created, so return 201
           //
           WidgetFactory.addNewWidget(widgetModel, zipFile,false);
-          returnXml(WidgetImportHelper.createXMLWidgetDocument(widgetModel, 
new File(fac.getUnzippedWidgetDirectory(), "config.xml"), 
getLocalPath(request), true), response);
+          returnXml(WidgetImportHelper.createXMLWidgetDocument(widgetModel, 
new File(fac.getUnzippedWidgetDirectory(), "config.xml"), 
getWookieServerURL(request, "").toString(), true), response);
           return true;
           
         } else {
@@ -282,7 +282,7 @@ public class WidgetsController extends C
           // and return 200
           //
           
WidgetFactory.update(widgetModel,persistenceManager.findWidgetByGuid(widgetModel.getIdentifier()),false,
 zipFile);
-          returnXml(WidgetImportHelper.createXMLWidgetDocument(widgetModel, 
new File(fac.getUnzippedWidgetDirectory(), "config.xml"), 
getLocalPath(request), true), response);
+          returnXml(WidgetImportHelper.createXMLWidgetDocument(widgetModel, 
new File(fac.getUnzippedWidgetDirectory(), "config.xml"), 
getWookieServerURL(request, "").toString(), true), response);
           return false;
           
         }