Mon Jul 24 16:53:59 EDT 2006

Author: roy.russo at jboss.com
Date: 2006-07-24 16:53:55 -0400 (Mon, 24 Jul 2006)
New Revision: 92

Added:
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/jboss/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/jboss/portlet/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/jboss/portlet/contacts/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/jboss/portlet/contacts/Contact.class
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/classes/org/jboss/portlet/contacts/ContactsPortlet.class
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/common/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/common/notloggedin.jsp
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts-object.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/add.jsp
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/delete.jsp
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/domain.hbm.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/edit.jsp
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/hibernate.cfg.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/list.jsp
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-app.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-web.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/portlet.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/web.xml
   portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/images/
Modified:
   portlets/2_4/src/ContactPortlet/README.txt
   portlets/2_4/src/ContactPortlet/build.xml
   portlets/2_4/src/ContactPortlet/contact.war
   portlets/2_4/src/PortletSwap_2_4.iws
Log:


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

--- portlets/2_4/src/ContactPortlet/README.txt	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/README.txt	2006-07-24 20:53:55 UTC (rev 92)
@@ -1,6 +1,13 @@
-This portlet works with JBoss Portal 2.4+. It allows for a user-defined Address Book. This software is distributed under the LGPL, unless otherwise noted in the LICENSES.txt.
+This portlet works with JBoss Portal 2.2+. It allows for a user-defined Address Book. 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"
+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 contact.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 contact.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/ContactPortlet/build.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/build.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/build.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -1,5 +1,5 @@
 <project name="JBoss Contact Portlet"
-         default="deploy"
+         default="deploy24"
          basedir=".">
 
    <property name="app.name" value="flash"/>
@@ -49,7 +49,7 @@
       <delete dir="${build.resources}/contact-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}/contact-war_22/WEB-INF/classes">
+      </copydir>
+
+      <!-- contact.war -->
+      <jar jarfile="contact.war">
+         <manifest>
+            <attribute name="Manifest-Version" value="1.0"/>
+         </manifest>
+         <fileset dir="${build.resources}/contact-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="contact.war"/>
    </target>
