Mon Jul 24 16:43:22 EDT 2006

Author: roy.russo at jboss.com
Date: 2006-07-24 16:43:18 -0400 (Mon, 24 Jul 2006)
New Revision: 90

Added:
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/portlet/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/portlet/flash/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/portlet/flash/FlashPortlet.class
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/flash-objects.xml
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-app.xml
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-web.xml
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/edit.jsp
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/flash.jsp
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/portlet.xml
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/web.xml
   portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/images/
Modified:
   portlets/2_4/src/ContactPortlet/contact.war
   portlets/2_4/src/FlashPortlet/README.txt
   portlets/2_4/src/FlashPortlet/build.xml
   portlets/2_4/src/FlashPortlet/flash.war
   portlets/2_4/src/PortletSwap_2_4.iws
Log:


Modified: portlets/2_4/src/ContactPortlet/contact.war
===================================================================
(Binary files differ)

Modified: portlets/2_4/src/FlashPortlet/README.txt
===================================================================

--- portlets/2_4/src/FlashPortlet/README.txt	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/README.txt	2006-07-24 20:43:18 UTC (rev 90)
@@ -1,6 +1,15 @@
-This portlet works with JBoss Portal 2.4+. It allows for a user-defined url pointing to a Flash (.swf) movie to be displayed and sized within a portlet window. This software is distributed under the LGPL, unless otherwise noted in the LICENSES.txt.
+This portlet is preconfigured to work with JBoss Portal 2.2+.
+It allows for a user-defined url pointing to a Flash (.swf) movie to be displayed and sized within a portlet window.
+This software is distributed under the LGPL, unless otherwise noted in the LICENSES.txt.
 
-- To build the war file, use ant to execute the build.xml at the root of this bundle, ie.  "ant deploy"
-- To deploy this portlet, simply copy the contact.war file to your /deploy directory where JBoss Portal resides.
+For JBoss Portal 2.2:
+- To build the war file, use ant to execute the build.xml at the root of this bundle, ie.  "ant deploy22"
+- To deploy this portlet, simply copy the flash.war file to your /deploy directory where JBoss Portal resides.
 
+For JBoss Portal 2.4:
+- To build the war file, use ant to execute the build.xml at the root of this bundle, ie.  "ant deploy24"
+- To deploy this portlet, simply copy the flash.war file to your /deploy directory where JBoss Portal resides.
 
+For other Portal servers:
+- To build the war file, use ant to execute the build.xml at the root of this bundle, ie.  "ant deploy"
+- You will then need to add any proprietary descriptors your portal server vendor recommends and deploy.

Modified: portlets/2_4/src/FlashPortlet/build.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/build.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/build.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -1,5 +1,5 @@
 <project name="JBoss Flash Portlet"
-         default="deploy"
+         default="deploy24"
          basedir=".">
 
    <property name="app.name" value="flash"/>
@@ -49,7 +49,7 @@
       <delete dir="${build.resources}/flash-war/WEB-INF/classes"/>
    </target>
 
-   <target name="deploy" depends="clover-yes, clover-no">
+   <target name="deploy24" depends="clover-yes, clover-no">
       <javac srcdir="${src.dir}"
              destdir="${classes.dir}"
              classpath="${libs}"
@@ -72,7 +72,30 @@
       </jar>
    </target>
 
-   <target name="explode" depends="deploy">
+   <target name="deploy22" depends="clover-yes, clover-no">
+      <javac srcdir="${src.dir}"
+             destdir="${classes.dir}"
+             classpath="${libs}"
+             debug="off"
+             optimize="on"
+             deprecation="on"
+             compiler="${compiler}">
+         <include name="main/org/jboss/portlet/**/*.java"/>
+      </javac>
+
+      <copydir src="${classes.dir}" dest="${build.resources}/flash-war_22/WEB-INF/classes">
+      </copydir>
+
+      <!-- flash.war -->
+      <jar jarfile="flash.war">
+         <manifest>
+            <attribute name="Manifest-Version" value="1.0"/>
+         </manifest>
+         <fileset dir="${build.resources}/flash-war_22"/>
+      </jar>
+   </target>
+
+   <target name="explode" depends="deploy24">
       <taskdef classname="org.jboss.nukes.common.ant.Explode"
                name="explode"
                classpath="${libs}"/>
@@ -81,6 +104,6 @@
             todir="${build.lib}/exploded"
             name="flash.war"/>
    </target>
-   <target name="all" depends="deploy"/>
+   <target name="all" depends="deploy24"/>
 </project>
 

