You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2005/08/04 19:18:27 UTC
svn commit: r227438 - in /portals/jetspeed-2/trunk/applications/pam/src:
java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
webapp/WEB-INF/view/pemp/browser_view.vm webapp/javascript/ajax.js
Author: weaver
Date: Thu Aug 4 10:18:23 2005
New Revision: 227438
URL: http://svn.apache.org/viewcvs?rev=227438&view=rev
Log:
fix for issue JS@-323 hard coding of "/jetspeed" path in ajax scripts. http://issues.apache.org/jira/browse/JS2-323.
Modified:
portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/browser_view.vm
portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/ajax.js
Modified: portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java?rev=227438&r1=227437&r2=227438&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java Thu Aug 4 10:18:23 2005
@@ -12,9 +12,11 @@
import javax.portlet.RenderResponse;
import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
@@ -45,6 +47,8 @@
context.put("portletApps", portletApps);
context.put("entityAccess", entityAccess);
context.put("portletContext", getPortletContext());
+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ context.put("jetspeedContextPath", requestContext.getRequest().getContextPath());
super.doView(request, response);
}
Modified: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/browser_view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/browser_view.vm?rev=227438&r1=227437&r2=227438&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/browser_view.vm (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/browser_view.vm Thu Aug 4 10:18:23 2005
@@ -5,6 +5,7 @@
<script language="javascript">
var currentApp;
+var applicationRoot = "${jetspeedContextPath}";
function Portlet(portletId, title)
Modified: portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/ajax.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/ajax.js?rev=227438&r1=227437&r2=227438&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/ajax.js (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/ajax.js Thu Aug 4 10:18:23 2005
@@ -53,7 +53,7 @@
}
}
- var requestCaller = new XMLHttpRequestCaller("/jetspeed/ajax/portlet_apps.ajax?ajax_service=portletRegistry.getPortletApplications" ,this);
+ var requestCaller = new XMLHttpRequestCaller(applicationRoot+"/ajax/portlet_apps.ajax?ajax_service=portletRegistry.getPortletApplications" ,this);
requestCaller.serviceRequest();
}
@@ -78,7 +78,7 @@
this.load = function(appName)
{
this.appName = appName;
- var requestCaller = new XMLHttpRequestCaller("/jetspeed/ajax/portlet_definitions.ajax?ajax_service=portletRegistry.getPortletApplication&ajax_param_0_str="+appName ,this);
+ var requestCaller = new XMLHttpRequestCaller(applicationRoot+"/ajax/portlet_definitions.ajax?ajax_service=portletRegistry.getPortletApplication&ajax_param_0_str="+appName ,this);
requestCaller.serviceRequest();
}
}
@@ -111,7 +111,7 @@
this.load = function(portletName)
{
- var requestCaller = new XMLHttpRequestCaller("/jetspeed/ajax/portlet_entities.ajax?ajax_service=entityAccess.getPortletEntities&ajax_param_0_str="+portletName ,this);
+ var requestCaller = new XMLHttpRequestCaller(applicationRoot+"/ajax/portlet_entities.ajax?ajax_service=entityAccess.getPortletEntities&ajax_param_0_str="+portletName ,this);
requestCaller.serviceRequest();
}
}
@@ -157,7 +157,7 @@
this.load = function(entityName)
{
- var requestCaller = new XMLHttpRequestCaller("/jetspeed/ajax/portlet_entity.ajax?ajax_service=entityAccess.getPortletEntity&ajax_param_0_str="+entityName,this);
+ var requestCaller = new XMLHttpRequestCaller(applicationRoot+"/ajax/portlet_entity.ajax?ajax_service=entityAccess.getPortletEntity&ajax_param_0_str="+entityName,this);
requestCaller.serviceRequest();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org