-   <target name="all" depends="deploy"/>
+   <target name="all" depends="deploy24"/>
 </project>
 

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

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


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

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


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

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/common/notloggedin.jsp
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/common/notloggedin.jsp	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/common/notloggedin.jsp	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,13 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+
+<!--
+/**
+ * User: Chris Mills (millsy at jboss.com)
+ * Date: 27-Feb-2006
+ * Time: 22:02:11
+ */
+-->
+
+<center>
+    <b>You must be an authenticated user of this system to use this portlet</b>
+</center>
\ No newline at end of file

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/add.jsp
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/add.jsp	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/add.jsp	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,41 @@
+<%@ 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 action="<portlet:actionURL/>" method="POST">
+    <table>
+        <tr>
+            <td>Given Name</td>
+            <td><input type="text" name="givenName"/></td>
+        </tr>
+        <tr>
+            <td>Family Name</td>
+            <td><input type="text" name="familyName"/></td>
+        </tr>
+        <tr>
+            <td>Telephone</td>
+            <td><input type="text" name="telephone"/></td>
+        </tr>
+        <tr>
+            <td>Mobile</td>
+            <td><input type="text" name="mobile"/></td>
+        </tr>
+        <tr>
+            <td>Email</td>
+            <td><input type="text" name="email"/></td>
+        </tr>
+        <tr>
+            <td><input type="submit" name="op" value="Add Contact"/></td>
+            <td><input type="submit" name="op" value="Cancel"/></td>
+        </tr>
+    </table>
+</form>
+

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/delete.jsp
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/delete.jsp	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/delete.jsp	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,47 @@
+<%@ page import="org.jboss.portlet.contacts.Contact"%>
+<%@ 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/>
+
+<%
+	Contact contact = (Contact) request.getAttribute("contact");
+%>
+
+<form action="<portlet:actionURL/>" method="POST">
+	<input type="hidden" name="key" value="<%= contact.getKey() %>"/>
+    <table>
+        <tr>
+            <td>Given Name</td>
+            <td><%= contact.getGivenName() != null ? contact.getGivenName() : "" %></td>
+        </tr>
+        <tr>
+            <td>Family Name</td>
+            <td><%= contact.getFamilyName() != null ? contact.getFamilyName() : "" %></td>
+        </tr>
+        <tr>
+            <td>Telephone</td>
+            <td><%= contact.getTelephone() != null ? contact.getTelephone() : "" %></td>
+        </tr>
+        <tr>
+            <td>Mobile</td>
+            <td><%= contact.getMobile() != null ? contact.getMobile() : "" %></td>
+        </tr>
+        <tr>
+            <td>Email</td>
+            <td><%= contact.getEmail() != null ? contact.getEmail() : "" %>"</td>
+        </tr>
+        <tr>
+            <td><input type="submit" name="op" value="Delete Contact"/></td>
+            <td><input type="submit" name="op" value="Cancel"/></td>
+        </tr>
+    </table>
+</form>
+

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/domain.hbm.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/domain.hbm.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/domain.hbm.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+   <class
+      name="org.jboss.portlet.contacts.Contact"
+      table="jbp_contacts">
+      <cache usage="read-write"/>
+      <id
+         name="key"
+         column="jbp_uid"
+         type="java.lang.Long">
+         <generator class="native">
+            <param name="sequence">contacts_seq</param>
+         </generator>
+      </id>
+      <property
+         name="userName"
+         type="java.lang.String"
+         update="false"
+         insert="true"
+         column="jbp_uname"
+         unique="false"/>
+      <property
+         name="givenName"
+         type="java.lang.String"
+         update="true"
+         insert="true"
+         column="jbp_givenname"
+         unique="false"/>
+       <property
+          name="familyName"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          column="jbp_familyname"
+          unique="false"/>
+       <property
+          name="telephone"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          column="jbp_telephone"
+          unique="false"/>
+       <property
+          name="mobile"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          column="jbp_mobile"
+          unique="false"/>
+	   <property
+          name="email"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          column="jbp_email"
+          unique="false"/>
+   </class>
+</hibernate-mapping>
\ No newline at end of file

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/edit.jsp
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/edit.jsp	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/edit.jsp	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,46 @@
+<%@ page import="org.jboss.portlet.contacts.Contact"%>
+<%@ 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/>
+
+<%
+	Contact contact = (Contact) request.getAttribute("contact");
+%>
+
+<form action="<portlet:actionURL/>" method="POST">
+	<input type="hidden" name="key" value="<%= contact.getKey() %>"/>
+    <table>
+        <tr>
+            <td>Given Name</td>
+            <td><input type="text" name="givenName" value="<%= contact.getGivenName() != null ? contact.getGivenName() : "" %>"/></td>
+        </tr>
+        <tr>
+            <td>Family Name</td>
+            <td><input type="text" name="familyName" value="<%= contact.getFamilyName() != null ? contact.getFamilyName() : "" %>"/></td>
+        </tr>
+        <tr>
+            <td>Telephone</td>
+            <td><input type="text" name="telephone" value="<%= contact.getTelephone() != null ? contact.getTelephone() : "" %>"/></td>
+        </tr>
+        <tr>
+            <td>Mobile</td>
+            <td><input type="text" name="mobile" value="<%= contact.getMobile() != null ? contact.getMobile() : "" %>"/></td>
+        </tr>
+        <tr>
+            <td>Email</td>
+            <td><input type="text" name="email" value="<%= contact.getEmail() != null ? contact.getEmail() : "" %>"/></td>
+        </tr>
+        <tr>
+            <td><input type="submit" name="op" value="Update Contact"/></td>
+            <td><input type="submit" name="op" value="Cancel"/></td>
+        </tr>
+    </table>
+</form>

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/hibernate.cfg.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/hibernate.cfg.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/hibernate.cfg.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+    "-//Hibernate/Hibernate Configuration DTD//EN"
+    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+   <session-factory>
+      <property name="connection.datasource">java:PortalDS</property>
+      <property name="show_sql">false</property>
+      <property name="cache.use_second_level_cache">true</property>
+      <property name="cache.use_query_cache">true</property>
+	  
+	  <property name="hibernate.hbm2ddl.auto">update</property>
+
+      <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+
+      <!-- Mapping files -->
+      <mapping resource="WEB-INF/contacts/domain.hbm.xml"/>
+   </session-factory>
+</hibernate-configuration>
\ No newline at end of file

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/list.jsp
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/list.jsp	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts/list.jsp	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,72 @@
+<%@ page import="org.jboss.portlet.contacts.Contact" %>
+<%@ page import="java.util.List" %>
+<%@ 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/>
+
+<table width="100%">
+   <tr class="portlet-table-body">
+      <form action="<portlet:renderURL/>" method="POST">
+         <td colspan="2">Find contacts: </td>
+         <td colspan="2"><input type="text" name="familyName"/></td>
+         <td colspan="2"><input type="submit" name="op" value="Search"/></td>
+      </form>
+   </tr>
+   <%
+      List contacts = (List) request.getAttribute("contacts");
+      if(contacts.size() > 0)
+      {
+   %>
+   <tr class="portlet-section-header">
+      <td>Given Name</td>
+      <td>Family Name</td>
+      <td>Telephone</td>
+      <td>Mobile</td>
+      <td>Email</td>
+      <td colspan="3">Options</td>
+   </tr>
+   <%
+      for(int i = 0; i < contacts.size(); i++)
+      {
+         Contact contact = (Contact) contacts.get(i);
+   %>
+   <tr class="portlet-table-body">
+      <td><%= contact.getGivenName() %></td>
+      <td><%= contact.getFamilyName() %></td>
+      <td><a href="callto:<%= contact.getTelephone() %>"><%= contact.getTelephone() %></a></td>
+      <td><a href="callto:<%= contact.getMobile() %>"><%= contact.getMobile() %></a></td>
+      <td><a href="mailto:<%= contact.getEmail() %>"><%= contact.getEmail() %></a></td>
+      <td><a
+            href="<portlet:renderURL><portlet:param name="op" value="edit"/><portlet:param name="key" value="<%= contact.getKey().toString() %>"/></portlet:renderURL>">Edit</a>
+      </td>
+      <td><a
+            href="<portlet:renderURL><portlet:param name="op" value="delete"/><portlet:param name="key" value="<%= contact.getKey().toString() %>"/></portlet:renderURL>">Delete</a>
+      </td>
+      <td><a target="_new"
+             href="<portlet:actionURL><portlet:param name="op" value="vcard"/><portlet:param name="key" value="<%= contact.getKey().toString() %>"/></portlet:actionURL>">VCard</a>
+      </td>
+   </tr>
+   <%
+      }
+   }
+   else
+   {
+   %>
+   <tr>
+      <td colspan="6" align="center">No contacts</td>
+   </tr>
+   <%
+      }
+   %>
+</table>
+<center><a href="<portlet:renderURL><portlet:param name="op" value="shownew"/></portlet:renderURL>">Add new contact</a>
+</center>
+

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts-object.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts-object.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/contacts-object.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -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>Contacts</page-name>
+         <window>
+            <window-name>ContactsPortletWindow</window-name>
+            <instance-ref>ContactsPortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+      </page>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-name>ContactsPortletInstance</instance-name>
+         <component-ref>contactsportlet.ContactsPortlet</component-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-app.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-app.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-app.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,3 @@
+<jboss-app>
+    <app-name>contactsportlet</app-name>
+</jboss-app>
\ No newline at end of file

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-web.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-web.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/jboss-web.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<jboss-web>
+</jboss-web>

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/portlet.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/portlet.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/portlet.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -0,0 +1,17 @@
+<?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>ContactsPortlet</portlet-name>
+      <portlet-class>org.jboss.portlet.contacts.ContactsPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>Address Book</title>
+      </portlet-info>
+   </portlet>
+</portlet-app>