Modified: portlets/2_4/src/FlashPortlet/flash.war
===================================================================
(Binary files differ)

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/portlet/flash/FlashPortlet.class
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/classes/org/jboss/portlet/flash/FlashPortlet.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/flash-objects.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/flash-objects.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/flash-objects.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <parent-ref>default</parent-ref>
+      <page>
+         <page-name>Flash</page-name>
+         <window>
+            <window-name>FlashPortletWindow</window-name>
+            <instance-ref>FlashPortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+      </page>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-name>FlashPortletInstance</instance-name>
+         <component-ref>flashportlet.FlashPortlet</component-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-app.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-app.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-app.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,3 @@
+<jboss-app>
+    <app-name>flashportlet</app-name>
+</jboss-app>
\ No newline at end of file

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-web.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-web.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jboss-web.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<jboss-web>
+</jboss-web>

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/edit.jsp
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/edit.jsp	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/edit.jsp	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,35 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<!--
+/**
+ * User: Chris Mills (millsy at jboss.com)
+ * Date: 27-Feb-2006
+ * Time: 22:02:11
+ */
+-->
+<portlet:defineObjects/>
+
+<form method="post" action="<portlet:actionURL/>">
+	<table>
+        <tr class="portlet-msg-alert">
+            <td colspan="2"><%= request.getParameter("message") != null ?  request.getParameter("message") : ""%></td>
+        </tr>
+        <tr class="portlet-section-body">
+			<td>Source URL</td>
+			<td><input type="text" name="url" value="<%= request.getAttribute("flashurl") %>" size="50"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td>Height (px)</td>
+			<td><input type="text" name="height" value="<%= request.getAttribute("flashheight") %>"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td>Width (px)</td>
+			<td><input type="text" name="width" value="<%= request.getAttribute("flashwidth") %>"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td align="right"><input type="submit" name="op" value="Update"/></td>
+            <td align="left"><input type="submit" name="op" value="Cancel"/></td>
+        </tr>
+    </table>
+</form>

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/flash.jsp
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/flash.jsp	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/jsp/flash/flash.jsp	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,10 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<center>
+    <object width="<%= request.getAttribute("flashwidth") %>" height="<%= request.getAttribute("flashheight") %>">
+        <param name="movie" value="<%= request.getAttribute("flashurl") %>"/>
+        <embed src="<%= request.getAttribute("flashurl") %>" width="<%= request.getAttribute("flashwidth") %>" height="<%= request.getAttribute("flashheight") %>"/>
+    </object>
+</center>
+

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/portlet.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/portlet.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/portlet.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd"
+             version="1.0">
+   <portlet>
+      <portlet-name>FlashPortlet</portlet-name>
+      <portlet-class>org.jboss.portlet.flash.FlashPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Flash Portlet</title>
+      </portlet-info>
+      <portlet-preferences>
+         <preference>
+            <name>flashurl</name>
+            <value>http://www.jboss.com/images/flash/next_now_movie.swf</value>
+         </preference>
+         <preference>
+            <name>flashheight</name>
+            <value>171</value>
+         </preference>
+         <preference>
+            <name>flashwidth</name>
+            <value>493</value>
+         </preference>
+      </portlet-preferences>
+   </portlet>
+</portlet-app>

Added: portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/web.xml
===================================================================
--- portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/web.xml	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/FlashPortlet/src/resources/flash-war_22/WEB-INF/web.xml	2006-07-24 20:43:18 UTC (rev 90)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+</web-app>

Modified: portlets/2_4/src/PortletSwap_2_4.iws
===================================================================
--- portlets/2_4/src/PortletSwap_2_4.iws	2006-07-24 19:09:30 UTC (rev 89)
+++ portlets/2_4/src/PortletSwap_2_4.iws	2006-07-24 20:43:18 UTC (rev 90)
@@ -119,87 +119,24 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="news-object.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/JBoss_NewsPortlet/src/resources/newsportlet-war/WEB-INF/news-object.xml">
+      <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/FlashPortlet/build.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="36" selection-start="105" selection-end="105" vertical-scroll-proportion="0.095684804">
+            <state line="94" column="45" selection-start="3067" selection-end="3067" vertical-scroll-proportion="0.76853526">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="weather-object.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/weather-object.xml">
+      <file leaf-file-name="README.txt" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlashPortlet/README.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="22" selection-start="359" selection-end="359" vertical-scroll-proportion="0.31894934">
+            <state line="8" column="21" selection-start="530" selection-end="530" vertical-scroll-proportion="0.24593128">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="portlet-instances.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/portlet-instances.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="52" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="portlet.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/portlet.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="35" column="11" selection-start="1289" selection-end="1289" vertical-scroll-proportion="0.54221386">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ContactPortlet/build.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="78" column="16" selection-start="2626" selection-end="2626" vertical-scroll-proportion="1.1814672">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="contacts-object.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/contacts-object.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="9" column="23" selection-start="303" selection-end="303" vertical-scroll-proportion="0.28705442">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="portlet-instances.xml" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/portlet-instances.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="4" selection-start="73" selection-end="73" vertical-scroll-proportion="0.095684804">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ContactsPortlet.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ContactPortlet/src/main/org/jboss/portlet/contacts/ContactsPortlet.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="9" column="25" selection-start="319" selection-end="319" vertical-scroll-proportion="-1.2439024">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="WeatherPortlet.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/main/org/jboss/portlet/weather/WeatherPortlet.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="66" column="41" selection-start="2294" selection-end="2294" vertical-scroll-proportion="0.031894933">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -328,7 +265,7 @@
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
     </PATH>
