Mon Jul 24 17:01:43 EDT 2006

Author: roy.russo at jboss.com
Date: 2006-07-24 17:01:40 -0400 (Mon, 24 Jul 2006)
New Revision: 94

Added:
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/org/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/org/jboss/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/org/jboss/portlet/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/org/jboss/portlet/iframe/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/classes/org/jboss/portlet/iframe/IFramePortlet.class
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe-object.xml
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/edit.jsp
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/iframe.jsp
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-app.xml
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-web.xml
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/portlet.xml
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/web.xml
   portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/images/
Modified:
   portlets/2_4/src/IFramePortlet/README.txt
   portlets/2_4/src/IFramePortlet/build.xml
   portlets/2_4/src/IFramePortlet/iframeportlet.war
Log:


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

--- portlets/2_4/src/IFramePortlet/README.txt	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/README.txt	2006-07-24 21:01:40 UTC (rev 94)
@@ -1,6 +1,13 @@
 This portlet works with JBoss Portal 2.4+. It allows for a user-defined IFrame URL. 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 iframeportlet.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 iframeportlet.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/IFramePortlet/build.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/build.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/build.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -1,5 +1,5 @@
 <project name="JBoss IFrame Portlet"
-         default="deploy"
+         default="deploy24"
          basedir=".">
 
    <property name="app.name" value="iframe"/>
@@ -49,7 +49,7 @@
       <delete dir="${build.resources}/iframeportlet-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}/iframeportlet-war_22/WEB-INF/classes">
+      </copydir>
+
+      <!-- iframeportlet.war -->
+      <jar jarfile="iframeportlet.war">
+         <manifest>
+            <attribute name="Manifest-Version" value="1.0"/>
+         </manifest>
+         <fileset dir="${build.resources}/iframeportlet-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="iframeportlet.war"/>
    </target>
-   <target name="all" depends="deploy"/>
+   <target name="all" depends="deploy24"/>
 </project>
 

Modified: portlets/2_4/src/IFramePortlet/iframeportlet.war
===================================================================
(Binary files differ)

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


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

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/edit.jsp
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/edit.jsp	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/edit.jsp	2006-07-24 21:01:40 UTC (rev 94)
@@ -0,0 +1,39 @@
+<%@ 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>Non IFrame Browser Message</td>
+			<td><input type="text" name="noiframemessage" value="<%= request.getAttribute("iframemessage") %>" size="50"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td>Source URL</td>
+			<td><input type="text" name="url" value="<%= request.getAttribute("iframeurl") %>" size="50"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td>Height (px)</td>
+			<td><input type="text" name="height" value="<%= request.getAttribute("iframeheight") %>"/></td>
+		</tr>
+        <tr class="portlet-section-body">
+			<td>Width (px or %)</td>
+			<td><input type="text" name="width" value="<%= request.getAttribute("iframewidth") %>"/></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>
\ No newline at end of file

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/iframe.jsp
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/iframe.jsp	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe/iframe.jsp	2006-07-24 21:01:40 UTC (rev 94)
@@ -0,0 +1,26 @@
+<%@ 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="<%= request.getAttribute("iframewidth") %>">
+    <tr>
+        <td>
+            <a target="_new" href="<%= request.getAttribute("iframeurl") %>"><center>Open in new window</center></a>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <iframe src="<%= request.getAttribute("iframeurl") %>" width="<%= request.getAttribute("iframewidth") %>" height="<%= request.getAttribute("iframeheight") %>" border="0">
+	            Your browser does not support iframes
+            </iframe>
+        </td>
+    </tr>
+</table>
\ No newline at end of file

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe-object.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe-object.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/iframe-object.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -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>IFrame</page-name>
+         <window>
+            <window-name>IFramePortletWindow</window-name>
+            <instance-ref>IFramePortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+      </page>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-name>IFramePortletInstance</instance-name>
+         <component-ref>iframeportlet.IFramePortlet</component-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-app.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-app.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-app.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -0,0 +1,3 @@
+<jboss-app>
+    <app-name>iframeportlet</app-name>
+</jboss-app>
\ No newline at end of file

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-web.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-web.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/jboss-web.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<jboss-web>
+</jboss-web>

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/portlet.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/portlet.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/portlet.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -0,0 +1,18 @@
+<?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>IFramePortlet</portlet-name>
+      <portlet-class>org.jboss.portlet.iframe.IFramePortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>IFrame</title>
+      </portlet-info>
+   </portlet>
+</portlet-app>

Added: portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/web.xml
===================================================================
--- portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/web.xml	2006-07-24 20:57:37 UTC (rev 93)
+++ portlets/2_4/src/IFramePortlet/src/resources/iframeportlet-war_22/WEB-INF/web.xml	2006-07-24 21:01:40 UTC (rev 94)
@@ -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>