Added: portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/web.xml
===================================================================
--- portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/web.xml	2006-07-24 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/ContactPortlet/src/resources/contact-war_22/WEB-INF/web.xml	2006-07-24 20:53:55 UTC (rev 92)
@@ -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 20:44:51 UTC (rev 91)
+++ portlets/2_4/src/PortletSwap_2_4.iws	2006-07-24 20:53:55 UTC (rev 92)
@@ -119,19 +119,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
         <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">
+            <state line="74" column="3" selection-start="2372" selection-end="2372" vertical-scroll-proportion="0.15370706">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.txt" pinned="false" current="false" current-in-tab="false">
+      <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="89" column="41" selection-start="2974" selection-end="2974" vertical-scroll-proportion="0.5576208">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.txt" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/FlashPortlet/README.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="8" column="21" selection-start="530" selection-end="530" vertical-scroll-proportion="0.24593128">
+            <state line="1" column="28" selection-start="90" selection-end="90" vertical-scroll-proportion="0.03074141">
               <folding />
             </state>
           </provider>
@@ -251,6 +260,102 @@
         <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>
+    <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_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>
+    <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_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" />
@@ -402,10 +507,10 @@
       <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="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25812384" 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" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.32918552" order="8" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
       <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
@@ -605,13 +710,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ContactPortlet/README.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="40" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -619,13 +717,6 @@
         </state>
       </provider>
     </entry>
-    <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>
     <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">
@@ -680,20 +771,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlashPortlet/README.txt">
+    <entry file="file://$PROJECT_DIR$/FlashPortlet/build.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="21" selection-start="530" selection-end="530" vertical-scroll-proportion="0.24593128">
+        <state line="74" column="3" selection-start="2372" selection-end="2372" vertical-scroll-proportion="0.15370706">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlashPortlet/build.xml">
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/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">
+        <state line="89" column="41" selection-start="2974" selection-end="2974" vertical-scroll-proportion="0.5576208">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/ContactPortlet/README.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="49" selection-start="595" selection-end="595" vertical-scroll-proportion="0.2527881">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlashPortlet/README.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="28" selection-start="90" selection-end="90" vertical-scroll-proportion="0.03074141">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="simpleUML.DiagramSettingsWorkspace" />
   <component name="simpleUML.UMLToolWindowPlugin">


