JBoss Portal SVN: r11731 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/main/org/jboss/portal/core/admin/ui/actions and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-08-23 11:47:32 -0400 (Sat, 23 Aug 2008)
New Revision: 11731
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
Log:
- Finished first step of event wiring creation. Back-end is currently failing...
- Fixed CoordinationAction.addEventInfoFor which wasn't using the propery key type.
- Minor clean-ups.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-08-22 16:26:52 UTC (rev 11730)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-08-23 15:47:32 UTC (rev 11731)
@@ -67,8 +67,6 @@
*/
void setEventWiringImplicitMode(PageContainer pageContainer, boolean mode) throws IllegalCoordinationException;
-
-
/**
* Checks if implicit event wiring is enabled for a given page container. May return null if no implicit mode is not
* set for this portal object
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-22 16:26:52 UTC (rev 11730)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-23 15:47:32 UTC (rev 11731)
@@ -51,6 +51,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -60,10 +61,10 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.Iterator;
/**
* @author <a href="mailto:whales@redhat.com">Wesley Hales</a>
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 777 $
*/
public class CoordinationAction
@@ -74,14 +75,6 @@
private List<String> selectedWindows;
- private Map<String, EventWiringInfo> eventWirings;
- private Map<String, DisplayEventWiring> displayEventWirings;
-
- private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowSources;
- private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowDestinations;
-
- private List<? extends SelectItem> selectedSourceEvents;
-
private Map<String, String> aliasBindings;
private Map<String, Map<String, String>> windowBindings;
@@ -98,6 +91,18 @@
private String windowBindingName;
+ private Map<String, EventWiringInfo> eventWirings;
+ private Map<String, DisplayEventWiring> displayEventWirings;
+
+ private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowSources;
+ private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowDestinations;
+
+ private List<String> selectedSourceEvents;
+ private List<String> selectedSourceWindows;
+ private List<String> selectedDestinationEvents;
+ private List<String> selectedDestinationWindows;
+ private EventWiringInfoCreator currentWiring;
+
public PortalObjectId getSelectedObjectId()
{
//since this backing bean is in session, always check for new object request
@@ -239,9 +244,8 @@
loadWindowBindings();
//aliasbindings prep for ui
- for (Object o : pomb.getCoordinationService().getAliasBindings(page))
+ for (AliasBindingInfo abInfo : pomb.getCoordinationService().getAliasBindings(page))
{
- AliasBindingInfo abInfo = (AliasBindingInfo)o;
for (QName name : abInfo.getNames())
{
getAliasBindings().put(name.getNamespaceURI(), name.getNamespaceURI());
@@ -254,7 +258,6 @@
for (PortalObject po : page.getChildren(PortalObject.WINDOW_MASK))
{
Window window = (Window)po;
- String temp = window.getId() + "";
windows.put(window.getName(), window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT));
if (ContentType.PORTLET.equals(window.getContentType()))
{
@@ -264,9 +267,8 @@
// retrieve metadata on public render parameters
NavigationInfo navInfo = info.getNavigation();
- for (Object o : navInfo.getPublicParameters())
+ for (ParameterInfo pInfo : navInfo.getPublicParameters())
{
- ParameterInfo pInfo = (ParameterInfo)o;
availableRenderParameters.put(pInfo.getName().toString(), pInfo.getName().toString());
}
@@ -297,11 +299,12 @@
}
for (QName qName : windowEvents.keySet())
{
- SortedSet<WindowSelectItem> windows = existing.get(qName);
+ QNameSelectItem item = new QNameSelectItem(qName);
+ SortedSet<WindowSelectItem> windows = existing.get(item);
if (windows == null)
{
windows = new TreeSet<WindowSelectItem>();
- existing.put(new QNameSelectItem(qName), windows);
+ existing.put(item, windows);
}
windows.add(new WindowSelectItem(window));
}
@@ -404,12 +407,27 @@
}
}
+ public void selectSourceWindows(ValueChangeEvent event)
+ {
+ System.out.println("selectWindows");
+ System.out.println("old value = " + event.getOldValue());
+ System.out.println("new value = " + event.getNewValue());
+ }
- public Map<String, EventWiringInfo> getEventWirings()
+ public void selectDestinationEvents(ValueChangeEvent event)
{
- return eventWirings;
+ System.out.println("selectDestinationEvents");
+ System.out.println("old value = " + event.getOldValue());
+ System.out.println("new value = " + event.getNewValue());
}
+ public void selectDestinationWindows(ValueChangeEvent event)
+ {
+ System.out.println("selectDestinationWindows");
+ System.out.println("old value = " + event.getOldValue());
+ System.out.println("new value = " + event.getNewValue());
+ }
+
public Collection<DisplayEventWiring> getDisplayEventWirings()
{
if (displayEventWirings == null)
@@ -425,44 +443,185 @@
public List<QNameSelectItem> getSourceEvents()
{
- if (eventNameToWindowSources == null)
+ // create new wiring
+ currentWiring = new EventWiringInfoCreator();
+
+ // return list of produced events
+ return getPossibleEvents(eventNameToWindowSources);
+ }
+
+ public List<QNameSelectItem> getDestinationEvents()
+ {
+ // at this point, we have the sources selected, populate new wiring
+ Map<Window, QName> sources = getMappingForWiring(selectedSourceWindows, selectedSourceEvents);
+ currentWiring.setSources(sources);
+
+ return getPossibleEvents(eventNameToWindowDestinations);
+ }
+
+ private List<QNameSelectItem> getPossibleEvents(Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindows)
+ {
+ if (eventNameToWindows == null)
{
return Collections.emptyList();
}
+
List<QNameSelectItem> result = new LinkedList<QNameSelectItem>();
- result.addAll(eventNameToWindowSources.keySet());
+ result.addAll(eventNameToWindows.keySet());
Collections.sort(result);
return result;
}
+ /**
+ * Format selected information into something that can be used to construct a new event wiring.
+ *
+ * @param selectedWindows
+ * @param selectedEvents
+ * @return
+ */
+ private Map<Window, QName> getMappingForWiring(List<String> selectedWindows, List<String> selectedEvents)
+ {
+ if (selectedWindows != null)
+ {
+ if (selectedObject == null)
+ {
+ throw new IllegalStateException("A page should have been selected!");
+ }
+
+ Map<Window, QName> windowQNameMap = new HashMap<Window, QName>(selectedWindows.size());
+ for (String windowName : selectedWindows)
+ {
+ Window window = (Window)selectedObject.getChild(windowName);
+ windowQNameMap.put(window, QName.valueOf(selectedEvents.get(0)));
+ }
+
+ return windowQNameMap;
+ }
+
+ return Collections.emptyMap();
+ }
+
public List<WindowSelectItem> getSourceWindows()
{
- if (eventNameToWindowSources == null)
+ return getPossibleWindows(eventNameToWindowSources, selectedSourceEvents);
+ }
+
+ public List<WindowSelectItem> getDestinationWindows()
+ {
+ return getPossibleWindows(eventNameToWindowDestinations, selectedDestinationEvents);
+ }
+
+ private List<WindowSelectItem> getPossibleWindows(Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindows, List<String> selectedEventNames)
+ {
+ if (eventNameToWindows == null)
{
return Collections.emptyList();
}
- List<WindowSelectItem> result = new LinkedList<WindowSelectItem>();
- for (Object o : eventNameToWindowSources.entrySet())
+
+ if (selectedEventNames != null)
{
- //todo - implement
+ List<WindowSelectItem> result = new LinkedList<WindowSelectItem>();
+ for (String qNameAsString : selectedEventNames)
+ {
+ result.addAll(eventNameToWindows.get(new QNameSelectItem(QName.valueOf(qNameAsString))));
+ }
+
+ Collections.sort(result);
+ return result;
}
- Collections.sort(result);
- return result;
+ return Collections.emptyList();
}
-
-
- public List<? extends SelectItem> getSelectedSourceEvents()
+ public List<String> getSelectedSourceEvents()
{
return selectedSourceEvents;
}
- public void setSelectedSourceEvents(List<? extends SelectItem> selectedSourceEvents)
+ public void setSelectedSourceEvents(List<String> selectedSourceEvents)
{
this.selectedSourceEvents = selectedSourceEvents;
}
+ public List<String> getSelectedSourceWindows()
+ {
+ return selectedSourceWindows;
+ }
+
+ public void setSelectedSourceWindows(List<String> selectedSourceWindows)
+ {
+ this.selectedSourceWindows = selectedSourceWindows;
+ }
+
+ public List<String> getSelectedDestinationEvents()
+ {
+ return selectedDestinationEvents;
+ }
+
+ public void setSelectedDestinationEvents(List<String> selectedDestinationEvents)
+ {
+ this.selectedDestinationEvents = selectedDestinationEvents;
+ }
+
+ public List<String> getSelectedDestinationWindows()
+ {
+ return selectedDestinationWindows;
+ }
+
+ public void setSelectedDestinationWindows(List<String> selectedDestinationWindows)
+ {
+ this.selectedDestinationWindows = selectedDestinationWindows;
+ }
+
+ public String getWiringName()
+ {
+ if (currentWiring == null)
+ {
+ return null;
+ }
+
+ return currentWiring.getName();
+ }
+
+ public void setWiringName(String eventWiringName)
+ {
+ if (currentWiring != null)
+ {
+ currentWiring.setName(eventWiringName);
+
+ // we also now have the information to build the destinations
+ Map<Window, QName> destinations = getMappingForWiring(selectedDestinationWindows, selectedDestinationEvents);
+ currentWiring.setDestinations(destinations);
+ }
+ }
+
+ public String createWiring()
+ {
+ if (currentWiring != null)
+ {
+ try
+ {
+ pomb.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName());
+ }
+ catch (IllegalCoordinationException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
+ return null;
+ }
+
+ public String cancelWiring()
+ {
+ currentWiring = null;
+ selectedSourceEvents = null;
+ selectedSourceWindows = null;
+ selectedDestinationEvents = null;
+ selectedDestinationWindows = null;
+
+ return null;
+ }
+
public String deleteWiring()
{
String wiring = getFacesParam("wiring");
@@ -546,20 +705,31 @@
{
public WindowSelectItem(Window window)
{
- super(window, window.getName());
+ super(window.getName(), window.getName());
}
public int compareTo(Object o)
{
WindowSelectItem other = (WindowSelectItem)o;
- return getWindow().getName().compareTo(other.getWindow().getName());
+ return getLabel().compareTo(other.getLabel());
}
- public Window getWindow()
+ @Override
+ public int hashCode()
{
- return (Window)getValue();
+ return getLabel().hashCode();
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof WindowSelectItem)
+ {
+ return false;
+ }
+ WindowSelectItem item = (WindowSelectItem)obj;
+ return getLabel().equals(item.getLabel());
+ }
}
public static class QNameSelectItem extends SelectItem implements Comparable
@@ -598,6 +768,51 @@
}
}
+ private static class EventWiringInfoCreator implements EventWiringInfo
+ {
+ private String name;
+ private Map<Window, QName> sources;
+ private Map<Window, QName> destinations;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public Map<Window, QName> getSources()
+ {
+ return sources;
+ }
+
+ public void setSources(Map<Window, QName> sources)
+ {
+ this.sources = sources;
+ }
+
+ public Map<Window, QName> getDestinations()
+ {
+ return destinations;
+ }
+
+ public void setDestinations(Map<Window, QName> destinations)
+ {
+ this.destinations = destinations;
+ }
+ }
+
+ public static class QNameComparator implements Comparator<QName>
+ {
+ public int compare(QName o1, QName o2)
+ {
+ return o1.toString().compareTo(o2.toString());
+ }
+ }
+
// Parameter Binding
public boolean isParameterImplicitEnabled()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-22 16:26:52 UTC (rev 11730)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-23 15:47:32 UTC (rev 11731)
@@ -10,8 +10,7 @@
<ui:define name="content">
<div class="tenpx-top-bottom">
- <h2
- class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
+ <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
<!-- Create parameter binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3>
@@ -114,18 +113,37 @@
<!-- Create new event wiring -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>
<h:form>
- <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}">
+ <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}" immediate="true"
+ valueChangeListener="#{coordinationAction.selectSourceWindows}" onchange="this.form.submit()">
<f:selectItems value="#{coordinationAction.sourceEvents}"/>
</h:selectManyListbox>
- <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}">
+ <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceWindows}"
+ rendered="#{!empty coordinationAction.selectedSourceEvents}" immediate="true"
+ valueChangeListener="#{coordinationAction.selectDestinationEvents}" onchange="this.form.submit()">
<f:selectItems value="#{coordinationAction.sourceWindows}"/>
</h:selectManyListbox>
+
+ <h:selectManyListbox size="5" value="#{coordinationAction.selectedDestinationEvents}"
+ rendered="#{!empty coordinationAction.selectedSourceWindows}" immediate="true"
+ valueChangeListener="#{coordinationAction.selectDestinationEvents}" onchange="this.form.submit()">
+ <f:selectItems value="#{coordinationAction.destinationEvents}"/>
+ </h:selectManyListbox>
+
+ <h:selectManyListbox size="5" value="#{coordinationAction.selectedDestinationWindows}"
+ rendered="#{!empty coordinationAction.selectedDestinationEvents}" immediate="true"
+ valueChangeListener="#{coordinationAction.selectDestinationWindows}" onchange="this.form.submit()">
+ <f:selectItems value="#{coordinationAction.destinationWindows}"/>
+ </h:selectManyListbox>
+
+ <h:panelGroup rendered="#{!empty coordinationAction.selectedDestinationWindows}">
+ <h:inputText value="#{coordinationAction.wiringName}"/>
+ <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{coordinationAction.createWiring}"
+ styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{coordinationAction.cancelWiring}"
+ styleClass="portlet-form-button"/>
+ </h:panelGroup>
</h:form>
-
- <ui:repeat var="eventWirings" value="#{coordinationAction.displayEventWirings}">
- #{eventWirings}
- </ui:repeat>
<hr/>
<!-- Manage existing wirings -->
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11730 - in docs/enterprise/trunk/Tuning_Guide/en: modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-08-22 12:26:52 -0400 (Fri, 22 Aug 2008)
New Revision: 11730
Added:
docs/enterprise/trunk/Tuning_Guide/en/modules/identity.xml
Modified:
docs/enterprise/trunk/Tuning_Guide/en/master.xml
Log:
Thanks Bolek. Adding info about login caching.
Modified: docs/enterprise/trunk/Tuning_Guide/en/master.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/master.xml 2008-08-22 15:35:30 UTC (rev 11729)
+++ docs/enterprise/trunk/Tuning_Guide/en/master.xml 2008-08-22 16:26:52 UTC (rev 11730)
@@ -18,6 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/overview.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/jbossweb.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/hibernate.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/identity.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/clustering.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/jvm.xml" />
</book>
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/identity.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/identity.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/identity.xml 2008-08-22 16:26:52 UTC (rev 11730)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="identity">
+
+ <title>Identity</title>
+
+ <sect1>
+ <title>Cache Login Credentials</title>
+ EPP uses JaasSecurityManagerService to obtain current users
+ roles that are cached by JAAS during authentication. So altering
+ cache invalidation can affect performance. Please see the details at
+ <ulink
+ url="http://wiki.jboss.org/wiki/CachingLoginCredentials">
+ </ulink>.
+ </sect1>
+
+ <sect1>
+ <title>Miscellaneous</title>
+
+ </sect1>
+</chapter>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11729 - branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-08-22 11:35:30 -0400 (Fri, 22 Aug 2008)
New Revision: 11729
Modified:
branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
Log:
Fixing test case
Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2008-08-22 11:27:01 UTC (rev 11728)
+++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2008-08-22 15:35:30 UTC (rev 11729)
@@ -36,14 +36,14 @@
public void test01() throws Exception
{
NetvibesQuery q = new NetvibesQuery(0, 10, "14", "top", "foo");
- assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&count=10&cat=...", q.buildQueryURL().toString());
+ assertEquals("http://api.eco.netvibes.com/search/?type=uwa&limit=10&category=14&sort=to...", q.buildQueryURL().toString());
}
public void test02() throws Exception
{
NetvibesQuery q = new NetvibesQuery(1, 11, "5", "foo", "bar");
- assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&start=1&count...", q.buildQueryURL().toString());
+ assertEquals("http://api.eco.netvibes.com/search/?type=uwa&limit=10&category=14&sort=to...", q.buildQueryURL().toString());
}
public void test03()
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11728 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-08-22 07:27:01 -0400 (Fri, 22 Aug 2008)
New Revision: 11728
Modified:
branches/JBoss_Portal_Branch_2_7/build/distrib.xml
Log:
Portlet 2.0 samples where missing
Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-08-21 20:44:23 UTC (rev 11727)
+++ branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-08-22 11:27:01 UTC (rev 11728)
@@ -271,6 +271,7 @@
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-portlet-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/>
</copy>
<mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/>
@@ -305,6 +306,7 @@
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-portlet-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/>
</copy>
<mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11727 - in docs/enterprise/trunk/Tuning_Guide: en and 1 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-08-21 16:44:23 -0400 (Thu, 21 Aug 2008)
New Revision: 11727
Added:
docs/enterprise/trunk/Tuning_Guide/.project
docs/enterprise/trunk/Tuning_Guide/en/modules/clustering.xml
docs/enterprise/trunk/Tuning_Guide/en/modules/hibernate.xml
docs/enterprise/trunk/Tuning_Guide/en/modules/jbossweb.xml
docs/enterprise/trunk/Tuning_Guide/en/modules/jvm.xml
docs/enterprise/trunk/Tuning_Guide/en/modules/overview.xml
Removed:
docs/enterprise/trunk/Tuning_Guide/en/modules/sample.xml
Modified:
docs/enterprise/trunk/Tuning_Guide/en/master.xml
Log:
first draft of EPP tuning guide
Added: docs/enterprise/trunk/Tuning_Guide/.project
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/.project (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/.project 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Tuning_Guide</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Modified: docs/enterprise/trunk/Tuning_Guide/en/master.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/master.xml 2008-08-21 13:20:40 UTC (rev 11726)
+++ docs/enterprise/trunk/Tuning_Guide/en/master.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -3,18 +3,21 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<book lang="en">
<bookinfo>
- <title>Change Title in master.xml</title>
- <subtitle>Change SubTitle in master.xml</subtitle>
- <releaseinfo>Change Release Info in master.xml</releaseinfo>
- <releaseinfo>Change Release Info Date in master.xml</releaseinfo>
+ <title>JBoss Enterprise Portal Platform (EPP)</title>
+ <subtitle>Performance and Scalability Tuning Guide</subtitle>
+ <releaseinfo> 2.7 releases</releaseinfo>
+ <date> August 2008</date>
<author>
- <firstname>Your first name</firstname>
- <surname>Your last name</surname>
- <email>your.email(a)your.domain.com</email>
+ <firstname>Prabhat</firstname>
+ <surname>Jha</surname>
+ <email>pjha(a)redhat.com</email>
</author>
</bookinfo>
<toc/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/sample.xml" />
-
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/overview.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/jbossweb.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/hibernate.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/clustering.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/jvm.xml" />
</book>
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/clustering.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/clustering.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/clustering.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="clustering">
+
+ <title>Clustering Tuning</title>
+
+ <sect1>
+ <title>
+ Enable Buddy Replication for Portal and Portlet Session
+ Clustering
+ </title>
+ Portal and Portlet Session are merely wrappers around
+ HttpSession so most of HTTP session clustering optimization
+ applies to JBPP as well. EPP uses clustering configuration of
+ JBoss Web so changes go to
+ <filename>
+ jboss-web-cluster.sar/META-INF/jboss-service.xml
+ </filename>
+ . To enable buddy replication, change the value of
+ <emphasis>buddyReplicationEnabled</emphasis>
+ to true.
+
+ </sect1>
+
+ <sect1>
+ <title>Hibernate and JBoss Cache Configuration</title>
+
+ EPP uses JBoss Cache as a second level cache for Hibernate and
+ this configuration is not defined in JBoss Cache definition used
+ for Portal and Portlet Session. Instead the configuration is
+ defined at
+ <filename>
+ jboss-portal-ha.sar/META-INF/jboss-service.xml
+ </filename>
+
+ <sect2>
+ <title>Optimistic Locking (OL)</title>
+ Our tests have shown that optimistic locking performs better
+ under heavy load and it scales (horizontally) better as
+ well. However, your use case may not show the same behavior
+ and for you pessimistic locking may be a better
+ configuration. To enable optimistic locking, modify
+ TreeCache mbean definition as follows:
+ <programlisting role="XML">
+ <![CDATA[
+ <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="CacheMode">INVALIDATION_SYNC</attribute>
+ ]]>
+ </programlisting>
+
+ <note>
+ If you have not disabled query cache, then you should
+ not use INVALIATION_SYNC as CACHE_MODE. Use REPL_SYNC
+ instead.
+ </note>
+
+ </sect2>
+ <sect2>
+ <title>Pessimistic Locking (PL)</title>
+ When using Pessimistic Locking (PL), change isolation level
+ to READ_COMMITTED (RC). Please see <ulink url="http://lists.jboss.org/pipermail/jbosscache-dev/2008-July/002401.html"></ulink>
+ to see why it is okay to relax the isolation level from
+ REPEATABLE_READ (RR). As expected, RC has better performance than RR.
+ </sect2>
+
+ <sect2>
+ <title>Cache Eviction Policy</title>
+ If you disabled lazy loading, then you can control number of
+ objects and time they can reside in memory by configuring
+ EvictionPolicyConfig attribute of TreeCache at
+ <filename>
+ jboss-portal- ha.sar/META-INF/jboss-service.xml
+ </filename>
+
+ <programlisting role="XML">
+ <![CDATA[
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">5</attribute>
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </region>
+ </config>
+ </attribute>
+ ]]>
+ </programlisting>
+ </sect2>
+
+ </sect1>
+</chapter>
+
+
+
+
+
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/hibernate.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/hibernate.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/hibernate.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="hibernate">
+
+ <title>Hibernate Tuning</title>
+
+ <sect1>
+ <title>Enable/Disable Lazy Loading</title>
+ EPP assumes that number of portal pages and portlets window will
+ be large and hence does not cache these objects. As a result,
+ there could be many direct DB connection. But depending on use
+ case, lazy loading should be turned on and off partially or in
+ its entirety. Modify
+ <filename>
+ deploy/jboss-portal[-ha].sar/conf/hibernate/*/domain.hbm.xml
+ </filename>
+ and change
+ <emphasis>lazy=”extra”</emphasis>
+ to
+ <emphasis>lazy=”true”</emphasis>
+ or
+ <emphasis>lazy=”false”</emphasis>
+ <orderedlist numeration="upperroman">
+ <listitem>
+ Modify attribute for the class
+ org.jboss.portal.core.impl.model.portal.ObjectNode
+ <programlisting role="XML">
+ <![CDATA[
+ <map name="children" inverse="true" cascade="none" fetch="select" lazy="true">
+ <cache usage="transactional" /> //[“read-write” in non clustered]
+ <key column="PARENT_KEY" />
+ <map-key type="org.jboss.portal.jems.hibernate.MagicString" column="NAME" />
+ <one-to-many class="org.jboss.portal.core.impl.model.portal.ObjectNode" />
+ </map>
+ ]]>
+ </programlisting>
+ </listitem>
+ <listitem>
+ Enable caching for displayNames for the class
+ org.jboss.portal.core.impl.model.portal.PortalObjectImpl
+ <programlisting role="XML">
+ <![CDATA[
+ <map name="displayNames" cascade="none" fetch="select" lazy="true"
+ table="JBP_PORTAL_OBJECT_DNAMES">
+ <cache usage="transactional" /> <!-- [“read-write” in non clustered]-->
+ <key column="INSTANCE_PK" />
+ <map-key type="locale" column="LOCALE" />
+ <element type="string" column="TEXT" />
+ </map>
+ ]]>
+ </programlisting>
+ </listitem>
+ <listitem>
+ Same as above for
+ <filename>hibernate/instance/domain.hbm.xml</filename>
+ for displayNames map.
+ </listitem>
+ <listitem>
+ Enable/disable lazy loading for set “users” in
+ <filename>hibernate/user/domain.hbm.xml</filename>
+ </listitem>
+ <listitem>
+ Disabling lazy loading implies there will be many
+ objects in memory. You can control how many objects
+ would need to reside in memory at a time and for how
+ long before they are evicted by modifying values at
+ <filename>conf/hibernate/*/ehcache.xml</filename>
+ in non clustered configuration. These parameters would
+ need to be changed as per the use case. For clustered
+ configuration, see the chapter on <xref linkend="clustering"> clustering
+ configuration.</xref>
+ </listitem>
+ </orderedlist>
+ </sect1>
+
+ <sect1>
+ <title>Enable/Disable Query Cache</title>
+ EPP no longer uses query cache. Unless EPP is customized to use
+ query cache, it should be disabled by turning the value of
+ property "cache.use_query_cache" to false in following files:
+
+ <itemizedlist>
+ <listitem><filename>hibernate/instance/hibernate.cfg.xml </filename></listitem>
+ <listitem><filename>hibernate/portal/hibernate.cfg.xml </filename></listitem>
+ <listitem><filename>hibernate/portlet/hibernate.cfg.xml</filename></listitem>
+ <listitem><filename>hibernate/user/hibernate.cfg.xml</filename></listitem>
+ </itemizedlist>
+
+ Disabling query cache also allows to use<emphasis>INVALIDATION_SYNC</emphasis> as
+ CACHE_MODE when using optimistic locking with JBoss Cache and
+ Hibernate as explained in the clustering section.
+ </sect1>
+</chapter>
+
+
+
+
+
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/jbossweb.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/jbossweb.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/jbossweb.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="jbossweb">
+
+ <title>JBoss Web Tuning</title>
+
+ <sect1>
+ <title> HTTP/AJP connector threads </title>
+ Increase number of HTTP/AJP connector threads. It's recommended
+ to set this value to <emphasis> 250 * n </emphasis> where n is number of CPU in your
+ server. Depending on nature of your application, this can be set
+ higher or lower. Modify value of maxThreads in in
+ <filename>deploy/jboss-web.deployer/server.xml</filename>
+
+ <programlisting role="XML">
+ <![CDATA[
+ <Connector port="8009" address="${jboss.bind.address}"
+ protocol="AJP/1.3" emptySessionPath="true" enableLookups="false"
+ redirectPort="8443" maxThreads="1500" />
+ ]]>
+
+ </programlisting>
+ </sect1>
+
+ <sect1>
+ <title> Global Session Timeout </title>
+ Reduce global session timeout to your need. The default value of
+ 30 min is too high for most use cases. A lower session timeout
+ results into a more consistent memory footprint and more
+ consistent throughput. Modify
+ <filename>deploy/jboss-web.deployer/conf/web.xml</filename>
+ <programlisting role="XML">
+ <![CDATA[
+ <session-config>
+ <session-timeout>15</session-timeout>
+ </session-config>
+ ]]>
+ </programlisting>
+ </sect1>
+</chapter>
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/jvm.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/jvm.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/jvm.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="jvm">
+
+ <title>JVM Tuning</title>
+
+ <sect1>
+ <title>Use Large Pages</title>
+ When using 64 bit Linux systems , use Linux's large memory page
+ support. Without large page support, increasing heap size may
+ not increase your performance. Modify JAVA_OPTS under
+ <filename>$JBOSS_HOME/bin/run.conf</filename>
+ to add -XX:+ UseLargePages. Please see EAP tuning guide or the
+ description at
+ <ulink
+ url="http://jbossworld.com/downloads/pdf/thursday/JBOSS_10-1050am_JBoss_Enterp...">
+ </ulink>
+ for the details.
+ </sect1>
+
+ <sect1>
+ <title>Garbage Collection (GC) Tuning</title>
+ Depending on nature of your application, adding <emphasis> XX:+UseConcMarkSweepGC -XX:+UseParNewGC </emphasis>
+ may optimize GC collection behavior.
+ </sect1>
+</chapter>
Added: docs/enterprise/trunk/Tuning_Guide/en/modules/overview.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/overview.xml (rev 0)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/overview.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="overview">
+ <title>Overview</title>
+ <para>
+ Since JBoss Enterprise Portal Platform (EPP) uses many services
+ of JBoss Enterprise Application Platform (EAP), all tunings and
+ configurations that are recommended for EAP apply to EPP as well
+ hence most of those tunings will not be covered here. Following
+ is a guideline that may help achieve best out of EPP.
+ </para>
+
+ <para>
+ This document is intended for Portlet Developers, Portal
+ administrators, and those wishing to implement/extend the JBoss
+ Portal framework.
+ </para>
+
+
+</chapter>
Deleted: docs/enterprise/trunk/Tuning_Guide/en/modules/sample.xml
===================================================================
--- docs/enterprise/trunk/Tuning_Guide/en/modules/sample.xml 2008-08-21 13:20:40 UTC (rev 11726)
+++ docs/enterprise/trunk/Tuning_Guide/en/modules/sample.xml 2008-08-21 20:44:23 UTC (rev 11727)
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="sample">
- <chapterinfo>
- <author>
- <firstname>Your first name</firstname>
- <surname>Your last name</surname>
- <email>your.email(a)your.domain.com</email>
- </author>
- </chapterinfo>
- <title>Sample chapter</title>
- <para>This is the beginning of the sample chapter.</para>
- <sect1>
- <title>sample section</title>
- <para>This is the beginning of the sample section. It contains examples of how docbook should be used in the context
- of a documentation for a Java related product.</para>
-
- <sect2>
- <title>Bullet points</title>
- <programlisting><![CDATA[
-<itemizedlist>
- <listitem>Item1</listitem>
- <listitem>Item2</listitem>
- <listitem>Item3</listitem>
-</itemizedlist>
-]]></programlisting>
- <para>
- <itemizedlist>
- <listitem>Item1</listitem>
- <listitem>Item2</listitem>
- <listitem>Item3</listitem>
- </itemizedlist>
- </para>
- </sect2>
-
- <sect2>
- <title>Interface or annotation reference</title>
- <programlisting><![CDATA[
-<interfacename>mypackage.MyInterface</interfacename>
-<interfacename>@MyAnnotation</interfacename>
-]]></programlisting>
- <para>
- <interfacename>mypackage.MyInterface</interfacename>
- <interfacename>@MyAnnotation</interfacename>
- </para>
- </sect2>
-
- <sect2>
- <title>Class reference</title>
- <programlisting><![CDATA[
-<classname>mypackage.MyClass</classname>
-]]></programlisting>
- <para>
- <classname>mypackage.MyClass</classname>
- </para>
- </sect2>
-
- <sect2>
- <title>Parameter reference</title>
- <programlisting><![CDATA[
-<parameter>MyParameter</parameter>
-]]></programlisting>
- <para>
- <parameter>MyParameter</parameter>
- </para>
- </sect2>
-
- <sect2>
- <title>Method referece</title>
- <programlisting><![CDATA[
-<methodname>myMethod()</methodname>
-]]></programlisting>
- <para>
- <methodname>myMethod()</methodname>
- </para>
- </sect2>
-
- <sect2>
- <title>Exception reference</title>
- <programlisting><![CDATA[
-<exceptionname>mypackage.MyException</exceptionname>
-]]></programlisting>
- <para>
- <exceptionname>mypackage.MyException</exceptionname>
- </para>
- </sect2>
-
- <sect2>
- <title>A variable name</title>
- <programlisting><![CDATA[
-<varname>myVariable</varname>
-]]></programlisting>
- <para>
- <varname>myVariable</varname>
- </para>
- </sect2>
-
- <sect2>
- <title>File reference</title>
- <programlisting><![CDATA[
-<filename>MyFile</filename>
-]]></programlisting>
- <para>
- <filename>MyFile</filename>
- </para>
- </sect2>
-
- <sect2>
- <title>Literal reference</title>
- <programlisting><![CDATA[
-<literal>null</literal>
-<literal>1</literal>
-<literal>"foo"</literal>
-]]></programlisting>
- <para>
- <literal>null</literal>
- <literal>1</literal>
- <literal>"foo"</literal>
- </para>
- </sect2>
-
- <sect2>
- <title>A constant</title>
- <programlisting><![CDATA[
-<constant>MAX_VALUE</constant>
-]]></programlisting>
- <para>
- <constant>MAX_VALUE</constant>
- </para>
- </sect2>
-
- <sect2>
- <title>Inline code</title>
- <programlisting><![CDATA[
-<code>System.out.println()</code>
-]]></programlisting>
- <para>
- <code>System.out.println()</code>
- </para>
- </sect2>
-
- <sect2>
- <title>Code or XML with a caption</title>
- <programlisting>
-<example>
- <programlisting><![CDATA[public class MyClass
-{
-}
-]]></programlisting>
- <caption>This is the MyClass class</caption>
-</example>
-</programlisting>
- <para>
- <example>
- <programlisting><![CDATA[public class MyClass
-{
-}
-]]></programlisting>
- <caption>This is the MyClass class</caption>
- </example>
- </para>
- </sect2>
-
- <sect2>
- <title>A database name</title>
- <programlisting><![CDATA[
-<database>MyDatabase</database>
-]]></programlisting>
- <para>
- <database>MyDatabase</database>
- </para>
- </sect2>
-
- <sect2>
- <title>A shell command</title>
- <programlisting><![CDATA[
-<command>ls -l</command>
-]]></programlisting>
- <para>
- <command>ls -l</command>
- </para>
- </sect2>
-
- <sect2>
- <title>A shell example</title>
- <programlisting><![CDATA[
-<screen><![CDATA[julien-viets-computer:~/java/jboss-portal-template/user-guide julien$ ls -l
-total 8
-drwxr-xr-x 3 julien julien 102 Oct 19 18:14 build
--rwxr-xr-x 1 julien julien 923 Oct 19 17:40 build.xml
-drwxr-xr-x 6 julien julien 204 Oct 19 17:42 en
-]]></screen>
-]]></programlisting>
- <para>
- <screen><![CDATA[julien-viets-computer:~/java/jboss-portal-template/user-guide julien$ ls -l
-total 8
-drwxr-xr-x 3 julien julien 102 Oct 19 18:14 build
--rwxr-xr-x 1 julien julien 923 Oct 19 17:40 build.xml
-drwxr-xr-x 6 julien julien 204 Oct 19 17:42 en
-]]></screen>
- </para>
- </sect2>
-
- <sect2>
- <title>Coloration</title>
- <programlisting><![CDATA[
-<programlisting role="JAVA"><![CDATA[
-package org.jboss.portal.foo;
-public class Bar
-{
-}]]></programlisting>]]></programlisting>
- <programlisting role="JAVA"><![CDATA[
-package org.jboss.portal.foo;
-public class Bar
-{
-}]]></programlisting>
- </sect2>
- <sect2>
- <title>Annotations</title>
- <programlisting><![CDATA[
-<programlistingco>
- <areaspec>
- <area id="sample.annotation.line2" coords='2' />
- <area id="sample.annotation.line4" coords='4' />
- </areaspec>
- <programlisting><![CDATA[Line 1: Foo
-Line 2: Bar
-Line 3: Toto
-Line 4: FooBar
-Line 5: Titi]]></programlisting>
- <calloutlist>
- <callout arearefs="sample.annotation.line2">
- <para>This is line 2</para>
- </callout>
- <callout arearefs="sample.annotation.line4">
- <para>This is line 4</para>
- </callout>
- </calloutlist>
-</programlistingco>
-]]></programlisting>
- <programlistingco>
- <areaspec>
- <area id="sample.annotation.line2" coords='2' />
- <area id="sample.annotation.line4" coords='4' />
- </areaspec>
- <programlisting><![CDATA[Line 1: Foo
-Line 2: Bar
-Line 3: Toto
-Line 4: FooBar
-Line 5: Titi]]></programlisting>
- <calloutlist>
- <callout arearefs="sample.annotation.line2">
- <para>This is line 2</para>
- </callout>
- <callout arearefs="sample.annotation.line4">
- <para>This is line 4</para>
- </callout>
- </calloutlist>
- </programlistingco>
- </sect2>
- </sect1>
-
-</chapter>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11724 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/main/org/jboss/portal/core/admin/ui and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-08-21 08:14:50 -0400 (Thu, 21 Aug 2008)
New Revision: 11724
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
Log:
Fix NPE with WSRP instances
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-20 19:40:53 UTC (rev 11723)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-21 12:14:50 UTC (rev 11724)
@@ -222,7 +222,7 @@
PortletInfo info = context.getPortletInfo(windowName);
//
- if (info.getEventing().getConsumedEvents().containsKey(event.getName()))
+ if (info.getEventing() != null && info.getEventing().getConsumedEvents().containsKey(event.getName()))
{
PortletWindowEvent distributedEvent = new PortletWindowEvent(event.getName(), event.getPayload(), windowName);
windows.put(context.getWindow(windowName), distributedEvent);
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-08-20 19:40:53 UTC (rev 11723)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-08-21 12:14:50 UTC (rev 11724)
@@ -50,6 +50,7 @@
import org.jboss.portal.portlet.info.EventInfo;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.WindowStateInfo;
@@ -261,7 +262,14 @@
public Object getValue(Object bean) throws IllegalArgumentException
{
Portlet portlet = (Portlet)bean;
- Collection<? extends ParameterInfo> pp = portlet.getInfo().getNavigation().getPublicParameters();
+
+ NavigationInfo navigationInfo = portlet.getInfo().getNavigation();
+ if (navigationInfo == null)
+ {
+ return Collections.emptyList();
+ }
+
+ Collection<? extends ParameterInfo> pp = navigationInfo.getPublicParameters();
if (pp != null)
{
return new ArrayList<ParameterInfo>(pp);
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11723 - branches.
by portal-commits＠lists.jboss.org
Author: mmillson
Date: 2008-08-20 15:40:53 -0400 (Wed, 20 Aug 2008)
New Revision: 11723
Added:
branches/JBoss_Portal_2_6_1_JBPORTAL-2128/
Log:
Create JBPORTAL-2128 patch branch from JBoss_Portal_2_6_1_JBPORTAL-1942 branch
Copied: branches/JBoss_Portal_2_6_1_JBPORTAL-2128 (from rev 11722, branches/JBoss_Portal_2_6_1_JBPORTAL-1942)
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11722 - branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-08-20 15:26:59 -0400 (Wed, 20 Aug 2008)
New Revision: 11722
Modified:
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
Log:
JBPORTAL-2126: Netvibes API has changed, need to adapt to the new one
Modified: branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-20 19:25:05 UTC (rev 11721)
+++ branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-20 19:26:59 UTC (rev 11722)
@@ -72,8 +72,7 @@
}
// Compute query
- int queryStart = currentPage * numberOfResults;
- NetvibesQuery query = new NetvibesQuery(queryStart, numberOfResults + 1, catTerm, sort, queryTerm);
+ NetvibesQuery query = new NetvibesQuery(currentPage, numberOfResults, catTerm, sort, queryTerm);
DirectoryQueryResult queryResults = provider.search(query);
boolean uriPickMethod = false;
@@ -275,7 +274,7 @@
</td>
<td style="text-align: right;">
<% // next page
- if ( queryResults.resultSize() > numberOfResults )
+ if ( queryResults.resultSize() == numberOfResults )
{
PortletURL nextURL = renderResponse.createRenderURL();
nextURL.setParameter("cat", catTerm);
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11721 - in branches/JBoss_Portal_Branch_2_6/widget/src: main/org/jboss/portal/widget/netvibes/provider and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-08-20 15:25:05 -0400 (Wed, 20 Aug 2008)
New Revision: 11721
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml
Log:
JBPORTAL-2126: Netvibes API has changed, need to adapt to the new one
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2008-08-20 19:10:21 UTC (rev 11720)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2008-08-20 19:25:05 UTC (rev 11721)
@@ -65,7 +65,7 @@
private boolean fetchWidgetsOnDirectoryLookup = false;
/** The connection timeout */
- protected int connectionTimeout = 5000;
+ protected int connectionTimeout = 10000;
/** Eviction thread timing */
protected long timing = TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS);
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java 2008-08-20 19:10:21 UTC (rev 11720)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java 2008-08-20 19:25:05 UTC (rev 11721)
@@ -22,21 +22,27 @@
******************************************************************************/
package org.jboss.portal.widget.netvibes.provider;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.common.net.URLTools;
import org.jboss.portal.widget.AbstractWidgetProvider;
import org.jboss.portal.widget.DirectoryQueryResult;
import org.jboss.portal.widget.ExpiringFutureTask;
import org.jboss.portal.widget.Widget;
import org.jboss.portal.widget.WidgetQuery;
import org.jboss.portal.widget.netvibes.directory.NetvibesWidgetCategory;
+import org.jboss.portal.widget.netvibes.json.JSONArray;
+import org.jboss.portal.widget.netvibes.json.JSONException;
+import org.jboss.portal.widget.netvibes.json.JSONObject;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @author <a href="mailto:theute@redhat.com">Thomas Heute</a>
* @version $Revision$
*/
@@ -44,25 +50,40 @@
{
/** The netvibes categories */
- private static final Collection CATEGORIES = Collections.unmodifiableList((List)CollectionBuilder.arrayList()
- .add(new NetvibesWidgetCategory("0", "All"))
- .add(new NetvibesWidgetCategory("4", "News"))
- .add(new NetvibesWidgetCategory("5", "Tools & Reference"))
- .add(new NetvibesWidgetCategory("6", "Communication"))
- .add(new NetvibesWidgetCategory("7", "Arts & Entertainment"))
- .add(new NetvibesWidgetCategory("8", "Fun & Games"))
- .add(new NetvibesWidgetCategory("9", "Shopping"))
- .add(new NetvibesWidgetCategory("10", "Sports"))
- .add(new NetvibesWidgetCategory("11", "Travels"))
- .add(new NetvibesWidgetCategory("12", "Business"))
- .add(new NetvibesWidgetCategory("13", "Lifestyle"))
- .add(new NetvibesWidgetCategory("14", "Technology"))
- .add(new NetvibesWidgetCategory("15", "Sciences"))
- .get());
+ private Collection<NetvibesWidgetCategory> categories;
- public Collection getCategories()
+ public Collection<NetvibesWidgetCategory> getCategories()
{
- return CATEGORIES;
+ if (categories == null)
+ {
+ List<NetvibesWidgetCategory> list = new ArrayList<NetvibesWidgetCategory>();
+ try
+ {
+ URL url = new URL("http://api.eco.netvibes.com/categories?format=json");
+ byte[] bytes = URLTools.getContent(url, connectionTimeout, connectionTimeout);
+ // Create JSONObject
+ JSONObject jsonResponse = new JSONObject(new String(bytes));
+
+ JSONArray array = jsonResponse.getJSONArray("categories");
+
+ for (int i=0; i<array.length(); i++)
+ {
+ JSONObject object = array.getJSONObject(i);
+ list.add(new NetvibesWidgetCategory(object.getString("id"), object.getString("label")));
+ }
+ // TODO: Do not cache forever the list of categories
+ categories = Collections.unmodifiableList(list);
+ }
+ catch (MalformedURLException e)
+ {
+ e.printStackTrace();
+ }
+ catch (JSONException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ return categories;
}
@Override
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2008-08-20 19:10:21 UTC (rev 11720)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2008-08-20 19:25:05 UTC (rev 11721)
@@ -133,18 +133,18 @@
public URL buildQueryURL() throws MalformedURLException
{
// Building url - and only allow UWA compatible widgets (type=uwa)
- StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=" + type);
+ StringBuffer buffer = new StringBuffer("http://api.eco.netvibes.com/search/?type=" + type);
if( start > 0 )
{
- buffer.append("&start=").append(start);
+ buffer.append("&page=").append(start);
}
if (count > 0)
{
- buffer.append("&count=").append(count);
+ buffer.append("&limit=").append(count);
}
if (cat != null)
{
- buffer.append("&cat=").append(cat);
+ buffer.append("&category=").append(cat);
}
if(sort != null)
{
@@ -152,7 +152,7 @@
}
if (q != null)
{
- buffer.append("&q=").append(FastURLEncoder.getUTF8Instance().encode(q));
+ buffer.append("&query=").append(FastURLEncoder.getUTF8Instance().encode(q));
}
return new URL(buffer.toString());
}
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-20 19:10:21 UTC (rev 11720)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-20 19:25:05 UTC (rev 11721)
@@ -67,12 +67,12 @@
String catTerm = request.getParameter("cat");
if (catTerm == null)
{
- catTerm = "0"; // all
+ NetvibesWidgetCategory category = (NetvibesWidgetCategory)provider.getCategories().iterator().next();
+ catTerm = category.getId();
}
// Compute query
- int queryStart = currentPage * numberOfResults;
- NetvibesQuery query = new NetvibesQuery(queryStart, numberOfResults + 1, catTerm, sort, queryTerm);
+ NetvibesQuery query = new NetvibesQuery(currentPage, numberOfResults, catTerm, sort, queryTerm);
DirectoryQueryResult queryResults = provider.search(query);
boolean uriPickMethod = false;
@@ -239,7 +239,7 @@
<tr class="<%= rowClass %>">
<td>
<a
- href="<%= selectURL %>"><%= result.getTitle() %>
+ href="<%= selectURL %>"><%= (result.getTitle() != null) ? result.getTitle() : "Untitled" %>
</a>
</td>
</tr>
@@ -274,7 +274,7 @@
</td>
<td style="text-align: right;">
<% // next page
- if ( queryResults.resultSize() > numberOfResults )
+ if ( queryResults.resultSize() == numberOfResults )
{
PortletURL nextURL = renderResponse.createRenderURL();
nextURL.setParameter("cat", catTerm);
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2008-08-20 19:10:21 UTC (rev 11720)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2008-08-20 19:25:05 UTC (rev 11721)
@@ -35,7 +35,7 @@
<init-param>
<description>Connection timeout when retreiving gadgets from google directory (in milliseconds)</description>
<name>connectionTimeout</name>
- <value>5000</value>
+ <value>10000</value>
</init-param>
<init-param>
<description>Time until a Widget expires and gets refreshed (in minutes). Default value is 6 hours.</description>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11720 - in modules/portlet/trunk: portal/src/main/resources/simple-portal-war/WEB-INF and 23 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-08-20 15:10:21 -0400 (Wed, 20 Aug 2008)
New Revision: 11720
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/config/
modules/portlet/trunk/test/src/test/resources/config/jetty/
modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml
modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties
modules/portlet/trunk/test/src/test/resources/jboss-5.0/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml
Removed:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
Modified:
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/test/servers.xml
Log:
Add JBoss 5.0.x support.
Add preliminary Jetty support (not enabled by default).
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/build/pom.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -34,14 +34,14 @@
<version.jbossxb>2.0.0.CR8</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
<version.jboss.portal.common>1.2.0</version.jboss.portal.common>
- <version.jboss.portal.web>1.2.0</version.jboss.portal.web>
- <version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
+ <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
+ <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>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
<version.jboss.reflect>2.0.0.Beta12</version.jboss.reflect>
- <version.cargo>0.9-portal</version.cargo>
+ <version.cargo>1.0-alpha-5</version.cargo>
<version.junit>3.8.1</version.junit>
<version.ant>1.7.0</version.ant>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
@@ -257,6 +257,11 @@
<version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${version.jboss.reflect}</version>
@@ -293,9 +298,20 @@
<groupId>cargo</groupId>
<artifactId>cargo-manager</artifactId>
<type>war</type>
+ <version>0.9-portal</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
+ <version>${version.cargo}</version>
+ </dependency>
+ <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${version.portlet-api}</version>
Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml (from rev 11719, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml)
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -26,6 +26,10 @@
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">
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
<filter>
<filter-name>ErrorHandlingFilter</filter-name>
<filter-class>org.jboss.portal.portlet.portal.ErrorHandlingFilter</filter-class>
@@ -48,6 +52,6 @@
<servlet>
<servlet-name>ContainerServlet</servlet-name>
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
+ <load-on-startup>1</load-on-startup>
</servlet>
</web-app>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/pom.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -53,10 +53,22 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
@@ -120,6 +132,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.portal.web</groupId>
<artifactId>web-web</artifactId>
<type>jar</type>
@@ -189,12 +213,12 @@
<!-- stuff to run servers for tests -->
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>${version.cargo}</version>
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
@@ -257,12 +281,13 @@
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
<property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
<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}"/>
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
<ant antfile="${basedir}/src/test/build.xml">
<target name="tests"/>
@@ -281,4 +306,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -12,7 +12,8 @@
<echo message="test classpath: ${test_classpath}"/>
<echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss or -D=tests=tomcat"/>
+<!-- <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, -Dtests=tomcat, or -Dtests=jetty"/> -->
+ <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, or -Dtests=tomcat"/>
<antcall target="package-tests"/>
@@ -24,6 +25,7 @@
<target name="tests.call.all" unless="tests">
<antcall target="tests.jboss"/>
<antcall target="tests.tomcat"/>
+<!-- <antcall target="tests.jetty"/> -->
</target>
<target name="tests.call.single" if="tests">
@@ -114,6 +116,22 @@
<path location="${dependency.ccpp.jar}"/>
</path>
+ <path id="jboss-5.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-microcontainer"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ </path>
+
+ <path id="jboss-5.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${dependency.ccpp.jar}"/>
+ </path>
+
<path id="tomcat-6.0">
<path refid="portal-common"/>
<path refid="portal-web"/>
@@ -141,6 +159,33 @@
<path location="${dependency.ccpp.jar}"/>
</path>
+ <path id="jetty-6.1">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.javassist.jar}"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
+ </path>
+
+ <path id="jetty-6.1-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ </path>
+
</target>
<!--Lets make the check in one place so the build fail in the beggining instead of end-->
@@ -173,6 +218,14 @@
</not>
</and>
</condition>
+ <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
+ <and>
+ <isset property="env.JBOSS_5_0_HOME"/>
+ <not>
+ <isset property="JBOSS_5_0_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
<and>
<isset property="env.TOMCAT_6_0_HOME"/>
@@ -181,6 +234,14 @@
</not>
</and>
</condition>
+<!-- <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
+ <and>
+ <isset property="env.JETTY_6_1_HOME"/>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition> -->
<fail message="Please set the environment variable JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
<condition>
@@ -198,6 +259,16 @@
</condition>
</fail>
+ <fail message="Please set the environment variable JBOSS_5_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_5_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<fail message="Please set the environment variable TOMCAT_6_0_HOME">
<condition>
<and>
@@ -208,6 +279,16 @@
</condition>
</fail>
+<!-- <fail message="Please set the environment variable JETTY_6_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail> -->
+
</target>
<macrodef name="package-misc-test">
@@ -412,6 +493,22 @@
<fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/>
</jar>
+ <!-- JBoss 5.0 portlet-test.war -->
+ <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/>
+ </copy>
+ <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
+ <path refid="jboss-5.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jboss-5.0"/>
+ <jar jarfile="${test.temp.lib}/jboss-5.0/portlet-test.war">
+ <fileset dir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <exclude name="**/jboss-kernel*.jar"/>
+ </fileset>
+ </jar>
+
<!-- Tomcat 6.0 portlet-test.war -->
<copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
@@ -425,7 +522,21 @@
<jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war">
<fileset dir="${test.temp.dir}/tomcat-6.0/portlet-test-war"/>
</jar>
+ <!-- Jetty 6.1 portlet-test.war -->
+ <copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ <fileset dir="${target}/test-classes/jetty-6.1/portlet-test-war"/>
+ </copy>
+ <copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
+ <path refid="jetty-6.1"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jetty-6.1"/>
+ <jar jarfile="${test.temp.lib}/jetty-6.1/portlet-test.war">
+ <fileset dir="${test.temp.dir}/jetty-6.1/portlet-test-war"/>
+ </jar>
+
<!-- Strip cargo manager war filename-->
<copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/>
@@ -465,6 +576,7 @@
<configuration home="${test.jboss-4.2.tempdir}">
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
+ <property name="cargo.rmi.port" value="1099"/>
<!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
<deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/>
</configuration>
@@ -536,8 +648,94 @@
</antcall>
</target>
+ <target name="cargo.jboss-5.0.start" depends="cargo.setup">
+ <!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
+ otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
+ layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown
+ reason, the class initiating the loading of the RemoteTestDriver class is
+ org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84)
+ -->
+
+ <property name="jboss-5.0-shared-property" refid="jboss-5.0-shared"/>
+ <echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/>
+
+ <cargo
+ containerId="jboss5x"
+ home="${test.jboss-5.0.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ action="start"
+ wait="${cargo.wait}">
+ <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
+ <sharedClasspath>
+
+ <path refid="jboss-5.0-shared"/>
+
+ </sharedClasspath>
+ <configuration home="${test.jboss-5.0.tempdir}">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.rmi.port" value="1099"/>
+ <property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ <deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.jboss-5.0.stop" depends="cargo.setup">
+ <cargo
+ containerId="jboss5x"
+ home="${test.jboss-5.0.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.startup.log"
+ action="stop">
+ <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
+ <configuration home="${test.jboss-5.0.tempdir}">
+ <property name="cargo.rmi.port" value="1099"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}">
+ <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/>
+ <antcall target="cargo.jboss-5.0.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="test.spi.server.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.deploy.name" value="jboss-5.0-container-servlet"/>
+ </antcall>
+ <antcall target="cargo.jboss-5.0.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}">
+ <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/>
+ <antcall target="cargo.jboss-5.0.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="test.spi.server.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.deploy.name" value="jboss-5.0-generic"/>
+ </antcall>
+ <antcall target="cargo.jboss-5.0.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.jboss-5.0">
+ <antcall target="tests.jboss-5.0.container-servlet">
+ <param name="test.id" value="JBoss-5_0-container-servlet"/>
+ <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
+ <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
+ <param name="test.jboss-5.0.tempdir" value="${target}/cargo-tmp/5_0"/>
+ </antcall>
+ </target>
+
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
+ <antcall target="tests.jboss-5.0"/>
</target>
<target name="cargo.tomcat-6.start" depends="cargo.setup">
@@ -549,7 +747,7 @@
</taskdef>
<cargo
- containerId="tomcat5x"
+ containerId="tomcat6x"
home="${test.tomcat-6.home}"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
log="${cargo.log.dir}/cargo.${test.id}.start.log"
@@ -572,7 +770,7 @@
<target name="cargo.tomcat-6.stop" depends="cargo.setup">
<cargo
- containerId="tomcat5x"
+ containerId="tomcat6x"
home="${test.tomcat-6.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
@@ -604,6 +802,72 @@
<antcall target="tests.tomcat-6"/>
</target>
+ <target name="cargo.jetty-6.start" depends="cargo.setup">
+
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <cargo
+ containerId="jetty6x"
+ home="${test.jetty-6.home}"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ wait="${cargo.wait}">
+ <extraClasspath>
+ <path refid="jetty-6.1-shared"/>
+ </extraClasspath>
+ <configuration>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>
+ <configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/>
+ <configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/>
+ <deployable type="war" file="${dependency.cargo.jetty-deployer}">
+ <property name="context" value="cargo-jetty-deployer"/>
+ </deployable>
+ <deployable type="war" file="${test.temp.lib}/jetty-6.1/portlet-test.war"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.jetty-6.stop" depends="cargo.setup">
+ <cargo
+ containerId="jetty6x"
+ home="${test.jetty-6.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ action="stop">
+ <configuration/>
+ </cargo>
+ </target>
+
+ <target name="tests.jetty-6.container-servlet" if="${test.jetty-6.home.variable-name}">
+ <echo message="Starting Jetty 6 container-servlet tests with ${test.jetty-6.home}"/>
+ <antcall target="cargo.jetty-6.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="RemoteJetty_6_1"/>
+ </antcall>
+ <antcall target="cargo.jetty-6.stop"/>
+ </target>
+
+ <target name="tests.jetty-6">
+ <antcall target="tests.jetty-6.container-servlet">
+ <param name="test.id" value="Jetty-6_1-container-servlet"/>
+ <param name="test.jetty-6.name" value="RemoteJetty_6_1"/>
+ <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/>
+ <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/>
+ </antcall>
+ </target>
+
+ <target name="tests.jetty">
+ <antcall target="tests.jetty-6"/>
+ </target>
+
<target name="tests.remote">
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
@@ -636,11 +900,15 @@
<property name="tck" value="${target}/tck"/>
<property name="tck-jboss" value="${tck}/jboss42"/>
+ <property name="tck-jboss5" value="${tck}/jboss50"/>
<property name="tck-tomcat" value="${tck}/tomcat6"/>
+ <property name="tck-jetty" value="${tck}/jetty6"/>
<mkdir dir="${tck}"/>
<mkdir dir="${tck-jboss}"/>
+ <mkdir dir="${tck-jboss5}"/>
<mkdir dir="${tck-tomcat}"/>
+ <mkdir dir="${tck-jetty}"/>
<jar jarfile="${target}/portlet-test-lib.jar">
<fileset dir="${target}/classes" excludes="org/jboss/portal/portlet/portal/samples/**"/>
@@ -668,6 +936,31 @@
<path refid="jboss-4.2-shared"/>
</copy>
+ <!-- JBOSS 5 -->
+ <copy todir="${tck-jboss5}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/portlet-tck-war"/>
+ </copy>
+ <copy todir="${tck-jboss5}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/jboss-5.0/portlet-tck-war"/>
+ </copy>
+
+ <copy todir="${tck-jboss5}/portlet-tck-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
+ <path refid="jboss-5.0"/>
+ </copy>
+
+ <mkdir dir="${tck-jboss5}/tck-portal"/>
+
+ <jar jarfile="${tck-jboss5}/tck-portal/portlet-tck.war">
+ <fileset dir="${tck-jboss5}/portlet-tck-war">
+ <exclude name="**/jboss-kernel*.jar"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${tck-jboss5}/tck-portal" flatten="true">
+ <path refid="jboss-5.0-shared"/>
+ </copy>
+
<!--TOMCAT-->
<copy todir="${tck-tomcat}/portlet-tck-war">
@@ -692,8 +985,31 @@
<path refid="tomcat-6.0-shared"/>
</copy>
+ <!--JETTY-->
+ <copy todir="${tck-jetty}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/portlet-tck-war"/>
+ </copy>
+ <copy todir="${tck-jetty}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/jetty-6.1/portlet-tck-war"/>
+ </copy>
+
+ <copy todir="${tck-jetty}/portlet-tck-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${target}" includes="portlet-test-lib.jar"/>
+ <path refid="jetty-6.1"/>
+ </copy>
+
+ <mkdir dir="${tck-jetty}/tck-portal"/>
+
+ <jar jarfile="${tck-jetty}/tck-portal/portlet-tck.war">
+ <fileset dir="${tck-jetty}/portlet-tck-war"/>
+ </jar>
+
+ <copy todir="${tck-jetty}/tck-portal" flatten="true">
+ <path refid="jetty-6.1-shared"/>
+ </copy>
+
<delete file="${target}/portlet-test-lib.jar"/>
</target>
-</project>
\ No newline at end of file
+</project>
Added: modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server -->
+<!-- -->
+<!-- Documentation of this file format can be found at: -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+ <!-- =========================================================== -->
+ <!-- Server Thread Pool -->
+ <!-- =========================================================== -->
+ <Set name="ThreadPool">
+ <!-- Default bounded blocking threadpool
+ -->
+ <New class="org.mortbay.thread.BoundedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="lowThreads">50</Set>
+ <Set name="maxThreads">250</Set>
+ </New>
+
+ <!-- Optional Java 5 bounded threadpool with job queue
+ <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <Arg type="int">0</Arg>
+ <Set name="corePoolSize">10</Set>
+ <Set name="maximumPoolSize">250</Set>
+ </New>
+ -->
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Set connectors -->
+ <!-- =========================================================== -->
+ <!-- One of each type! -->
+ <!-- =========================================================== -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="confidentialPort">8443</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- Use this connector if NIO is not available.
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8081</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="lowResourceMaxIdleTime">1500</Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To add a HTTPS SSL listener -->
+ <!-- see jetty-ssl.xml to add an ssl connector. use -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- =========================================================== -->
+ <!-- Set up global session ID manager -->
+ <!-- =========================================================== -->
+ <!--
+ <Set name="sessionIdManager">
+ <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+ <Set name="workerName">node1</Set>
+ </New>
+ </Set>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- Set handler Collection Structure -->
+ <!-- =========================================================== -->
+ <Set name="handler">
+ <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+ <Item>
+ <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ </Item>
+ <Item>
+ <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+ </Item>
+ <Item>
+ <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure the context deployer -->
+ <!-- A context deployer will deploy contexts described in -->
+ <!-- configuration files discovered in a directory. -->
+ <!-- The configuration directory can be scanned for hot -->
+ <!-- deployments at the configured scanInterval. -->
+ <!-- -->
+ <!-- This deployer is configured to deploy contexts configured -->
+ <!-- in the $JETTY_HOME/contexts directory -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.ContextDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set>
+ <Set name="scanInterval">1</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure the webapp deployer. -->
+ <!-- A webapp deployer will deploy standard webapps discovered -->
+ <!-- in a directory at startup, without the need for additional -->
+ <!-- configuration files. It does not support hot deploy or -->
+ <!-- non standard contexts (see ContextDeployer above). -->
+ <!-- -->
+ <!-- This deployer is configured to deploy webapps from the -->
+ <!-- $JETTY_HOME/webapps directory -->
+ <!-- -->
+ <!-- Normally only one type of deployer need be used. -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set>
+ <Set name="parentLoaderPriority">false</Set>
+ <Set name="extract">true</Set>
+ <Set name="allowDuplicates">false</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure Authentication Realms -->
+ <!-- Realms may be configured for the entire server here, or -->
+ <!-- they can be configured for a specific web app in a context -->
+ <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
+ <!-- example). -->
+ <!-- =========================================================== -->
+ <Set name="UserRealms">
+ <Array type="org.mortbay.jetty.security.UserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">Test Realm</Set>
+ <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set>
+ </New>
+ </Item>
+ </Array>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure Request Log -->
+ <!-- Request logs may be configured for the entire server here, -->
+ <!-- or they can be configured for a specific web app in a -->
+ <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+ <!-- for an example). -->
+ <!-- =========================================================== -->
+ <Ref id="RequestLog">
+ <Set name="requestLog">
+ <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+ <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
+ <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="extended">false</Set>
+ <Set name="LogTimeZone">GMT</Set>
+ </New>
+ </Set>
+ </Ref>
+
+ <!-- =========================================================== -->
+ <!-- extra options -->
+ <!-- =========================================================== -->
+ <Set name="stopAtShutdown">true</Set>
+ <!-- ensure/prevent Server: header being sent to browsers -->
+ <Set name="sendServerVersion">true</Set>
+
+</Configure>
Added: modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties
===================================================================
--- modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,23 @@
+#
+# This file defines users passwords and roles for a HashUserRealm
+#
+# The format is
+# <username>: <password>[,<rolename> ...]
+#
+# Passwords may be clear text, obfuscated or checksummed. The class
+# org.mortbay.util.Password should be used to generate obfuscated
+# passwords or password checksums
+#
+# If DIGEST Authentication is used, the password must be in a recoverable
+# format, either plain text or OBF:.
+#
+jetty: MD5:164c88b302622e17050af52c89945d44,user
+admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin
+other: OBF:1xmk1w261u9r1w1c1xmq
+plain: plain
+user: password
+
+admin: admin,manager
+
+# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password
+digest: MD5:6e120743ad67abfbc385bc2bb754e297
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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>
+ <class-loading java2ClassLoadingCompliance="false">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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 web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.tck.TCKServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,24 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<Context privileged="true">
+</Context>
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,24 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<Context privileged="true">
+</Context>
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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>
+ <class-loading java2ClassLoadingCompliance="false">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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 web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Get id="serverObject" name="server"/>
+
+ <New id="jettySetup" class="org.jboss.portal.web.impl.jetty.Jetty6Handler">
+ <Arg><Ref id="serverObject"/></Arg>
+ </New>
+
+</Configure>
+
+
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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 web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.tck.TCKServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = servlet-examples.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Get id="serverObject" name="server"/>
+
+ <New id="jettySetup" class="org.jboss.portal.web.impl.jetty.Jetty6Handler">
+ <Arg><Ref id="serverObject"/></Arg>
+ </New>
+
+</Configure>
+
+
Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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 web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -26,13 +26,17 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Copied: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml (from rev 11719, modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -26,13 +26,17 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ </context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified: modules/portlet/trunk/test/src/test/resources/test/servers.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-08-20 15:04:41 UTC (rev 11719)
+++ modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-08-20 19:10:21 UTC (rev 11720)
@@ -10,7 +10,7 @@
</service>
<deployer>
<remote>
- <name>tomcat5x</name>
+ <name>tomcat6x</name>
<host>localhost</host>
<port>8080</port>
</remote>
@@ -22,6 +22,28 @@
</node>
</server>
<server>
+ <server-name>RemoteJetty_6_1</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jetty6x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ <authentication>
+ <username>admin</username>
+ <password>admin</password>
+ </authentication>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJBoss_4_2_0</server-name>
<node>
<node-id>default</node-id>
@@ -75,4 +97,23 @@
</deployer>
</node>
</server>
+ <server>
+ <server-name>RemoteJBoss_5_0</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss5x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
+
</servers>
17 years, 8 months
- 1
- 0