2:12 a.m.
Author: wesleyhales
Date: 2008-03-24 21:12:05 -0400 (Mon, 24 Mar 2008)
New Revision: 10372
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
admin portlet issues resolved for bridge migration - still having problem with portlet
component
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
---
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-03-24
23:56:01 UTC (rev 10371)
+++
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-03-25
01:12:05 UTC (rev 10372)
@@ -36,6 +36,7 @@
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -247,9 +248,17 @@
}
}
+
protected ObjectNode getObjectNode(PortalObjectId path)
{
- return getObjectNode(sessionFactory.getCurrentSession(), path);
+ Session session;
+ try{
+ session = sessionFactory.getCurrentSession();
+ }catch(Exception e){
+ session = sessionFactory.openSession();
+ }
+
+ return getObjectNode(session, path);
}
private ObjectNode getObjectNodeNoCache(Session session, PortalObjectId id)
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
---
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-24
23:56:01 UTC (rev 10371)
+++
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-25
01:12:05 UTC (rev 10372)
@@ -103,7 +103,7 @@
protected void getContent(RenderRequest req, RenderResponse resp, boolean newContent)
throws PortletException, PortletSecurityException, IOException
{
String selectedURI = req.getParameter("content.uri");
-
+ System.out.println("--getContent------------" +
req.getParameter("content.uri"));
//
PortletURL actionURL = resp.createActionURL();
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
---
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-24
23:56:01 UTC (rev 10371)
+++
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-25
01:12:05 UTC (rev 10372)
@@ -16,6 +16,8 @@
<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%>
<%@page
import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%>
+<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.net.URLEncoder" %>
<portlet:defineObjects/>
<script type='text/javascript'
src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript"
src="/portal-admin/js/fadomatic.js"></script>
@@ -106,11 +108,17 @@
String iconLocation = getIcon(info);
+ PortletURL actionURL = renderResponse.createActionURL();
+ actionURL.setParameter("content.uri",instance.getId());
+ actionURL.setParameter("content.action.select","true");
+ String test = "?action=1&" +
actionURL.toString().substring(actionURL.toString().lastIndexOf("?") +
1,actionURL.toString().length());
+// test = test.replace("/","%2F");
+//
%>
- <portlet:actionURL var="url">
- <portlet:param name="content.action.select"
value="true"/>
- <portlet:param name="content.uri" value="<%=
instance.getId() %>"/>
- </portlet:actionURL>
+ <%--<portlet:actionURL var="test">--%>
+ <%--<portlet:param name="content.action.select"
value="true"/>--%>
+ <%--<portlet:param name="content.uri" value="<%=
instance.getId() %>"/>--%>
+ <%--</portlet:actionURL>--%>
<div style="display:none">
<div class="darktip" id="info-container-<%= displayName
%>">
@@ -133,8 +141,9 @@
<tr class="<%= rowClass %>" >
<td >
<img src="<%= iconLocation %>" align="middle"
style="margin:0 4px 0 0"/>
- <span onmouseover="domTT_activate(this, event, 'content',
document.getElementById('info-container-<%= displayName
%>'),'delay', 0, 'trail', false, 'fade', 'both',
'fadeMax', 95, 'styleClass', 'none');"><a
href="<%= url %>" id="portlet-instance-link"><%=
displayName %></a></span></td>
- </tr>
+ <span onmouseover="domTT_activate(this, event, 'content',
document.getElementById('info-container-<%= displayName
%>'),'delay', 0, 'trail', false, 'fade', 'both',
'fadeMax', 95, 'styleClass', 'none');"><a
href="<%= test %>" id="portlet-instance-link"><%=
displayName %></a></span>
+ w-<%=test%></td>
+ </tr>
<%
}
%>
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
===================================================================
---
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-03-24
23:56:01 UTC (rev 10371)
+++
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-03-25
01:12:05 UTC (rev 10372)
@@ -50,6 +50,16 @@
public Object bean;
+ public Object getBean()
+ {
+ return bean;
+ }
+
+ public void setBean(Object bean)
+ {
+ this.bean = bean;
+ }
+
public void setNewName(String newName)
{
this.newName = newName;