@@ -346,25 +283,17 @@
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src\resources" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war\WEB-INF" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
     </PATH>
     <PATH>
       <PATH_ELEMENT>
@@ -380,29 +309,21 @@
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src\resources" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src\resources\flash-war" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war\WEB-INF" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war\WEB-INF\contacts" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
     </PATH>
     <PATH>
       <PATH_ELEMENT>
@@ -418,44 +339,14 @@
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src" />
+        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\FlashPortlet\src" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src\resources\contact-war" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
     </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PortletSwap_2_4.ipr" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PortletSwap_2_4" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\projects\portletswap\portlets\2_4\src\ContactPortlet\src" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-    </PATH>
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="2" />
@@ -607,7 +498,7 @@
       <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="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <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="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.19497241" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25812384" order="0" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32918552" 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="true" weight="0.32918552" order="8" />
@@ -789,20 +680,6 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/JBoss_NewsPortlet/src/main/org/jboss/portlet/news/NewsPortlet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="21" selection-start="571" selection-end="571" vertical-scroll-proportion="-3.135624">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/PortletSwap_2_4.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/IFramePortlet/build.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="14" column="3" selection-start="361" selection-end="361" vertical-scroll-proportion="0.24593128">
@@ -838,62 +715,81 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/main/org/jboss/portlet/weather/WeatherPortlet.java">
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/build.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="66" column="41" selection-start="2294" selection-end="2294" vertical-scroll-proportion="0.031894933">
+        <state line="78" column="16" selection-start="2626" selection-end="2626" vertical-scroll-proportion="1.1814672">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/main/org/jboss/portlet/contacts/ContactsPortlet.java">
+    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/portlet.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="25" selection-start="319" selection-end="319" vertical-scroll-proportion="-1.2439024">
+        <state line="35" column="11" selection-start="1289" selection-end="1289" vertical-scroll-proportion="0.54221386">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ContactPortlet/build.xml">
+    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/weather-object.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="78" column="16" selection-start="2626" selection-end="2626" vertical-scroll-proportion="1.1814672">
+        <state line="10" column="22" selection-start="359" selection-end="359" vertical-scroll-proportion="0.31894934">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/portlet.xml">
+    <entry file="file://$PROJECT_DIR$/JBoss_NewsPortlet/src/resources/newsportlet-war/WEB-INF/news-object.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="11" selection-start="1289" selection-end="1289" vertical-scroll-proportion="0.54221386">
+        <state line="3" column="36" selection-start="105" selection-end="105" vertical-scroll-proportion="0.095684804">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/resources/weatherportlet-war/WEB-INF/weather-object.xml">
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/contacts-object.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="22" selection-start="359" selection-end="359" vertical-scroll-proportion="0.31894934">
+        <state line="9" column="23" selection-start="303" selection-end="303" vertical-scroll-proportion="0.28705442">
+          <folding>
+            <marker date="1153767810265" expanded="true" signature="51:475" placeholder="..." />
+            <marker date="1153767810265" expanded="true" signature="67:460" placeholder="..." />
+            <marker date="1153767810265" expanded="true" signature="158:443" placeholder="..." />
+            <marker date="1153767810265" expanded="true" signature="217:429" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/portlet-instances.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="17" selection-start="271" selection-end="271" vertical-scroll-proportion="0.25515947">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/contacts-object.xml">
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/main/org/jboss/portlet/contacts/ContactsPortlet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="23" selection-start="303" selection-end="303" vertical-scroll-proportion="0.28705442">
+        <state line="9" column="25" selection-start="319" selection-end="319" vertical-scroll-proportion="-1.2439024">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/JBoss_NewsPortlet/src/resources/newsportlet-war/WEB-INF/news-object.xml">
+    <entry file="file://$PROJECT_DIR$/JBoss_WeatherPortlet/src/main/org/jboss/portlet/weather/WeatherPortlet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="36" selection-start="105" selection-end="105" vertical-scroll-proportion="0.095684804">
+        <state line="66" column="41" selection-start="2294" selection-end="2294" vertical-scroll-proportion="0.031894933">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ContactPortlet/src/resources/contact-war/WEB-INF/portlet-instances.xml">
+    <entry file="file://$PROJECT_DIR$/FlashPortlet/README.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="4" selection-start="73" selection-end="73" vertical-scroll-proportion="0.095684804">
+        <state line="8" column="21" selection-start="530" selection-end="530" vertical-scroll-proportion="0.24593128">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlashPortlet/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="94" column="45" selection-start="3067" selection-end="3067" vertical-scroll-proportion="0.76853526">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="simpleUML.DiagramSettingsWorkspace" />
   <component name="simpleUML.UMLToolWindowPlugin">


