JBoss Portal SVN: r9951 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-13 03:11:26 -0500 (Wed, 13 Feb 2008)
New Revision: 9951
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.1.5. Building your Portlet minor revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-13 05:05:58 UTC (rev 9950)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-13 08:11:26 UTC (rev 9951)
@@ -515,13 +515,13 @@
</screen>
</para>
<para>
- To display certain content or a file, use the <computeroutput>cms</computeroutput> content-type, with the <computeroutput><content-uri></computeroutput> element being the path to the file in the CMS. This behavior is pluggable, and it is possible to plug in almost any kind of content.
+ To display certain content or a file, use the <computeroutput>cms</computeroutput> content-type, with the <computeroutput><content-uri></computeroutput> element being the path to the file in the CMS. This behavior is pluggable: you can plug in almost any type of content.
</para>
</sect3>
<sect3 id="first_portlet_build">
<title>Building your Portlet</title>
<para>
- A pre-compiled <filename>HelloWorldPortlet/helloworldportlet.war</filename> file is created after extracting the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl..."><filename>HelloWorldPorlet.zip</filename></ulink> file. To manually build the <filename>helloworldportlet.war</filename> file:
+ A pre-compiled <filename>HelloWorldPortlet/helloworldportlet.war</filename> file is created after extracting the <filename>HelloWorldPorlet.zip</filename> file. To manually build the <filename>helloworldportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -545,18 +545,18 @@
</orderedlist>
</para>
<para>
- Expanding the <filename>helloworldportlet.war</filename> allows you to deploy the portlet as an expanded directory, which makes development easier. This gives you access to the XML descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file:
+ Expanding the <filename>helloworldportlet.war</filename> allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the XML descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file:
</para>
<para>
<orderedlist>
<listitem>
<para>
- If you do not have the <filename>HelloWorldPortlet/helloworldportlet.war</filename> file, change into the run the <filename>HelloWorldPortlet/</filename> directory and run the <command>ant deploy</command> command to create it.
+ If you do not have the <filename>HelloWorldPortlet/helloworldportlet.war</filename> file, change into the <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant deploy</command> command. This creates a <filename>helloworldportlet.war</filename> file.
</para>
</listitem>
<listitem>
<para>
- Change into the <filename>HelloWorldPortlet/</filename> directory and run the <command>ant explode</command> command:
+ To expand the war file, change into the <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant explode</command> command:
</para>
<para>
<mediaobject>
@@ -579,7 +579,7 @@
</mediaobject>
</para>
<para>
- The expanded directory and the XML descriptors are located in the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory. Touching the <filename>web.xml</filename> file will let any live JBoss AS instance know that it needs to hot re-deploy the web application.
+ The expanded war file and the XML descriptors are located in the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory.
</para>
</sect3>
<sect3>
@@ -594,6 +594,8 @@
warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></programlisting>
Pointing your browser to <ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>,
should yield a view of our HelloWorldPortlet, added to the default page of Portal:
+
+ <!-- Touching the <filename>web.xml</filename> file will let any live JBoss AS instance know that it needs to hot re-deploy the web application. -->
<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/tutorials/first_portlet/output.png" valign="middle"/>
16 years, 7 months
JBoss Portal SVN: r9950 - in modules/portlet/trunk/test/src: test/resources/simple-portal-war/demo and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-13 00:05:58 -0500 (Wed, 13 Feb 2008)
New Revision: 9950
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
Log:
start of ajax portlet
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java 2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java 2008-02-13 05:05:58 UTC (rev 9950)
@@ -45,25 +45,51 @@
ResourceURL resourceURL = resp.createResourceURL();
//
- Element elt = resp.createElement("script");
- elt.setAttribute("type", "text/javascript");
- elt.setAttribute("src", resourceURL.toString());
- elt.appendChild(elt.getOwnerDocument().createTextNode(""));
- resp.addProperty("script", elt);
+// Element elt = resp.createElement("script");
+// elt.setAttribute("type", "text/javascript");
+// elt.setAttribute("src", resourceURL.toString());
+// elt.appendChild(elt.getOwnerDocument().createTextNode(""));
+// resp.addProperty("script", elt);
//
resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
- writer.print("<div style=\"height:100px;width:100%;text-align:center;padding-top:50px;\"><a href='javascript:" + resp.getNamespace() + "_handle()'>Click me to trigger script</a></div>");
+ writer.print("" +
+ "<script type=\"text/javascript\">" +
+ "function browse(id) {" +
+ "var url = id;\n" +
+ "alert(url);\n" +
+ "var pars = 'foo=bar';\n" +
+ "var target = 'output-div';\n" +
+ "var myAjax = new Ajax.Updater(target, url, {method: 'GET', parameters: pars});" +
+ "}" +
+ "</script>" +
+ "<div style=\"height:100px;width:100%;text-align:center;padding-top:50px;\">");
+// "<input type=\"text\" id=\"hidden-input\" value=\"" + resourceURL.toString() + "\" />" +
+// "<a href='javascript:" + resp.getNamespace() + "_handle()'>Click me to trigger script</a>" +
+ resourceURL.setParameter("prodId","1");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 1</a><br/>");
+
+ resourceURL.setParameter("prodId","2");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 2</a><br/>");
+
+ resourceURL.setParameter("prodId","3");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 3</a><br/>");
+
+ writer.print("</div>" +
+ "<br/>" +
+ "<div id=\"output-div\">Product Details</div>");
}
public void serveResource(ResourceRequest req, ResourceResponse resp) throws PortletException, IOException
{
String namespace =resp.getNamespace();
- resp.setContentType("text/javascript");
+ //resp.setContentType("application/json");
+ resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
- writer.print("function " + namespace + "_handle() { " +
- "new Effect.Grow(document.getElementById('header-portlet')) }");
+
+ writer.print("<div>" + req.getParameter("prodId") +"</div>");
+
writer.close();
}
}
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-13 05:05:58 UTC (rev 9950)
@@ -5,7 +5,7 @@
<%@ page isELIgnored="false" %>
<%@ include file="/layouts/header.jsp" %>
-
+
<portal:page>
<portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
<jbp:layout1>
@@ -14,9 +14,11 @@
</jsp:attribute>
<jsp:attribute name="rightcol">
<jbp:portlet name="ExceptionPortlet" applicationName="samples-basic"/>
+
<jbp:portlet name="HeaderPortlet" applicationName="samples-basic" id="header-portlet"/>
+
</jsp:attribute>
+
</jbp:layout1>
</portal:page>
-
<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-13 05:05:58 UTC (rev 9950)
@@ -7,7 +7,14 @@
<%@ include file="/layouts/header.jsp" %>
<portal:page>
-
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
</portal:page>
<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
16 years, 7 months
JBoss Portal SVN: r9949 - modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-12 18:24:48 -0500 (Tue, 12 Feb 2008)
New Revision: 9949
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp
Log:
- Added page encoding attribute (but does not seem to fix encoding issues). Re-formatted.
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp 2008-02-12 23:09:19 UTC (rev 9948)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wikipedia.jsp 2008-02-12 23:24:48 UTC (rev 9949)
@@ -1,37 +1,85 @@
-<%@ page contentType="text/html" %>
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
<%@ page language="java" %>
<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ page isELIgnored="false" %>
- <%@ include file="/layouts/header.jsp" %>
+<%@ include file="/layouts/header.jsp" %>
- <portal:page>
- <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="32080"/>
- <div class="home-content full-width">
- <div class="third-width float-right">
- <jbp:portlet name="GoogleMap" applicationName="samples-google-map-portlet"/>
- </div>
- <h2 class="title">St. Augustine, Florida</h2>
- <p>St. Augustine is the county seat of St. Johns County [1], Florida, in the United States. It is the oldest continuously occupied European-established city, and the oldest port in the continental United States.[2] St. Augustine lies in a region of Florida known as The First Coast, which extends from Amelia Island in the north, south to Jacksonville, St. Augustine and Palm Coast. According to the 2000 census, the city population was 11,592; in 2004, the population estimated by the U.S. Census Bureau was 12,157 [1].</p>
- <br/>
- <p>St. Augustine was founded by the Spanish in 1565.[2] The first Christian worship service held in a permanent settlement in the continental United States was a Catholic Mass celebrated in St. Augustine. A few settlements were founded prior to St. Augustine but all failed, including the original Pensacola colony in West Florida, founded by Trist�n de Luna y Arellano in 1559, with the area abandoned in 1561 due to hurricanes, famine and warring tribes, and Fort Caroline in what is today Jacksonville, Florida, in 1564. The city was founded by the Spanish admiral Pedro Men�ndez de Avil�s on September 8, 1565. Men�ndez first sighted land on August 28, the feast day of Augustine of Hippo, and consequently named the settlement San Agust�n. Mart�n de Arg�elles was born here one year later in 1566, the first child of European ancestry to be born in what is now the continental United States. This came 21 years before the English settlement at Roanoke Island in Virginia!
Colony, and 42 years before the successful settlements of Santa Fe, New Mexico, and Jamestown, Virginia. In all the territory under the jurisdiction of the United States, only (European) settlements in Puerto Rico are older than St. Augustine, with the oldest being Caparra, founded in 1508, whose inhabitants relocated and founded San Juan, in 1521.
- <br/> In 1586 St. Augustine was attacked and burned by Sir Francis Drake. In 1668 it was plundered by pirates and most of the inhabitants were killed. In 1702 and 1740 it was unsuccessfully attacked by British forces from their new colonies in the Carolinas and Georgia. The most serious of these came in the latter year, when James Oglethorpe of Georgia allied himself with Ahaya the Cowkeeper, chief of the Alachua band of the Seminole tribe to lay siege to the city.</p>
- <br/>
- In 1763, the Treaty of Paris ended the French and Indian War and gave Florida and St. Augustine to the British, an acquisition the British had been unable to take by force and keep due to the strong fort there. St. Augustine came under British rule and served as a Loyalist colony during the American Revolutionary War. The Treaty of Paris in 1783 gave the American colonies north of Florida their independence, and ceded Florida to Spain in recognition of Spanish efforts on behalf of the American colonies during the war.
- <br/>
- Florida was under Spanish control again from 1784 to 1821. During this time, Spain was being invaded by Napoleon and was struggling to retain its colonies. Florida no longer held its past importance to Spain. The expanding United States, however, regarded Florida as vital to its interests. In 1821, the Adams-On�s Treaty peaceably turned the Spanish colonies in Florida and, with them, St. Augustine, over to the United States.
- <br/>
- Florida was a United States territory until 1845 when it became a U.S. state. In 1861, the American Civil War began and Florida seceded from the Union and joined the Confederacy. Days before Florida seceded, state troops took the fort at St. Augustine from a small Union garrison (January 7, 1861). However, federal troops loyal to the United States Government quickly reoccupied the city (March 11, 1862) and remained in control throughout the four-year-long war. In 1865, Florida rejoined the United States.
- <br/>
- Spanish Colonial era buildings still existing in the city include the fortress Castillo de San Marcos. The fortress successfully repelled the British attacks of the 18th century, served as a prison for the Native American leader Osceola in 1837, and was occupied by Union troops during the American Civil War. It was removed from the Army's active duty rolls in 1900 after 205 years of service under five different flags. It is now the Castillo de San Marcos National Monument.
- <br/>
- In the late 19th century the railroad came to town, and led by northeastern industrialist Henry Flagler, St. Augustine became a winter resort for the very wealthy. A number of mansions and palatial grand hotels of this era still exist, some converted to other use, such as housing parts of Flagler College and museums. Flagler went on to develop much more of Florida's east coast, including his Florida East Coast Railway which eventually reached Key West in 1912.
- <br/>
- The city is a popular tourist attraction, for the rich Spanish Colonial Revival Style architectural heritage as well as elite 19th century architecture. In 1938 the theme park Marineland opened just south of St. Augustine, becoming one of Florida's first themed parks and setting the stage for the development of this industry in the following decades. The city is also one terminus of the Old Spanish Trail, which in the 1920's linked St. Augustine, Florida, to San Diego, California with 3000 miles of roadways.
-
- </div>
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="32080"/>
+ <div class="home-content full-width">
+ <div class="third-width float-right">
+ <jbp:portlet name="GoogleMap" applicationName="samples-google-map-portlet"/>
+ </div>
+ <h2 class="title">St. Augustine, Florida</h2>
- </portal:page>
+ <p>St. Augustine is the county seat of St. Johns County, Florida, in the United States. It is the
+ oldest continuously occupied European-established city, and the oldest port in the continental United
+ States. St. Augustine lies in a region of Florida known as The First Coast, which extends from
+ Amelia Island in the north, south to Jacksonville, St. Augustine and Palm Coast. According to the 2000
+ census, the city population was 11,592; in 2004, the population estimated by the U.S. Census Bureau was
+ 12,157.</p>
- <%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
+ <p>St. Augustine was founded by the Spanish in 1565. The first Christian worship service held in a
+ permanent settlement in the continental United States was a Catholic Mass celebrated in St. Augustine.
+ A few settlements were founded prior to St. Augustine but all failed, including the original Pensacola
+ colony in West Florida, founded by Tristán de Luna y Arellano in 1559, with the area abandoned in 1561
+ due to hurricanes, famine and warring tribes, and Fort Caroline in what is today Jacksonville, Florida,
+ in 1564. The city was founded by the Spanish admiral Pedro Menéndez de Avilés on September 8, 1565.
+ Menéndez first sighted land on August 28, the feast day of Augustine of Hippo, and consequently named
+ the settlement San Agustín. Martín de Argüelles was born here one year later in 1566, the first child of
+ European ancestry to be born in what is now the continental United States. This came 21 years before the
+ English settlement at Roanoke Island in Virginia Colony, and 42 years before the successful settlements
+ of Santa Fe, New Mexico, and Jamestown, Virginia. In all the territory under the jurisdiction of the
+ United States, only (European) settlements in Puerto Rico are older than St. Augustine, with the oldest
+ being Caparra, founded in 1508, whose inhabitants relocated and founded San Juan, in 1521.</p>
+
+ <p>In 1586 St. Augustine was attacked and burned by Sir Francis Drake. In 1668 it was plundered by pirates
+ and most of the inhabitants were killed. In 1702 and 1740 it was unsuccessfully attacked by British
+ forces from their new colonies in the Carolinas and Georgia. The most serious of these came in the
+ latter year, when James Oglethorpe of Georgia allied himself with Ahaya the Cowkeeper, chief of the
+ Alachua band of the Seminole tribe to lay siege to the city.</p>
+
+ <p>In 1763, the Treaty of Paris ended the French and Indian War and gave Florida and St. Augustine to the
+ British, an acquisition the British had been unable to take by force and keep due to the strong fort
+ there. St. Augustine came under British rule and served as a Loyalist colony during the American
+ Revolutionary War. The Treaty of Paris in 1783 gave the American colonies north of Florida their
+ independence, and ceded Florida to Spain in recognition of Spanish efforts on behalf of the American
+ colonies during the war.</p>
+
+ <p>Florida was under Spanish control again from 1784 to 1821. During this time, Spain was being invaded by
+ Napoleon and was struggling to retain its colonies. Florida no longer held its past importance to Spain.
+ The expanding United States, however, regarded Florida as vital to its interests. In 1821, the
+ Adams-Onís Treaty peaceably turned the Spanish colonies in Florida and, with them, St. Augustine, over
+ to the United States.</p>
+
+ <p>Florida was a United States territory until 1845 when it became a U.S. state. In 1861, the American
+ Civil War began and Florida seceded from the Union and joined the Confederacy. Days before Florida
+ seceded, state troops took the fort at St. Augustine from a small Union garrison (January 7, 1861).
+ However, federal troops loyal to the United States Government quickly reoccupied the city (March 11,
+ 1862) and remained in control throughout the four-year-long war. In 1865, Florida rejoined the United
+ States.</p>
+
+ <p>Spanish Colonial era buildings still existing in the city include the fortress Castillo de San Marcos.
+ The fortress successfully repelled the British attacks of the 18th century, served as a prison for the
+ Native American leader Osceola in 1837, and was occupied by Union troops during the American Civil War.
+ It was removed from the Army's active duty rolls in 1900 after 205 years of service under five different
+ flags. It is now the Castillo de San Marcos National Monument.</p>
+
+ <p>In the late 19th century the railroad came to town, and led by northeastern industrialist Henry Flagler,
+ St. Augustine became a winter resort for the very wealthy. A number of mansions and palatial grand
+ hotels of this era still exist, some converted to other use, such as housing parts of Flagler College
+ and museums. Flagler went on to develop much more of Florida's east coast, including his Florida East
+ Coast Railway which eventually reached Key West in 1912.</p>
+
+ <p>The city is a popular tourist attraction, for the rich Spanish Colonial Revival Style architectural
+ heritage as well as elite 19th century architecture. In 1938 the theme park Marineland opened just south
+ of St. Augustine, becoming one of Florida's first themed parks and setting the stage for the development
+ of this industry in the following decades. The city is also one terminus of the Old Spanish Trail, which
+ in the 1920's linked St. Augustine, Florida, to San Diego, California with 3000 miles of roadways.</p>
+ </div>
+
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
16 years, 8 months
JBoss Portal SVN: r9948 - in modules/portlet/trunk/test/src: test and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-12 18:09:19 -0500 (Tue, 12 Feb 2008)
New Revision: 9948
Removed:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/
Modified:
modules/portlet/trunk/test/src/test/build.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
Log:
- Added missing libraries for Tomcat.
- Fixed improper packaging of portlets (was fine with AS but not Tomcat).
- Removed useless SimplePortalServlet.
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-12 22:18:31 UTC (rev 9947)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-12 23:09:19 UTC (rev 9948)
@@ -753,10 +753,6 @@
<path refid="mc.jboss_microcontainer"/>
</copy>
- <copy todir="${test.temp.dir}/simple-portal-war/WEB-INF/classes">
- <fileset dir="${target}/classes" includes="org/jboss/portal/simple/**"/>
- </copy>
-
<!-- AS 4.2 -->
<generic-package-simple-portal server="${simple.as42.dir}"/>
@@ -768,7 +764,8 @@
<pathelement path="${dependency.activation.jar}"/>
<pathelement path="${dependency.apache-jstl.jar}"/>
<pathelement path="${dependency.apache-standard.jar}"/>
- <!--<pathelement path="${dependency.xercesImpl.jar}"/>-->
+ <pathelement path="${dependency.concurrent.jar}"/>
+ <path refid="mc.jaxb-api"/>
</path>
</copy>
<jar jarfile="${simple.tomcat.dir}/simple-portal.war">
@@ -794,6 +791,8 @@
<copy todir="${samples.tmp.dir}/samples-google-map-portlet-war">
<fileset dir="src/test/resources/portal/samples/google-map-portlet-war"/>
+ </copy>
+ <copy todir="${samples.tmp.dir}/samples-google-map-portlet-war/WEB-INF/classes">
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class"/>
</copy>
@@ -803,14 +802,19 @@
<copy todir="${samples.tmp.dir}/samples-google-weather-portlet-war">
<fileset dir="src/test/resources/portal/samples/google-weather-portlet-war"/>
- <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/*.class"/>
</copy>
+ <copy todir="${samples.tmp.dir}/samples-google-weather-portlet-war/WEB-INF/classes">
+ <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/*.class"
+ excludes="org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class"/>
+ </copy>
<jar jarfile="${samples.target.dir}/samples-google-weather-portlet.war">
<fileset dir="${samples.tmp.dir}/samples-google-weather-portlet-war"/>
</jar>
<copy todir="${samples.tmp.dir}/samples-remotecontrol-portlet-war">
<fileset dir="src/test/resources/portal/samples/remotecontrol-portlet-war"/>
+ </copy>
+ <copy todir="${samples.tmp.dir}/samples-remotecontrol-portlet-war/WEB-INF/classes">
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class"/>
</copy>
@@ -820,6 +824,8 @@
<copy todir="${samples.tmp.dir}/samples-cart-event-portlet-war">
<fileset dir="src/test/resources/portal/samples/cart-event-portlet-war"/>
+ </copy>
+ <copy todir="${samples.tmp.dir}/samples-cart-event-portlet-war/WEB-INF/classes">
<fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/event/*.class"/>
</copy>
<jar jarfile="${samples.target.dir}/samples-cart-event-portlet.war">
@@ -828,6 +834,8 @@
<copy todir="${samples.tmp.dir}/samples-basic-war">
<fileset dir="src/test/resources/portal/samples/basic-war"/>
+ </copy>
+ <copy todir="${samples.tmp.dir}/samples-basic-war/WEB-INF/classes">
<fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/basic/**"/>
</copy>
<jar jarfile="${samples.target.dir}/samples-basic.war">
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 22:18:31 UTC (rev 9947)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 23:09:19 UTC (rev 9948)
@@ -42,12 +42,4 @@
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>PortalServlet</servlet-name>
- <servlet-class>org.jboss.portal.simple.SimplePortalServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>PortalServlet</servlet-name>
- <url-pattern>/simple-portal</url-pattern>
- </servlet-mapping>
</web-app>
16 years, 8 months
JBoss Portal SVN: r9947 - modules/portlet/trunk/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-12 17:18:31 -0500 (Tue, 12 Feb 2008)
New Revision: 9947
Modified:
modules/portlet/trunk/build/pom.xml
Log:
update common to 1.2.0-Beta1
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-02-12 22:05:48 UTC (rev 9946)
+++ modules/portlet/trunk/build/pom.xml 2008-02-12 22:18:31 UTC (rev 9947)
@@ -39,7 +39,7 @@
<version.jbossxb>2.0.0.CR5</version.jbossxb>
<version.javassist>3.6-beta</version.javassist>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
+ <version.jboss.portal.common>1.2.0-Beta1</version.jboss.portal.common>
<version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
<version.jboss.unit>1.2.0-Beta1</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
16 years, 8 months
JBoss Portal SVN: r9946 - modules/web/trunk/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-12 17:05:48 -0500 (Tue, 12 Feb 2008)
New Revision: 9946
Modified:
modules/web/trunk/build/pom.xml
Log:
update common module version to 1.2.0-Beta1
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-02-12 22:03:43 UTC (rev 9945)
+++ modules/web/trunk/build/pom.xml 2008-02-12 22:05:48 UTC (rev 9946)
@@ -36,7 +36,7 @@
<version.jbossxb>2.0.0.CR3</version.jbossxb>
<version.javassist>3.6-beta</version.javassist>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
+ <version.jboss.portal.common>1.2.0-Beta1</version.jboss.portal.common>
<version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
16 years, 8 months
JBoss Portal SVN: r9944 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-12 16:56:00 -0500 (Tue, 12 Feb 2008)
New Revision: 9944
Added:
modules/common/tags/JBP_COMMON_1_2_0_BETA1/
Log:
tag 1.2.0-Beta1
Copied: modules/common/tags/JBP_COMMON_1_2_0_BETA1 (from rev 9943, modules/common/trunk)
16 years, 8 months
JBoss Portal SVN: r9942 - in modules/common/trunk: build and 3 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-12 16:43:53 -0500 (Tue, 12 Feb 2008)
New Revision: 9942
Modified:
modules/common/trunk/build/pom.xml
modules/common/trunk/common/pom.xml
modules/common/trunk/mc/pom.xml
modules/common/trunk/pom.xml
modules/common/trunk/portal/pom.xml
Log:
version update to 1.2.0-Beta1
Modified: modules/common/trunk/build/pom.xml
===================================================================
--- modules/common/trunk/build/pom.xml 2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/build/pom.xml 2008-02-12 21:43:53 UTC (rev 9942)
@@ -10,7 +10,7 @@
<artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<url>http://labs.jboss.com/jbossportal</url>
<properties>
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/common/pom.xml 2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/trunk/mc/pom.xml
===================================================================
--- modules/common/trunk/mc/pom.xml 2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/mc/pom.xml 2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/trunk/pom.xml
===================================================================
--- modules/common/trunk/pom.xml 2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/pom.xml 2008-02-12 21:43:53 UTC (rev 9942)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common (aggregator)</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<distributionManagement>
<repository>
Modified: modules/common/trunk/portal/pom.xml
===================================================================
--- modules/common/trunk/portal/pom.xml 2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/portal/pom.xml 2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 8 months
JBoss Portal SVN: r9941 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-12 15:10:38 -0500 (Tue, 12 Feb 2008)
New Revision: 9941
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java
Log:
- Removed preference code for now as it's not working.
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java 2008-02-12 18:47:37 UTC (rev 9940)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.java 2008-02-12 20:10:38 UTC (rev 9941)
@@ -32,14 +32,14 @@
renderResponse.setContentType("text/html");
PrintWriter printWriter = renderResponse.getWriter();
printWriter.print("<script type='text/javascript'>function openRemote(url){window.name='jbp_parent';" +
- "window.open(url, 'jbp_remote', 'width=400,height=300,scrollable=yes')}</script>");
+ "window.open(url, 'jbp_remote', 'width=400,height=200,scrollable=yes')}</script>");
printWriter.print("<p><a href='#' onclick=\"openRemote('");
ResourceURL resource = renderResponse.createResourceURL();
printWriter.print(resource);
printWriter.print("')\">Open remote control!</a></p>");
- String color = renderRequest.getPreferences().getValue("color", "000");
+ /*String color = renderRequest.getPreferences().getValue("color", "000");
printWriter.print("<p>Preferred color: <span style='border: 1px solid #aaa; background-color:#"
- + color + ";'> </span></p>");
+ + color + ";'> </span></p>");*/
}
@Override
@@ -47,7 +47,7 @@
{
resourceResponse.setContentType("text/html");
PrintWriter writer = resourceResponse.getWriter();
- resourceRequest.getPreferences().setValue("color", COLORS[COLOR_INDEX++ % 8]);
+// resourceRequest.getPreferences().setValue("color", COLORS[COLOR_INDEX++ % 8]);
writer.print("<html><head><script type='text/javascript'>function openLinkInParent(url){window.open(url,'jbp_parent');}</script>" +
"<link rel=\"stylesheet\" href=\"/simple/css/master.css\" type=\"text/css\"/></head><body>");
PortletURL url = resourceResponse.createRenderURL();
16 years, 8 months
JBoss Portal SVN: r9940 - in modules/portlet/trunk: test and 5 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-02-12 13:47:37 -0500 (Tue, 12 Feb 2008)
New Revision: 9940
Removed:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml
Modified:
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
Log:
- More work on packaging. Tomcat is getting better but portlets are not taken into account yet...
- Removed mapping to simple as it's not possible to do it with Tomcat. Mapping will now be simple-portal. Adapted files accordingly.
- Added JSTL dependencies for Tomcat.
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/build/pom.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -9,23 +9,24 @@
the property
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.portal</groupId>
- <artifactId>jboss-portal-parent</artifactId>
- <version>1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.portal.portlet</groupId>
- <artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Portal Portlet Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Portal Portlet Module</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.portal.portlet</groupId>
+ <artifactId>module-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Portlet Module</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Portal Portlet Module</description>
<properties>
<version.apache.portals.bridges>1.0.3</version.apache.portals.bridges>
+ <version.apache-taglibs>1.1.2</version.apache-taglibs>
<version.activation>1.0.2</version.activation>
<version.concurrent>1.3.4</version.concurrent>
<version.javax.servlet>2.5</version.javax.servlet>
@@ -79,7 +80,7 @@
</repositories>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -99,7 +100,7 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
+ </build>
<pluginRepositories>
<pluginRepository>
@@ -131,16 +132,30 @@
<artifactId>portals-bridges-common</artifactId>
<version>${version.apache.portals.bridges}</version>
</dependency>
+
+ <!-- JSTL for Tomcat -->
<dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${version.apache-taglibs}</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${version.apache-taglibs}</version>
+ </dependency>
+
+
+ <dependency>
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
<version>${version.sun-jaxb}</version>
</dependency>
<!--<dependency>-->
- <!--<artifactId>junit</artifactId>-->
- <!--<groupId>junit</groupId>-->
- <!--<version>${version.junit}</version>-->
+ <!--<artifactId>junit</artifactId>-->
+ <!--<groupId>junit</groupId>-->
+ <!--<version>${version.junit}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.jboss.portal.common</groupId>
@@ -178,9 +193,9 @@
<version>${version.javax.servlet.jsp}</version>
</dependency>
<!--<dependency>-->
- <!--<groupId>apache-tomcat</groupId>-->
- <!--<artifactId>catalina</artifactId>-->
- <!--<version>${version.apache.tomcat}</version>-->
+ <!--<groupId>apache-tomcat</groupId>-->
+ <!--<artifactId>catalina</artifactId>-->
+ <!--<version>${version.apache.tomcat}</version>-->
<!--</dependency>-->
<dependency>
@@ -344,39 +359,39 @@
<version>${version.jboss.aop}</version>
</dependency>
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jboss-aop-as4-deployer</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-as4-deployer</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jboss-aop-jdk50</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jboss-aop-jdk50-client</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50-client</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>jboss.aop</groupId>-->
- <!--<artifactId>pluggable-instrumentor</artifactId>-->
- <!--<version>${version.jboss.aop}</version>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>pluggable-instrumentor</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
<!--</dependency>-->
<dependency>
<groupId>commons-logging</groupId>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/pom.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -24,9 +24,6 @@
<artifactId>portlet-controller</artifactId>
<version>${project.version}</version>
</dependency>
-
-
-
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
@@ -196,6 +193,15 @@
<artifactId>portlet-api</artifactId>
</dependency>
+ <!-- JSTL for Tomcat -->
+ <dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -363,7 +369,7 @@
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
<property name="dependency.portal-portlet-controller.jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
- <property name="dependency.portal-portlet-tests.test-jar"
+ <property name="dependency.portal-portlet-tests.test-jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
<property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/>
@@ -371,11 +377,17 @@
<property name="dependency.jaxb-api.jar"
value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <!-- JSTL for Tomcat -->
+ <property name="dependency.apache-jstl.jar"
+ value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar"
+ value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+
<ant antfile="${basedir}/src/test/build.xml">
<target name="tests"/>
<target name="package-simple-portal"/>
</ant>
-
+
</tasks>
</configuration>
<goals>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -698,6 +698,7 @@
<path location="${dependency.portal-portlet.jar}"/>
<path location="${dependency.portal-web.jar}"/>
<path location="${dependency.jsr168api.jar}"/>
+ <path refid="mc.portal-portlet-controller"/>
</path>
</copy>
@@ -722,7 +723,7 @@
<jar jarfile="${target}/portlet-test-lib.jar">
- <fileset dir="${target}/classes"/>
+ <fileset dir="${target}/classes" excludes="org/jboss/portal/portlet/portal/**,org/jboss/portal/simple/**"/>
</jar>
<copy todir="${test.temp.dir}/simple-portal-war">
@@ -738,10 +739,9 @@
<path refid="mc.portal-common"/>
- <path refid="mc.portal-portlet-controller"/>
-
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
+ <path refid="mc.xerces"/>
<path refid="mc.javassist"/>
<path refid="mc.jboss_common_logging_spi"/>
<path refid="mc.jboss_common_logging_jdk"/>
@@ -753,21 +753,31 @@
<path refid="mc.jboss_microcontainer"/>
</copy>
+ <copy todir="${test.temp.dir}/simple-portal-war/WEB-INF/classes">
+ <fileset dir="${target}/classes" includes="org/jboss/portal/simple/**"/>
+ </copy>
+
<!-- AS 4.2 -->
<generic-package-simple-portal server="${simple.as42.dir}"/>
<!-- Tomcat -->
<generic-package-simple-portal server="${simple.tomcat.dir}"/>
- <copy todir="${simple.tomcat.dir}/simple-portal/simple-portal.war/WEB-INF/lib" flatten="true">
+ <copy todir="${simple.tomcat.dir}/simple-portal" flatten="true">
<path>
<pathelement path="${dependency.log4j.jar}"/>
<pathelement path="${dependency.activation.jar}"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.apache-jstl.jar}"/>
+ <pathelement path="${dependency.apache-standard.jar}"/>
+ <!--<pathelement path="${dependency.xercesImpl.jar}"/>-->
</path>
</copy>
+ <jar jarfile="${simple.tomcat.dir}/simple-portal.war">
+ <fileset dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/>
+ </jar>
+ <delete dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/>
<!-- AS 5 -->
- <generic-package-simple-portal server="${simple.as5.dir}"/>
+ <!--<generic-package-simple-portal server="${simple.as5.dir}"/>-->
<delete file="${target}/portlet-test-lib.jar"/>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Context path="/simple" privileged="true"/>
\ No newline at end of file
+<Context privileged="true"/>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Context path="/simple" privileged="true"/>
\ No newline at end of file
+<Context privileged="true"/>
\ No newline at end of file
Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,26 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2008, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
-<jboss-web>
- <context-root>/simple</context-root>
-</jboss-web>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 18:47:37 UTC (rev 9940)
@@ -23,9 +23,9 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<filter>
<filter-name>ControllerFilter</filter-name>
<filter-class>org.jboss.portal.portlet.test.jsp.ControllerFilter</filter-class>
@@ -48,6 +48,6 @@
</servlet>
<servlet-mapping>
<servlet-name>PortalServlet</servlet-name>
- <url-pattern>/simple</url-pattern>
+ <url-pattern>/simple-portal</url-pattern>
</servlet-mapping>
</web-app>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-12 18:47:37 UTC (rev 9940)
@@ -82,10 +82,10 @@
}
body,
-div,
-form,
-ul,
-li {
+ div,
+ form,
+ ul,
+ li {
margin: 0;
padding: 0;
}
@@ -130,7 +130,6 @@
padding: 0;
}
-
/*-------------------------------Container Decoration*/
div#container>div.header {
@@ -139,31 +138,31 @@
}
div#container div.header div.logo {
- background-image: url( /simple/images/logo-header.gif );
+ background-image: url( /simple-portal/images/logo-header.gif );
background-repeat: no-repeat;
background-position: top left;
- height:40px;
+ height: 40px;
}
div#container div.header div.pc20 {
- text-align: right;
+ text-align: right;
}
div#container div.header div.pc20 img {
- margin: 5px 10px 0 0;
+ margin: 5px 10px 0 0;
}
div#container div.nav {
- background-image: url( /simple/images/nav-bg.gif );
+ background-image: url( /simple-portal/images/nav-bg.gif );
background-repeat: repeat-x;
background-position: top left;
border-top: 1px solid #878787;
border-bottom: 1px solid #383838;
- height:24px;
+ height: 24px;
}
div#container div.nav ul {
- height:24px;
+ height: 24px;
margin: 0 0 0 10px;
}
@@ -171,34 +170,32 @@
display: inline;
float: left;
text-align: center;
- height: 24px;
- /*border: 1px solid #929292;*/
+ height: 24px; /*border: 1px solid #929292;*/
}
div#container div.nav ul li a,
-div#container div.nav ul li a:hover {
+ div#container div.nav ul li a:hover {
display: block;
- height:16px;
+ height: 16px;
padding: 5px 14px 4px 14px;
background-repeat: repeat-x;
background-position: top left;
- text-decoration:none;
+ text-decoration: none;
font: bold 11px;
}
-div#container div.nav ul li a{
- color: #fff;
- /*background-image: url( /simple/images/inactive-button-bg.gif );*/
+div#container div.nav ul li a {
+ color: #fff; /*background-image: url( /simple-portal/images/inactive-button-bg.gif );*/
}
div#container div.nav ul li a:hover,
-div#container div.nav ul li a.selected{
+ div#container div.nav ul li a.selected {
color: #fff;
- background-image: url( /simple/images/active-button2-bg.gif );
+ background-image: url( /simple-portal/images/active-button2-bg.gif );
}
div#container div#content {
- background-image: url( /simple/images/portal-bg.gif );
+ background-image: url( /simple-portal/images/portal-bg.gif );
background-repeat: repeat-x;
background-position: top left;
min-height: 600px;
@@ -207,46 +204,46 @@
/*-------------------------------Portlet Decoration*/
-div#container div#content div.portlet{
+div#container div#content div.portlet {
border: 1px solid #969696;
background-color: #e2e2e2;
padding: 2px;
- float:left;
- margin:10px;
+ float: left;
+ margin: 10px;
width: 95%;
}
-div#container div#content div.portlet-frame{
+div#container div#content div.portlet-frame {
background-color: #fff;
border: 1px solid #fff;
}
div#container div#content div.portlet div.header {
- background-image: url( /simple/images/portlet-titlebg.gif );
+ background-image: url( /simple-portal/images/portlet-titlebg.gif );
background-repeat: repeat-x;
background-position: top left;
- height:20px;
+ height: 20px;
}
div#container div#content div.portlet div.header div.header-layer {
- background-image: url( /simple/images/portlet-title-rt-bg.gif );
+ background-image: url( /simple-portal/images/portlet-title-rt-bg.gif );
background-repeat: no-repeat;
background-position: top right;
- height:20px;
+ height: 20px;
}
-div#container div#content div.portlet div.header div.header-layer div.title h2{
+div#container div#content div.portlet div.header div.header-layer div.title h2 {
font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
color: #fff;
padding: 2px;
}
-div#container div#content div.portlet div.header div.header-layer div.controls{
+div#container div#content div.portlet div.header div.header-layer div.controls {
text-align: right;
padding: 3px 0 0 0;
}
-div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button{
+div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button {
text-align: right;
padding: 0 5px 0 0;
}
@@ -254,7 +251,7 @@
div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button a {
color: #e1d77e;
font: normal 11px;
- text-decoration:none;
+ text-decoration: none;
}
/*----------------------------------Error portlet*/
@@ -285,7 +282,7 @@
color: #cc1100
}
-div.exception code{
+div.exception code {
color: #33ff00;
}
@@ -308,5 +305,5 @@
}
div.remote-container ul li a {
- color: #332299
+ color: #332299
}
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp 2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp 2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,30 +1,32 @@
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<title>Portlet Container 2.0</title>
-<link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/>
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/shadowbox.css" />
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/prototype.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/scriptaculous/scriptaculous.js?load=effects"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox-prototype.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox.js"></script>
+ <title>Portlet Container 2.0</title>
+ <link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/>
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/shadowbox.css"/>
+ <script type="text/javascript" src="${pageContext.request.contextPath}/js/prototype.js"></script>
+ <script type="text/javascript"
+ src="${pageContext.request.contextPath}/js/scriptaculous/scriptaculous.js?load=effects"></script>
+ <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox-prototype.js"></script>
+ <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox.js"></script>
<script type="text/javascript">
window.onload = function(){
- Shadowbox.init();
+ Shadowbox.init();
};
</script>
-<portal:headers/>
+ <portal:headers/>
</head>
<body>
<div id="container" class="full-width">
<div class="header full-width">
<div class="float-left three-quarter-width logo"></div>
- <div class="float-right quarter-width pc20"><img src="/simple/images/pc20.gif" alt="Portlet Container 2.0"/></div>
+ <div class="float-right quarter-width pc20"><img src="${pageContext.request.contextPath}/images/pc20.gif"
+ alt="Portlet Container 2.0"/></div>
<br class="clear"/>
</div>
<%@ include file="nav/main.jsp" %>
16 years, 8 months