From portal-commits at lists.jboss.org Mon Mar 24 21:12:05 2008
Content-Type: multipart/mixed; boundary="===============8840546385664746849=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10372 - in
 branches/JBoss_Portal_2_6_4_JBPB:
 core/src/main/org/jboss/portal/core/ui/content/portlet and 2 other
 directories.
Date: Mon, 24 Mar 2008 21:12:05 -0400
Message-ID: <E1Jdxht-0006Cp-9E@committer01.frg.pub.inap.atl.jboss.com>

--===============8840546385664746849==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/co=
re/admin/ui/actions/RenameAction.java
   branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/imp=
l/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 w=
ith portlet component

Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/c=
ore/impl/model/portal/PersistentPortalObjectContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/im=
pl/model/portal/PersistentPortalObjectContainer.java	2008-03-24 23:56:01 UT=
C (rev 10371)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/im=
pl/model/portal/PersistentPortalObjectContainer.java	2008-03-25 01:12:05 UT=
C (rev 10372)
@@ -36,6 +36,7 @@
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactor=
y;
 =

 import javax.naming.InitialContext;
+import javax.naming.NamingException;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -247,9 +248,17 @@
       }
    }
 =

+
    protected ObjectNode getObjectNode(PortalObjectId path)
    {
-      return getObjectNode(sessionFactory.getCurrentSession(), path);
+      Session session;
+      try{
+         session =3D sessionFactory.getCurrentSession();
+      }catch(Exception e){
+         session =3D 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/c=
ore/ui/content/portlet/PortletContentEditorPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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, boole=
an newContent) throws PortletException, PortletSecurityException, IOExcepti=
on
    {
       String selectedURI =3D req.getParameter("content.uri");
-
+      System.out.println("--getContent------------" + req.getParameter("co=
ntent.uri"));
       //
       PortletURL actionURL =3D resp.createActionURL();
 =


Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-w=
ar/WEB-INF/jsp/content/portlet_editor.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
 <%@page import=3D"org.jboss.portal.core.portlet.info.PortletIconInfo"%>
 <%@page import=3D"org.jboss.portal.core.ui.content.portlet.PortletContentE=
ditorPortlet"%>
+<%@ page import=3D"javax.portlet.PortletURL" %>
+<%@ page import=3D"java.net.URLEncoder" %>
 <portlet:defineObjects/>
 <script type=3D'text/javascript' src=3D'/portal-admin/js/domLib.js'></scri=
pt>
 <script type=3D"text/javascript" src=3D"/portal-admin/js/fadomatic.js"></s=
cript>
@@ -106,11 +108,17 @@
 =

             String iconLocation =3D getIcon(info);
 =

+            PortletURL actionURL =3D renderResponse.createActionURL();
+            actionURL.setParameter("content.uri",instance.getId());
+            actionURL.setParameter("content.action.select","true");
+            String test =3D "?action=3D1&" + actionURL.toString().substrin=
g(actionURL.toString().lastIndexOf("?") + 1,actionURL.toString().length());
+//            test =3D test.replace("/","%2F");
+//
       %>
-      <portlet:actionURL var=3D"url">
-         <portlet:param name=3D"content.action.select" value=3D"true"/>
-         <portlet:param name=3D"content.uri" value=3D"<%=3D instance.getId=
() %>"/>
-      </portlet:actionURL>
+      <%--<portlet:actionURL var=3D"test">--%>
+         <%--<portlet:param name=3D"content.action.select" value=3D"true"/=
>--%>
+         <%--<portlet:param name=3D"content.uri" value=3D"<%=3D instance.g=
etId() %>"/>--%>
+      <%--</portlet:actionURL>--%>
 =

       <div style=3D"display:none">
       <div class=3D"darktip" id=3D"info-container-<%=3D displayName %>">
@@ -133,8 +141,9 @@
       <tr class=3D"<%=3D rowClass %>" >
          <td >
          <img src=3D"<%=3D iconLocation %>" align=3D"middle" style=3D"marg=
in:0 4px 0 0"/>
-         <span onmouseover=3D"domTT_activate(this, event, 'content', docum=
ent.getElementById('info-container-<%=3D displayName %>'),'delay', 0, 'trai=
l', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href=
=3D"<%=3D url %>" id=3D"portlet-instance-link"><%=3D displayName %></a></sp=
an></td>
-      </tr>
+         <span onmouseover=3D"domTT_activate(this, event, 'content', docum=
ent.getElementById('info-container-<%=3D displayName %>'),'delay', 0, 'trai=
l', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href=
=3D"<%=3D test %>" id=3D"portlet-instance-link"><%=3D displayName %></a></s=
pan>
+         w-<%=3Dtest%></td>
+      </tr>                                           =

       <%
          }
       %>

Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/actions/RenameAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/c=
ore/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/c=
ore/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 =3D bean;
+   }
+
    public void setNewName(String newName)
    {
       this.newName =3D newName;


--===============8840546385664746849==--