[portal-commits] JBoss Portal SVN: r7999 - in modules/portlet/trunk: federation/src/main/org/jboss/portal/portlet/federation/impl and 1 other directory.

Sunday, 19 August 2007

Author: julien(a)jboss.com
Date: 2007-08-19 18:45:01 -0400 (Sun, 19 Aug 2007)
New Revision: 7999

Modified:
  
modules/portlet/trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java
   modules/portlet/trunk/jboss-portal-portlet.iws
Log:
port to portlet module the bug fix from the portlet invoker registration service that was
fixed in 2.6

Modified:
modules/portlet/trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java
===================================================================
---
modules/portlet/trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java	2007-08-19
22:42:16 UTC (rev 7998)
+++
modules/portlet/trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java	2007-08-19
22:45:01 UTC (rev 7999)
@@ -74,12 +74,12 @@
       this.federatingPortletInvoker = federatingPortletInvoker;
    }
 
-   protected void startService() throws Exception
+   public void start() throws Exception
    {
       federatingPortletInvoker.registerInvoker(id, portletInvoker);
    }
 
-   protected void stopService() throws Exception
+   public void stop() throws Exception
    {
       federatingPortletInvoker.unregisterInvoker(id);
    }

Modified: modules/portlet/trunk/jboss-portal-portlet.iws
===================================================================

--- modules/portlet/trunk/jboss-portal-portlet.iws	2007-08-19 22:42:16 UTC (rev 7998)
+++ modules/portlet/trunk/jboss-portal-portlet.iws	2007-08-19 22:45:01 UTC (rev 7999)
@@ -130,7 +130,26 @@
   </component>
   <component name="FavoritesProjectViewPane" />
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="portal-beans.xml" pinned="false"
current="false" current-in-tab="false">
+        <entry
file="file://$PROJECT_DIR$/portlet/src/resources/test/test-portal-war/WEB-INF/portal-beans.xml">
+          <provider selected="true"
editor-type-id="text-editor">
+            <state line="31" column="0"
selection-start="1998" selection-end="1998"
vertical-scroll-proportion="0.45869297">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PortletInvokerRegistrationService.java"
pinned="false" current="true" current-in-tab="true">
+        <entry
file="file://$PROJECT_DIR$/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java">
+          <provider selected="true"
editor-type-id="text-editor">
+            <state line="81" column="19"
selection-start="3150" selection-end="3150"
vertical-scroll-proportion="0.87299633">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -218,8 +237,14 @@
           <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
+      </PATH>
+      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="tools" />
+          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -229,11 +254,11 @@
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="tools" />
+          <option name="myItemId" value="portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -243,17 +268,21 @@
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="tools" />
+          <option name="myItemId" value="portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools/etc" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -261,36 +290,32 @@
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="tools" />
+          <option name="myItemId" value="portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools/etc" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/test-portal-war"
/>
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="portlet" />
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/test-portal-war/WEB-INF"
/>
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
       <PATH>
@@ -306,6 +331,18 @@
           <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -325,9 +362,21 @@
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet"
/>
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -354,16 +403,10 @@
           <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="jsr168api" />
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -371,35 +414,27 @@
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jsr168api" />
+          <option name="myItemId" value="portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/jsr168api" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="federation" />
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
+          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="federation" />
-          <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/federation" />
+          <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet"
/>
           <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -416,7 +451,7 @@
       <showLibraryContents />
       <hideEmptyPackages />
       <abbreviatePackageNames />
-      <showStructure PackagesPane="false" ProjectPane="false"
/>
+      <showStructure PackagesPane="false" Scope="false"
ProjectPane="false" />
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
@@ -436,18 +471,6 @@
   <component name="RecentsManager" />
   <component name="RestoreUpdateTree" />
   <component name="RunManager">
-    <configuration default="true" type="Applet"
factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE"
value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
-      <option name="ALTERNATIVE_JRE_PATH" />
-    </configuration>
     <configuration default="true" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
@@ -463,6 +486,9 @@
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="wholeProject" />
       </option>
+      <method>
+        <option name="Make" value="true" />
+      </method>
     </configuration>
     <configuration default="true" type="Application"
factoryName="Application" enabled="false" merge="false">
       <option name="MAIN_CLASS_NAME" />
@@ -481,12 +507,33 @@
       <option name="HOST" value="localhost" />
       <option name="PORT" value="5005" />
     </configuration>
+    <configuration default="true" type="Applet"
factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE"
value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
+      <option name="ALTERNATIVE_JRE_PATH" />
+    </configuration>
     <configuration name="&lt;template&gt;" type="WebApp"
default="true" selected="false">
       <Host>localhost</Host>
       <Port>5050</Port>
     </configuration>
   </component>
-  <component name="ScopeViewComponent" />
+  <component name="ScopeViewComponent">
+    <subPane subId="Project">
+      <PATH>
+        <PATH_ELEMENT USER_OBJECT="Root">
+          <option name="myItemId" value="" />
+          <option name="myItemType" value="" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
   <component name="SelectInManager" />
   <component name="StarteamConfiguration">
     <option name="SERVER" value="" />
@@ -553,13 +600,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="3" y="34" width="1680"
height="958" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="UI Designer" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="3" />
       <window_info id="CVS" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="8" />
       <window_info id="IDEtalk" active="false"
anchor="right" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="3" />
       <window_info id="TODO" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="7" />
-      <window_info id="Project" active="true"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.329859"
order="0" />
+      <window_info id="Project" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.329859"
order="0" />
       <window_info id="Find" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.329849"
order="1" />
       <window_info id="Structure" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.25"
order="1" />
       <window_info id="Messages" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="8" />
@@ -715,6 +762,41 @@
         </state>
       </provider>
     </entry>
+    <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="37" column="13"
selection-start="2379" selection-end="2379"
vertical-scroll-proportion="0.1356784">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="32" column="13"
selection-start="2041" selection-end="2041"
vertical-scroll-proportion="0.1356784">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="30" column="13"
selection-start="1955" selection-end="1955"
vertical-scroll-proportion="0.13316892">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry
file="file://$PROJECT_DIR$/portlet/src/resources/test/test-portal-war/WEB-INF/portal-beans.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="31" column="0"
selection-start="1998" selection-end="1998"
vertical-scroll-proportion="0.45869297">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry
file="file://$PROJECT_DIR$/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="81" column="19"
selection-start="3150" selection-end="3150"
vertical-scroll-proportion="0.87299633">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r7999 - in modules/portlet/trunk: federation/src/main/org/jboss/portal/portlet/federation/impl and 1 other directory.