gatein SVN: r5767 - maven/parent/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-18 08:45:24 -0500 (Tue, 18 Jan 2011)
New Revision: 5767
Modified:
maven/parent/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.2-GA
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-01-18 13:37:10 UTC (rev 5766)
+++ maven/parent/trunk/pom.xml 2011-01-18 13:45:24 UTC (rev 5767)
@@ -14,13 +14,13 @@
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.2-GA-SNAPSHOT</version>
+ <version>1.0.2-GA</version>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/parent/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/parent/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/maven/parent/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/parent/tags/1.0.2-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/parent/tags/1.0.2-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/maven/parent/tags/1.0.2-GA</url>
</scm>
<properties>
14 years, 8 months
- 1
- 0
gatein SVN: r5766 - maven/parent/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-18 08:37:10 -0500 (Tue, 18 Jan 2011)
New Revision: 5766
Modified:
maven/parent/trunk/pom.xml
Log:
GTNMAVEN-17 : Update java compatibility to 1.6
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-01-18 07:26:07 UTC (rev 5765)
+++ maven/parent/trunk/pom.xml 2011-01-18 13:37:10 UTC (rev 5766)
@@ -33,6 +33,10 @@
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.optimize>true</maven.compiler.optimize>
+ <!-- maven-compiler-plugin -->
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>1.5</maven.compiler.source>
+
<!-- maven-enforcer-plugin -->
<maven.min.version>2.2.1</maven.min.version>
@@ -100,22 +104,6 @@
<profiles>
<profile>
<id>release</id>
- <repositories>
- <!-- Used by animal-sniffer -->
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <!-- Used by animal-sniffer -->
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<pluginManagement>
<plugins>
@@ -173,27 +161,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jvnet</groupId>
- <artifactId>animal-sniffer</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>check-java-compatibility</id>
- <phase>compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <signature>
- <groupId>org.jvnet.animal-sniffer</groupId>
- <artifactId>java1.5</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
14 years, 8 months
- 1
- 0
gatein SVN: r5765 - in portal/branches/branch-GTNPORTAL-1745/webui: portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-18 02:26:07 -0500 (Tue, 18 Jan 2011)
New Revision: 5765
Modified:
portal/branches/branch-GTNPORTAL-1745/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
GTNPORTAL-1752 'Preferences' tab is only showing up if portlet has been customized
Modified: portal/branches/branch-GTNPORTAL-1745/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java 2011-01-18 03:12:21 UTC (rev 5764)
+++ portal/branches/branch-GTNPORTAL-1745/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java 2011-01-18 07:26:07 UTC (rev 5765)
@@ -167,34 +167,34 @@
UIForm uiForm = getAncestorOfType(UIForm.class);
for (UIComponent inputEntry : getChildren())
{
- if (inputEntry.isRendered())
+ if (inputEntry instanceof UIFormInputBase)
{
- String label;
- try
+ if (inputEntry.isRendered())
{
- label = uiForm.getLabel(res, inputEntry.getId());
- if (inputEntry instanceof UIFormInputBase)
- ((UIFormInputBase)inputEntry).setLabel(label);
+ UIFormInputBase formInputBase = (UIFormInputBase) inputEntry;
+ String label;
+ if (formInputBase.getLabel() != null)
+ {
+ label = uiForm.getLabel(res, formInputBase.getLabel());
+ }
+ else
+ {
+ label = uiForm.getLabel(res, formInputBase.getId());
+ }
+ w.write("<tr>");
+ w.write("<td class=\"FieldLabel\">");
+
+ // if missing resource and the label hasn't been set before, don't print out the label.
+ if (formInputBase.getLabel() != null || (label != formInputBase.getId()))
+ {
+ w.write(label);
+ }
+ w.write("</td>");
+ w.write("<td class=\"FieldComponent\">");
+ renderUIComponent(formInputBase);
+ w.write("</td>");
+ w.write("</tr>");
}
- catch (MissingResourceException ex)
- {
- //label = " " ;
- label = inputEntry.getName();
- System.err.println("\n " + uiForm.getId() + ".label." + inputEntry.getId() + " not found value");
- }
- w.write("<tr>");
- w.write("<td class=\"FieldLabel\">");
-
- // if missing resource, don't print out the label.
- if(!label.equals(inputEntry.getName()))
- {
- w.write(label);
- }
- w.write("</td>");
- w.write("<td class=\"FieldComponent\">");
- renderUIComponent(inputEntry);
- w.write("</td>");
- w.write("</tr>");
}
}
w.write("</table>");
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-18 03:12:21 UTC (rev 5764)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-18 07:26:07 UTC (rev 5765)
@@ -22,8 +22,8 @@
import org.exoplatform.commons.utils.ExceptionUtil;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.pc.ExoPortletState;
-import org.exoplatform.portal.pom.spi.portlet.Preference;
import org.exoplatform.portal.pom.spi.portlet.Portlet;
+import org.exoplatform.portal.pom.spi.portlet.Preference;
import org.exoplatform.portal.pom.spi.wsrp.WSRP;
import org.exoplatform.portal.pom.spi.wsrp.WSRPPortletStateType;
import org.exoplatform.portal.portlet.PortletExceptionHandleService;
@@ -45,22 +45,15 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.Event.Phase;
import org.exoplatform.webui.event.EventListener;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
-import org.exoplatform.webui.form.UIFormInputIconSelector;
-import org.exoplatform.webui.form.UIFormInputInfo;
-import org.exoplatform.webui.form.UIFormInputSet;
-import org.exoplatform.webui.form.UIFormStringInput;
-import org.exoplatform.webui.form.UIFormTabPane;
-import org.exoplatform.webui.form.UIFormTextAreaInput;
+import org.exoplatform.webui.form.*;
import org.exoplatform.webui.form.validator.ExpressionValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
import org.exoplatform.webui.form.validator.StringLengthValidator;
import org.exoplatform.webui.organization.UIListPermissionSelector;
import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator;
import org.gatein.pc.api.Mode;
-import org.gatein.pc.api.PortletContext;
-import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.StatefulPortletContext;
+import org.gatein.pc.api.info.PreferenceInfo;
import org.gatein.pc.api.invocation.RenderInvocation;
import org.gatein.pc.api.invocation.response.ErrorResponse;
import org.gatein.pc.api.invocation.response.FragmentResponse;
@@ -68,23 +61,12 @@
import org.gatein.pc.api.spi.InstanceContext;
import org.gatein.pc.api.state.AccessMode;
import org.gatein.pc.api.state.PropertyChange;
-import org.gatein.pc.portlet.impl.spi.AbstractClientContext;
-import org.gatein.pc.portlet.impl.spi.AbstractPortalContext;
-import org.gatein.pc.portlet.impl.spi.AbstractSecurityContext;
-import org.gatein.pc.portlet.impl.spi.AbstractServerContext;
-import org.gatein.pc.portlet.impl.spi.AbstractUserContext;
-import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
+import org.gatein.pc.portlet.impl.spi.*;
import javax.portlet.PortletMode;
import javax.servlet.http.Cookie;
+import java.util.*;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.ResourceBundle;
-
/** Author : Nhu Dinh Thuan nhudinhthuan(a)yahoo.com Jun 8, 2006 */
@ComponentConfigs({
@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/portal/webui/portal/UIPortletForm.gtmpl", events = {
@@ -115,7 +97,7 @@
addValidator(MandatoryValidator.class).setEditable(false)).
addUIFormInput(new UIFormStringInput("windowId", "windowId", null).setEditable(false)).*/
addUIFormInput(new UIFormInputInfo("displayName", "displayName", null)).addUIFormInput(
- new UIFormStringInput("title", "title", null).addValidator(StringLengthValidator.class, 3, 60).addValidator(ExpressionValidator.class, "[^\\<\\>]*",
+ new UIFormStringInput("title", "title", null).addValidator(StringLengthValidator.class, 3, 60).addValidator(ExpressionValidator.class, "[^\\<\\>]*",
"UIPortletForm.msg.InvalidPortletTitle"))
.addUIFormInput(
new UIFormStringInput("width", "width", null).addValidator(ExpressionValidator.class, "(^([1-9]\\d*)px$)?",
@@ -226,7 +208,7 @@
{
content = fragmentResponse.getContent();
}
-
+
}
else
{
@@ -262,7 +244,7 @@
}
portletContent.setLength(0);
-
+
portletContent.append(content);
}
catch (Throwable ex)
@@ -288,40 +270,59 @@
getChild(UIFormInputIconSelector.class).setSelectedIcon(icon);
getChild(UIFormInputThemeSelector.class).getChild(UIItemThemeSelector.class).setSelectedTheme(
uiPortlet.getSuitedTheme(null));
- WebuiRequestContext contextres = WebuiRequestContext.getCurrentInstance();
- ResourceBundle res = contextres.getApplicationResourceBundle();
if (hasEditMode())
{
uiPortlet.setCurrentPortletMode(PortletMode.EDIT);
}
else
{
+ Map<String, String> portletPreferenceMaps = new HashMap<String, String>();
+ org.gatein.pc.api.Portlet portlet = uiPortlet.getProducedOfferedPortlet();
+ Set<String> keySet = portlet.getInfo().getPreferences().getKeys();
- //
+ for (String key : keySet)
+ {
+ PreferenceInfo preferenceInfo = portlet.getInfo().getPreferences().getPreference(key);
+ if (!preferenceInfo.isReadOnly())
+ {
+ String ppValue = (preferenceInfo.getDefaultValue().size() > 0) ? preferenceInfo.getDefaultValue().get
+ (0) : "";
+ portletPreferenceMaps.put(key, ppValue);
+ }
+ }
+
Portlet pp = uiPortlet.getPreferences();
if (pp != null)
{
- UIFormInputSet uiPortletPrefSet = getChildById(FIELD_PORTLET_PREF);
- uiPortletPrefSet.getChildren().clear();
for (Preference pref : pp)
{
if (!pref.isReadOnly())
{
- UIFormStringInput templateStringInput =
- new UIFormStringInput(pref.getName(), null, pref.getValues().get(0));
- templateStringInput.setLabel(res.getString("UIPortletForm.tab.label.Template"));
- templateStringInput.addValidator(MandatoryValidator.class);
- uiPortletPrefSet.addUIFormInput(templateStringInput);
+ portletPreferenceMaps.put(pref.getName(), (pref.getValues().size() > 0) ? pref.getValues().get(0) :
+ "");
}
-
}
- if (uiPortletPrefSet.getChildren().size() > 0)
+ }
+
+ if (portletPreferenceMaps.size() > 0)
+ {
+ Set<String> ppKeySet = portletPreferenceMaps.keySet();
+ UIFormInputSet uiPortletPrefSet = getChildById(FIELD_PORTLET_PREF);
+ uiPortletPrefSet.getChildren().clear();
+ for (String ppKey : ppKeySet)
{
- uiPortletPrefSet.setRendered(true);
- setSelectedTab(FIELD_PORTLET_PREF);
- return;
+ String ppValue = portletPreferenceMaps.get(ppKey);
+ UIFormStringInput preferenceStringInput = new UIFormStringInput(ppKey, null, ppValue);
+ preferenceStringInput.setLabel(ppKey);
+ preferenceStringInput.addValidator(MandatoryValidator.class);
+ uiPortletPrefSet.addUIFormInput(preferenceStringInput);
}
+
+ uiPortletPrefSet.setRendered(true);
+ setSelectedTab(FIELD_PORTLET_PREF);
+ return;
}
+
setSelectedTab("PortletSetting");
}
}
@@ -336,12 +337,6 @@
return;
}
- //
- PortletInvoker portletInvoker = getApplicationComponent(PortletInvoker.class);
- PortletContext portletContext = uiPortlet_.getPortletContext();
-
- //
-
PropertyChange[] propertyChanges = new PropertyChange[uiFormInputs.size()];
for (int i = 0; i < uiFormInputs.size(); i++)
14 years, 8 months
- 1
- 0
gatein SVN: r5764 - in components/wci/trunk: jboss and 37 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-01-17 22:12:21 -0500 (Mon, 17 Jan 2011)
New Revision: 5764
Added:
components/wci/trunk/jboss/
components/wci/trunk/jboss/jboss6/
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jboss/jboss6/src/
components/wci/trunk/jboss/jboss6/src/main/
components/wci/trunk/jboss/jboss6/src/main/java/
components/wci/trunk/jboss/jboss6/src/main/java/org/
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java
components/wci/trunk/test/servers/jboss6/
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jboss6/src/
components/wci/trunk/test/servers/jboss6/src/assembly/
components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml
components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml
components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml
components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml
components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml
components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml
components/wci/trunk/test/servers/jboss6/src/integration-tests/
components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp
components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml
components/wci/trunk/test/servers/jboss6/src/test/
components/wci/trunk/test/servers/jboss6/src/test/resources/
components/wci/trunk/test/servers/jboss6/src/test/resources/config/
components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties
components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml
Modified:
components/wci/trunk/pom.xml
components/wci/trunk/test/servers/pom.xml
Log:
GTNWCI-22: initial checkin of JBoss 6 support for wci.
Added: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml (rev 0)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-parent</artifactId>
+ <version>2.1.0-Alpha03-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-jboss6</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - WCI JBoss 6 compatibility component</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
+ <version>3.0.0-CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Final</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java (rev 0)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,126 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, 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. *
+ ******************************************************************************/
+package org.gatein.wci.jboss;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerServlet;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Wrapper;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class JB6ContainerServlet extends HttpServlet implements ContainerServlet
+{
+ /** . */
+ private Wrapper wrapper;
+
+ /** . */
+ private JB6ServletContainerContext containerContext;
+
+ /** . */
+ private boolean started;
+
+ public Wrapper getWrapper()
+ {
+ return wrapper;
+ }
+
+ public void setWrapper(Wrapper wrapper)
+ {
+ this.wrapper = wrapper;
+
+ //
+ if (wrapper != null)
+ {
+ attemptStart();
+ }
+ else
+ {
+ attemptStop();
+ }
+ }
+
+ public void init() throws ServletException
+ {
+ started = true;
+
+ //
+ attemptStart();
+ }
+
+ public void destroy()
+ {
+ started = false;
+
+ //
+ attemptStop();
+ }
+
+ private void attemptStart()
+ {
+ if (started && wrapper != null)
+ {
+ start();
+ }
+ }
+
+ private void attemptStop()
+ {
+ if (!started || wrapper == null)
+ {
+ stop();
+ }
+ }
+
+ private void start()
+ {
+ Container container = wrapper;
+ while (container.getParent() != null)
+ {
+ container = container.getParent();
+ if (container instanceof Engine)
+ {
+ Engine engine = (Engine) container;
+ containerContext = new JB6ServletContainerContext(engine);
+ containerContext.start();
+ break;
+ }
+ }
+ }
+
+ private void stop()
+ {
+ if (containerContext != null)
+ {
+ containerContext.stop();
+
+ //
+ containerContext = null;
+ }
+ }
+}
Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java (rev 0)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,341 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, 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. *
+ ******************************************************************************/
+package org.gatein.wci.jboss;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.core.StandardContext;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.authentication.AuthenticationResult;
+import org.gatein.wci.authentication.GenericAuthentication;
+import org.gatein.wci.authentication.GenericAuthenticationResult;
+import org.gatein.wci.authentication.ProgrammaticAuthenticationResult;
+import org.gatein.wci.authentication.TicketService;
+import org.gatein.wci.command.CommandDispatcher;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.security.Credentials;
+import org.gatein.wci.spi.ServletContainerContext;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class JB6ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener
+{
+ private final static Logger log = LoggerFactory.getLogger(JB6ServletContainerContext.class);
+
+ /** . */
+ //TODO: maybe we should rename this to /jbossgateinservlet? but older versions of jboss
+ // use the tomcat ServletContainerContext.
+ private final CommandDispatcher dispatcher = new CommandDispatcher("/tomcatgateinservlet");
+
+ /** The monitored hosts. */
+ private final Set<String> monitoredHosts = new HashSet<String>();
+
+ /** The monitored contexts. */
+ private final Set<String> monitoredContexts = new HashSet<String>();
+
+ /** . */
+ private final Engine engine;
+
+ /** . */
+ private Registration registration;
+
+ public JB6ServletContainerContext(Engine engine)
+ {
+ this.engine = engine;
+ }
+
+ public Object include(ServletContext targetServletContext, HttpServletRequest request, HttpServletResponse response,
+ RequestDispatchCallback callback, Object handback) throws ServletException, IOException
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+
+ public void setCallback(Registration registration)
+ {
+ this.registration = registration;
+ }
+
+ public void unsetCallback(Registration registration)
+ {
+ this.registration = null;
+ }
+
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName,
+ String password, long validityMillis) throws ServletException
+ {
+ try
+ {
+ request.login(userName, password);
+ }
+ catch (ServletException se)
+ {
+ se.printStackTrace();
+ try
+ {
+ String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials(userName, password),
+ TicketService.DEFAULT_VALIDITY);
+ String url = "j_security_check?j_username=" + userName + "&j_password=" + ticket;
+ url = response.encodeRedirectURL(url);
+ response.sendRedirect(url);
+ response.flushBuffer();
+ }
+ catch (Exception ignore)
+ {
+ }
+ return null;
+ }
+ return new ProgrammaticAuthenticationResult();
+ }
+
+ public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ {
+ request.logout();
+ request.getSession().invalidate();
+ }
+
+ public synchronized void containerEvent(ContainerEvent event)
+ {
+ if (event.getData() instanceof Host)
+ {
+ Host host = (Host) event.getData();
+
+ //
+ if (Container.ADD_CHILD_EVENT.equals(event.getType()))
+ {
+ registerHost(host);
+ }
+ else if (Container.REMOVE_CHILD_EVENT.equals(event.getType()))
+ {
+ unregisterHost(host);
+ }
+ }
+ else if (event.getData() instanceof StandardContext)
+ {
+ StandardContext context = (StandardContext) event.getData();
+
+ //
+ if (Container.ADD_CHILD_EVENT.equals(event.getType()))
+ {
+ registerContext(context);
+ }
+ else if (Container.REMOVE_CHILD_EVENT.equals(event.getType()))
+ {
+ unregisterContext(context);
+ }
+ }
+ }
+
+ public void lifecycleEvent(LifecycleEvent event)
+ {
+ if (event.getSource() instanceof Context)
+ {
+ Context context = (Context) event.getSource();
+
+ //
+ if (Lifecycle.AFTER_START_EVENT.equals(event.getType()))
+ {
+ start(context);
+ }
+ else if (Lifecycle.BEFORE_STOP_EVENT.equals(event.getType()))
+ {
+ stop(context);
+ }
+ }
+ }
+
+ void start()
+ {
+ DefaultServletContainerFactory.registerContext(this);
+
+ //
+ Container[] childrenContainers = engine.findChildren();
+ for (Container childContainer : childrenContainers)
+ {
+ if (childContainer instanceof Host)
+ {
+ Host host = (Host) childContainer;
+ registerHost(host);
+ }
+ }
+
+ //
+ engine.addContainerListener(this);
+ }
+
+ void stop()
+ {
+ engine.removeContainerListener(this);
+
+ //
+ Container[] childrenContainers = engine.findChildren();
+ for (Container childContainer : childrenContainers)
+ {
+ if (childContainer instanceof Host)
+ {
+ Host host = (Host) childContainer;
+ unregisterHost(host);
+ }
+ }
+
+ //
+ registration.cancel();
+ registration = null;
+ }
+
+ /**
+ * Register an host for registration which means that we fire events for all the contexts it contains and we
+ * subscribe for its life cycle events. If the host is already monitored nothing is done.
+ *
+ * @param host the host to register for monitoring
+ */
+ private void registerHost(Host host)
+ {
+ if (!monitoredHosts.contains(host.getName()))
+ {
+ Container[] childrenContainers = host.findChildren();
+ for (Container childContainer : childrenContainers)
+ {
+ if (childContainer instanceof StandardContext)
+ {
+ StandardContext context = (StandardContext) childContainer;
+ registerContext(context);
+ }
+ }
+
+ //
+ host.addContainerListener(this);
+
+ //
+ monitoredHosts.add(host.getName());
+ }
+ }
+
+ private void unregisterHost(Host host)
+ {
+ if (monitoredHosts.contains(host.getName()))
+ {
+ monitoredHosts.remove(host.getName());
+
+ //
+ host.removeContainerListener(this);
+
+ //
+ Container[] childrenContainers = host.findChildren();
+ for (Container childContainer : childrenContainers)
+ {
+ if (childContainer instanceof StandardContext)
+ {
+ StandardContext context = (StandardContext) childContainer;
+ unregisterContext(context);
+ }
+ }
+ }
+ }
+
+ private void registerContext(StandardContext context)
+ {
+ if (!monitoredContexts.contains(context.getName()))
+ {
+ context.addLifecycleListener(this);
+
+ //
+ if (context.getState() == 1)
+ {
+ start(context);
+ }
+
+ //
+ monitoredContexts.add(context.getName());
+ }
+ }
+
+ private void unregisterContext(StandardContext context)
+ {
+ if (monitoredContexts.contains(context.getName()))
+ {
+ monitoredContexts.remove(context.getName());
+
+ //
+ if (context.getState() == 1)
+ {
+ stop(context);
+ }
+
+ //
+ context.removeLifecycleListener(this);
+ }
+ }
+
+ private void start(Context context)
+ {
+ try
+ {
+ log.debug("Context added " + context.getPath());
+ JB6WebAppContext webAppContext = new JB6WebAppContext(context);
+
+ //
+ if (registration != null)
+ {
+ registration.registerWebApp(webAppContext);
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ private void stop(Context context)
+ {
+ try
+ {
+ if (registration != null)
+ {
+ registration.unregisterWebApp(context.getPath());
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+}
Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java (rev 0)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,128 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, 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. *
+ ******************************************************************************/
+package org.gatein.wci.jboss;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.ServletContext;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.gatein.wci.command.CommandServlet;
+import org.gatein.wci.spi.WebAppContext;
+import org.w3c.dom.Document;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class JB6WebAppContext implements WebAppContext
+{
+ /** . */
+ private Document descriptor;
+
+ /** . */
+ private ServletContext servletContext;
+
+ /** . */
+ private ClassLoader loader;
+
+ /** . */
+ private String contextPath;
+
+ /** . */
+ private final Context context;
+
+ /** . */
+ private Wrapper commandServlet;
+
+ JB6WebAppContext(Context context) throws Exception
+ {
+ this.context = context;
+
+ //
+ servletContext = context.getServletContext();
+ loader = context.getLoader().getClassLoader();
+ contextPath = context.getPath();
+ }
+
+ public void start() throws Exception
+ {
+ try
+ {
+ commandServlet = context.createWrapper();
+ commandServlet.setName("TomcatGateInServlet");
+ commandServlet.setLoadOnStartup(0);
+ commandServlet.setServletClass(CommandServlet.class.getName());
+ context.addChild(commandServlet);
+ context.addServletMapping("/tomcatgateinservlet", "TomcatGateInServlet");
+ }
+ catch (Exception e)
+ {
+ cleanup();
+ throw e;
+ }
+ }
+
+ public void stop()
+ {
+ cleanup();
+ }
+
+ private void cleanup()
+ {
+ if (commandServlet != null)
+ {
+ try
+ {
+ context.removeServletMapping("tomcatgateinservlet");
+ context.removeChild(commandServlet);
+ }
+ catch (Exception e)
+ {
+ }
+ }
+ }
+
+ public ServletContext getServletContext()
+ {
+ return servletContext;
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return loader;
+ }
+
+ public String getContextPath()
+ {
+ return contextPath;
+ }
+
+ public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite)
+ throws IOException
+ {
+ return false;
+ }
+}
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-01-17 17:47:37 UTC (rev 5763)
+++ components/wci/trunk/pom.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -91,6 +91,11 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jboss6</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-jetty</artifactId>
<version>${project.version}</version>
</dependency>
@@ -144,6 +149,7 @@
<module>exo</module>
<module>tomcat/tomcat6</module>
<module>tomcat/tomcat7</module>
+ <module>jboss/jboss6</module>
<module>jetty</module>
<module>test</module>
</modules>
Added: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,424 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-server-parent</artifactId>
+ <version>2.1.0-Alpha03-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-jboss6</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - WCI JBoss 6.0 test component</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jboss6</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-exo</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-gatein-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-exo-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-mc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- JBOSS UNIT DEPENDENCIES -->
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-remote</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-mc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>portal-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>portal-test-generic</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- JBOSS MICROCONAINER DEPENDENCIES -->
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- OTHER DEPENDENCIES -->
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JBoss Deployer -->
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>5.1.0.SP1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-common-build.xml</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>test</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <!-- we don't want to add these archives into the repo -->
+ <attach>false</attach>
+ <outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+ <descriptors>
+ <descriptor>src/assembly/spi-native-server.xml</descriptor>
+ <descriptor>src/assembly/spi-generic-server.xml</descriptor>
+ <descriptor>src/assembly/spi-exo-server.xml</descriptor>
+ <descriptor>src/assembly/endpoint-default-servlet-mapping.xml</descriptor>
+ <descriptor>src/assembly/endpoint-path-mapping.xml</descriptor>
+ <descriptor>src/assembly/endpoint-root-path-mapping.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>test</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>integration-testing</id>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
+
+ <!-- properties to pass to the build.xml -->
+ <property name="project.build.directory" value="${project.build.directory}" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <property name="test_classpath" refid="maven.test.classpath" />
+
+ <!-- hack here allows for profiles to effect tasks in the build.xml -->
+ <!-- this should be removed when the antrun plugin properly handles properties -->
+ <condition property="test.generic.enable">
+ <istrue value="${test.generic}" />
+ </condition>
+ <condition property="test.native.enable">
+ <istrue value="${test.native}" />
+ </condition>
+ <condition property="test.exo.enable">
+ <istrue value="${test.exo}" />
+ </condition>
+ <condition property="test.endpoint.enable">
+ <istrue value="${test.endpoint}" />
+ </condition>
+ <condition property="cargo.debug" value="${test.cargo.debug}">
+ <isset property="test.cargo.debug" />
+ </condition>
+ <condition property="cargo.debug" value="">
+ <not>
+ <isset property="test.cargo.debug" />
+ </not>
+ </condition>
+ <!-- end profiles hack -->
+
+ <!-- server dependencies -->
+ <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" />
+ <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
+ <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
+ <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
+ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
+ <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
+ <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
+ <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
+ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" />
+ <property name="dependency.gatein-wci-jboss.jar" value="${maven.dependency.org.gatein.wci.wci-jboss6.jar.path}" />
+ <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" />
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />
+ <property name="dependency.cargo-jboss-deployer.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-tools-jboss-deployer-5.1-and-onwards.jar.path}" />
+ <property name="dependency.jboss-profile-service.jar" value="${maven.dependency.org.jboss.integration.jboss-profileservice-spi.jar.path}" />
+ <property name="dependency.cargo-core-container-jboss.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-container-jboss.jar.path}" />
+
+ <!-- locations of archives to use -->
+ <property name="test.archives.directory" value="${project.build.directory}/test-archives" />
+ <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" />
+ <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" />
+ <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" />
+
+ <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" />
+ <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" />
+ <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" />
+
+ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
+ <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
+
+ <!-- location of common.xml shared between the different server's build.xml -->
+ <property name="common.xml.file" value="${test.common.xml}" />
+ <!-- -->
+
+ <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">
+ <target name="tests" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <!-- Fix 1.0.3 deployment problems with jboss51 deployer-->
+ <version.cargo>1.0.2</version.cargo>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <test.generic>true</test.generic>
+ <test.native>true</test.native>
+ <test.exo>true</test.exo>
+ <test.endpoint>true</test.endpoint>
+ </properties>
+ </profile>
+ <profile>
+ <id>generic</id>
+ <properties>
+ <test.generic>true</test.generic>
+ </properties>
+ </profile>
+ <profile>
+ <id>native</id>
+ <properties>
+ <test.native>true</test.native>
+ </properties>
+ </profile>
+ <profile>
+ <id>exo</id>
+ <properties>
+ <test.exo>true</test.exo>
+ </properties>
+ </profile>
+ <profile>
+ <id>endpoint</id>
+ <properties>
+ <test.endpoint>true</test.endpoint>
+ </properties>
+ </profile>
+ <profile>
+ <id>cargo.debug</id>
+ <properties>
+ <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
+ </properties>
+ </profile>
+ </profiles>
+</project>
Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>endpoint-default-servlet-mapping</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/endpoint/default-servlet-mapping-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>endpoint-path-mapping</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/endpoint/path-mapping-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>endpoint-root-path-mapping</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/endpoint/root-path-mapping-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>spi-exo-server</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/exo/server-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>spi-generic-server</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/generic/server-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,41 @@
+<assembly>
+ <id>spi-native-server</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/test-classes/support/native/server-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.gatein.wci:wci-test-core</include>
+ <!-- gatein-common -->
+ <include>org.gatein.common:common-mc</include>
+ <!-- jboss-unit -->
+ <include>org.jboss.unit:jboss-unit</include>
+ <include>org.jboss.unit:jboss-unit-mc</include>
+ <include>org.jboss.unit:jboss-unit-remote</include>
+ <include>org.jboss.unit:portal-test-generic</include>
+ <include>org.jboss.unit:portal-test</include>
+ <include>org.jboss.remoting:jboss-remoting</include>
+ <!-- jboss-microcontainer -->
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jboss:jbossxb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp
===================================================================
(Binary files differ)
Property changes on: components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<project name="jboss-integration-test" default="tests">
+
+ <import file="${common.xml.file}"/>
+
+ <!-- SYSTEM PROPERTIES -->
+ <property environment="env"/>
+ <property name="test.cargo.home" value="${env.JBOSS_6_0_HOME}"/>
+
+ <!-- properties unique per app server -->
+ <property name="test.server.name" value="JBoss"/>
+ <property name="test.server.version" value="6.0"/>
+ <property name="test.remote.server.name" value="RemoteJBoss_6_0"/>
+ <property name="cargo.container.id" value="jboss6x"/>
+ <!-- end unique properties -->
+
+ <target name="tests" unless="maven.test.skip">
+ <antcall target="tests.common"/>
+ </target>
+
+ <path id="server.libs">
+ <path refid="gatein-common-shared"/>
+
+ <!-- server specific dependencies -->
+ <path path="${dependency.gatein-wci-core.jar}"/>
+ <path path="${dependency.gatein-wci-tomcat.jar}"/>
+ <path path="${dependency.gatein-wci-jboss.jar}"/>
+ <path path="${dependency.gatein-wci-exo.jar}"/>
+ </path>
+
+ <!-- NOTE: we disable the JBoss ondemand deployment since it inters with our tests
+ to determine what applications are deployed -->
+ <target name="cargo.start" depends="cargo.setup">
+ <cargo
+ containerId="${cargo.container.id}"
+ home="${test.cargo.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ timeout="240000"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+ <path refid="server.libs"/>
+ </sharedClasspath>
+ <configuration home="${test.cargo.dir}">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="${cargo.debug} -Djboss.as.deployment.ondemand=false"/>
+ <property name="cargo.rmi.port" value="1099"/>
+ <deployable type="war" file="${cargo.war}">
+ <property name="context" value="${cargo.war.context}"/>
+ </deployable>
+ </configuration>
+ </cargo>
+ </target>
+
+<!--
+ <target name="cargo.start" depends="cargo.setup">
+ <cargo
+ containerId="${cargo.container.id}"
+ home="${test.cargo.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ timeout="240000"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+ <path refid="server.libs"/>
+ </sharedClasspath>
+ <configuration home="${test.cargo.dir}">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="${cargo.debug}"/>
+ <property name="cargo.rmi.port" value="1099"/>
+ <deployable type="war" file="${cargo.war}">
+ <property name="context" value="${cargo.war.context}"/>
+ </deployable>
+ </configuration>
+ </cargo>
+ </target>
+-->
+ <target name="cargo.stop" depends="cargo.setup">
+ <cargo
+ containerId="${cargo.container.id}"
+ home="${test.cargo.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ action="stop">
+ <configuration home="${test.cargo.dir}">
+ <property name="cargo.rmi.port" value="1099"/>
+ </configuration>
+ </cargo>
+ </target>
+
+</project>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-unit
+ xmlns="urn:jboss:jboss-unit:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ </generic>
+</jboss-unit>
+
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,20 @@
+<servers>
+ <server>
+ <server-name>RemoteJBoss_6_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>jboss6x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
+</servers>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/foo/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,63 @@
+<?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>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener</listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortletWrapper</servlet-name>
+ <servlet-class>org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>PortletWrapper</servlet-name>
+ <url-pattern>/PortletWrapper</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,61 @@
+<?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>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>GateInServlet</servlet-name>
+ <url-pattern>/gateinservlet</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,2 @@
+<Context privileged="true" crossContext="true">
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2011-01-18 03:12:21 UTC (rev 5764)
@@ -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 = test-spi.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,2 @@
+<Context privileged="true"> <!-- crossContext="true" -->
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,32 @@
+<?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>
+<!-- <security-domain>java:/jaas/test-123</security-domain> -->
+</jboss-web>
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1 @@
+foo=test
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1 @@
+foo=bar
Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -0,0 +1,73 @@
+<?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>org/gatein/portal/test/web/spi/native/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>SPITestServlet</servlet-name>
+ <servlet-class>org.gatein.wci.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SPITestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Test security</display-name>
+ <web-resource-collection>
+ <web-resource-name>Protected resources</web-resource-name>
+ <url-pattern>/foo/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+
+ <auth-constraint>
+ <role-name>test</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Test security</realm-name>
+ </login-config>
+</web-app>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-01-17 17:47:37 UTC (rev 5763)
+++ components/wci/trunk/test/servers/pom.xml 2011-01-18 03:12:21 UTC (rev 5764)
@@ -67,6 +67,7 @@
<module>tomcat7</module>
<module>jboss42</module>
<module>jboss51</module>
+ <module>jboss6</module>
</modules>
</profile>
<profile>
@@ -76,6 +77,7 @@
<module>tomcat7</module>
<module>jboss42</module>
<module>jboss51</module>
+ <module>jboss6</module>
<module>jetty6</module>
</modules>
</profile>
@@ -111,10 +113,17 @@
</modules>
</profile>
<profile>
+ <id>jboss6</id>
+ <modules>
+ <module>jboss6</module>
+ </modules>
+ </profile>
+ <profile>
<id>jboss</id>
<modules>
<module>jboss42</module>
<module>jboss51</module>
+ <module>jboss6</module>
</modules>
</profile>
<profile>
14 years, 8 months
- 1
- 0
gatein SVN: r5763 - in components/pc/trunk: federation/src/main/java/org/gatein/pc/federation/impl and 6 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-01-17 12:47:37 -0500 (Mon, 17 Jan 2011)
New Revision: 5763
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/consumer/ConsumerPortletInvoker.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
Log:
- GTNPC-49: Removed isExposed and isKnown methods. Fixed implementation of ProducerPortletInvoker.getStatus that needs to call to super to make sure that we don't miss offered portlets.
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -57,46 +57,22 @@
* @param portletContext the portlet context in the scope of this invoker
* @return the <code>PortletInfo</code> for the specified portlet
* @throws IllegalArgumentException if the portlet context is null
- * @throws PortletInvokerException a portlet invoker exception
+ * @throws PortletInvokerException a portlet invoker exception
*/
Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
/**
- * Returns the status of a specified {@code #PortletContext} or null if the portlet context does not have
- * a relationship with this portlet invoker.
+ * Returns the status of a specified {@code #PortletContext} or null if the portlet context does not have a
+ * relationship with this portlet invoker.
*
- * @param portletContext the portlet context
+ * @param portletContext the portlet context
* @return the portlet status
* @throws IllegalArgumentException if the portlet context is null
- * @throws PortletInvokerException a portlet invoker exception
+ * @throws PortletInvokerException a portlet invoker exception
*/
PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
/**
- * Determines whether the specified PortletContext is part of the set of exposed Portlets as returned by {@link
- * #getPortlets()}.
- *
- * @param portletContext the PortletContext which exposed status we want to determine
- * @return <code>true</code> if the Portlet associated with the specified PortletContext is exposed by this
- * PortletInvoker, <code>false</code> otherwise
- * @throws IllegalArgumentException if the specified PortletContext is null
- * @throws PortletInvokerException if some other error occurs
- */
- boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
-
- /**
- * Determines whether the Portlet associated with the specified PortletContext (if it exists) is known to this
- * PortletInvoker whether it is exposed or not. In particular, if this method returns <code>true</code> then {@link
- * #getPortlet(PortletContext)} will return a valid Portlet.
- *
- * @param portletContext the PortletContext to check
- * @return <code>true</code>
- * @throws IllegalArgumentException
- * @throws PortletInvokerException
- */
- boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
-
- /**
* Invoke an operation on a specific portlet.
*
* @param invocation the portlet invocation
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -114,16 +114,6 @@
return portletInvoker.getStatus(context);
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) == PortletStatus.OFFERED;
- }
-
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) != null;
- }
-
private class FederatedInstanceContext implements InstanceContext
{
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -211,16 +211,6 @@
return federated.getStatus(portletContext);
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) == PortletStatus.OFFERED;
- }
-
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) != null;
- }
-
public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
{
PortletContext compoundPortletContext = invocation.getTarget();
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -88,16 +88,6 @@
return safeGetNext().getStatus(portletContext);
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return safeGetNext().isExposed(portletContext);
- }
-
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return safeGetNext().isKnown(portletContext);
- }
-
public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
{
return safeGetNext().invoke(invocation);
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.gatein.pc.portlet.container;
-import org.gatein.common.util.ParameterValidation;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
@@ -101,16 +100,6 @@
return null;
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) == PortletStatus.OFFERED;
- }
-
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) != null;
- }
-
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
if (portletContext == null)
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/consumer/ConsumerPortletInvoker.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/consumer/ConsumerPortletInvoker.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -121,19 +121,6 @@
return getConsumerContext(portletContext).getPortlet();
}
- @Override
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- try
- {
- return getPortlet(portletContext) != null;
- }
- catch (NoSuchPortletException e)
- {
- return false;
- }
- }
-
public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
{
PortletContext portletContext = invocation.getTarget();
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -128,23 +128,26 @@
@Override
public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- try
+ PortletStatus status = super.getStatus(portletContext);
+
+ if (status != null)
{
- getPortlet(portletContext);
- return PortletStatus.MANAGED;
+ return status;
}
- catch (NoSuchPortletException e)
+ else
{
- return null;
+ try
+ {
+ Portlet portlet = getPortlet(portletContext);
+ return portlet != null ? PortletStatus.MANAGED : null;
+ }
+ catch (NoSuchPortletException e)
+ {
+ return null;
+ }
}
}
- @Override
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) != null;
- }
-
private <S extends Serializable> Portlet _getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
Modified: components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java
===================================================================
--- components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -138,16 +138,6 @@
return portlets.containsKey(portletContext.getId()) ? PortletStatus.OFFERED : null;
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) == PortletStatus.OFFERED;
- }
-
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return getStatus(portletContext) != null;
- }
-
public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
{
PortletContext portletContext = invocation.getTarget();
Modified: components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2011-01-17 08:23:08 UTC (rev 5762)
+++ components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2011-01-17 17:47:37 UTC (rev 5763)
@@ -26,29 +26,31 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
-import org.gatein.pc.api.state.PropertyMap;
-import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
-import org.gatein.pc.portlet.impl.state.StateConverterV0;
-import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
-import org.gatein.pc.portlet.impl.spi.AbstractInstanceContext;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.invocation.ActionInvocation;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.state.AccessMode;
import org.gatein.pc.api.state.PropertyChange;
+import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.portlet.impl.spi.AbstractInstanceContext;
+import org.gatein.pc.portlet.impl.state.StateConverterV0;
+import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
+import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
import org.gatein.pc.portlet.state.StateConverter;
+import org.gatein.pc.portlet.state.producer.ProducerPortlet;
import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker;
-import org.gatein.pc.portlet.state.producer.ProducerPortlet;
-import org.gatein.pc.portlet.support.info.PortletInfoSupport;
import org.gatein.pc.portlet.support.PortletInvokerSupport;
import org.gatein.pc.portlet.support.PortletSupport;
-
-import static org.jboss.unit.api.Assert.*;
+import org.gatein.pc.portlet.support.info.PortletInfoSupport;
import org.jboss.unit.api.pojo.annotations.Create;
+import org.jboss.unit.api.pojo.annotations.Test;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import static org.jboss.unit.api.Assert.*;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6691 $
@@ -210,12 +212,14 @@
protected ActionInvocation createAction(PortletContext portletRef, AccessMode accessMode)
{
ActionContextImpl actionCtx = new ActionContextImpl();
- AbstractInstanceContext instanceCtx = new AbstractInstanceContext("blah", accessMode) {
+ AbstractInstanceContext instanceCtx = new AbstractInstanceContext("blah", accessMode)
+ {
@Override
- public PortletStateType<?> getStateType() {
+ public PortletStateType<?> getStateType()
+ {
return persistLocally ? null : PortletStateType.OPAQUE;
}
- };
+ };
//
ActionInvocation action = new ActionInvocation(actionCtx);
@@ -237,14 +241,36 @@
assertEquals(1, portlets.size());
return (Portlet)portlets.iterator().next();
}
-
+
protected PortletContext importPortletContext(PortletContext contextToImport) throws PortletInvokerException
{
return producer.importPortlet(PortletStateType.OPAQUE, contextToImport);
}
-
+
protected PortletContext exportPortletContext(PortletContext originalPortletContext) throws PortletInvokerException
{
return producer.exportPortlet(PortletStateType.OPAQUE, originalPortletContext);
}
+
+ @Test
+ public void testGetStatus() throws Exception
+ {
+ PortletInfoSupport info = new PortletInfoSupport();
+ info.getMeta().setDisplayName("MyPortlet");
+ PortletContext popCtx = createPOPRef(info);
+
+ // POP
+ assertEquals(PortletStatus.OFFERED, producer.getStatus(popCtx));
+
+ // clone a POP
+ PortletContext ccp1Ctx = createClone(popCtx);
+ assertEquals(PortletStatus.MANAGED, producer.getStatus(ccp1Ctx));
+
+ // Clone a CCP
+ PortletContext ccp2Ctx = createClone(ccp1Ctx);
+ assertEquals(PortletStatus.MANAGED, producer.getStatus(ccp2Ctx));
+
+ // inexistent portlet
+ assertNull(producer.getStatus(PortletContext.createPortletContext("foo")));
+ }
}
14 years, 8 months
- 1
- 0
gatein SVN: r5762 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-01-17 03:23:08 -0500 (Mon, 17 Jan 2011)
New Revision: 5762
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
Log:
- Remove IP addresses and passwords from MSAD configuration examples
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2011-01-17 05:02:04 UTC (rev 5761)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2011-01-17 08:23:08 UTC (rev 5762)
@@ -343,19 +343,15 @@
<options>
<option>
<name>providerURL</name>
- <value>ldaps://192.168.0.12:636</value>
+ <value>[ldap|ldaps]://[msad-host]:[port]</value>
</option>
- <!--<option>-->
- <!--<name>providerURL</name>-->
- <!--<value>ldaps://msad-host:636</value>-->
- <!--</option>-->
<option>
<name>adminDN</name>
<value>TEST\Administrator</value>
</option>
<option>
<name>adminPassword</name>
- <value>!Q@W3e4r</value>
+ <value>[adminPasswordValue]</value>
</option>
<option>
<name>authenticationMethod</name>
@@ -363,7 +359,7 @@
</option>
<option>
<name>customSystemProperties</name>
- <value>javax.net.ssl.trustStore=/Users/bdaw/Workshop/msad.truststore</value>
+ <value>javax.net.ssl.trustStore=/path/to/msad.truststore</value>
<value>javax.net.ssl.trustStorePassword=password</value>
</option>
<option>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2011-01-17 05:02:04 UTC (rev 5761)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2011-01-17 08:23:08 UTC (rev 5762)
@@ -297,19 +297,15 @@
<options>
<option>
<name>providerURL</name>
- <value>ldap://192.168.0.12:389</value>
+ <value>[ldap|ldaps]://[msad-host]:[port]</value>
</option>
- <!--<option>-->
- <!--<name>providerURL</name>-->
- <!--<value>ldaps://msad-host:636</value>-->
- <!--</option>-->
<option>
<name>adminDN</name>
<value>TEST\Administrator</value>
</option>
<option>
<name>adminPassword</name>
- <value>!Q@W3e4r</value>
+ <value>[adminPasswordValue]</value>
</option>
<option>
<name>authenticationMethod</name>
@@ -317,7 +313,7 @@
</option>
<!--<option>-->
<!--<name>customSystemProperties</name>-->
- <!--<value>javax.net.ssl.trustStore=/home/root/msad.truststore</value>-->
+ <!--<value>javax.net.ssl.trustStore=/path/to/msad.truststore</value>-->
<!--<value>javax.net.ssl.trustStorePassword=password</value>-->
<!--</option>-->
<option>
14 years, 8 months
- 1
- 0
gatein SVN: r5761 - in portal/branches/branch-GTNPORTAL-1745/gadgets: server/src/main/webapp and 3 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-01-17 00:02:04 -0500 (Mon, 17 Jan 2011)
New Revision: 5761
Added:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInContainerConfigLoader.java
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/default/
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/default/container.js
Removed:
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/
Modified:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1712: Use ServletContext to load resource, hence escape the constraint on location of container.js
Added: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInContainerConfigLoader.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInContainerConfigLoader.java (rev 0)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInContainerConfigLoader.java 2011-01-17 05:02:04 UTC (rev 5761)
@@ -0,0 +1,18 @@
+package org.exoplatform.portal.gadget.core;
+
+import javax.servlet.ServletContext;
+import java.io.IOException;
+
+/**
+ * A generic loader, used to load gadget server configuration files. We abuse the ThreadLocal here, as there is no way
+ * to associate Guice components with Kernel 's configuration loader component (ConfigurationManager)
+ *
+ * User: Minh Hoang TO - hoang281283(a)gmail.com
+ * Date: 1/12/11
+ * Time: 3:31 PM
+ */
+public abstract class GateInContainerConfigLoader {
+
+ public abstract String loadContentAsString(String path, String encoding) throws IOException;
+
+}
Added: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java (rev 0)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java 2011-01-17 05:02:04 UTC (rev 5761)
@@ -0,0 +1,69 @@
+package org.exoplatform.portal.gadget.core;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.shindig.common.servlet.GuiceServletContextListener;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ * Extending the GuiceServletContextListener to setup a ThreadLocal<GateInContainerConfigLoader> variable wrapping
+ * the ServletContext. That makes the ServletContext accessible within the scope of thread executing the method
+ * contextInitialized
+ *
+ *
+ * User: Minh Hoang TO - hoang281283(a)gmail.com
+ * Date: 1/12/11
+ * Time: 3:50 PM
+ */
+public class GateInGuiceServletContextListener extends GuiceServletContextListener {
+
+ private static ThreadLocal<GateInContainerConfigLoader> currentLoader = new ThreadLocal<GateInContainerConfigLoader>();
+
+ @Override
+ public void contextInitialized(ServletContextEvent event) {
+
+ final ServletContext scontext = event.getServletContext();
+
+ GateInContainerConfigLoader loader = new GateInContainerConfigLoader() {
+ @Override
+ public String loadContentAsString(String path, String encoding) throws IOException{
+
+ InputStream is = scontext.getResourceAsStream(path);
+
+ if(is == null)
+ {
+ throw new NullPointerException("There is no file specified by path : " + path);
+ }
+ return IOUtils.toString(is, encoding);
+ }
+ };
+
+ //Setup the threadlocal loader
+ currentLoader.set(loader);
+
+ try
+ {
+ //Setup the Guice objects, the threadlocal loader is accessible for the moment
+ super.contextInitialized(event);
+ }
+ catch(Exception ex)
+ {
+ ex.printStackTrace();
+ }
+ finally
+ {
+ //Reset the threadlocal loader to null
+ currentLoader.set(null);
+ }
+
+ }
+
+ public static GateInContainerConfigLoader getCurrentLoader()
+ {
+ return currentLoader.get();
+ }
+}
Modified: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java 2011-01-17 04:55:09 UTC (rev 5760)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java 2011-01-17 05:02:04 UTC (rev 5761)
@@ -239,9 +239,12 @@
try {
for (String entry : files) {
LOG.info("Reading container config: " + entry);
- final ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
- InputStream resourceInputStream = contextCl.getResourceAsStream(entry);
- String content = IOUtils.toString(resourceInputStream, "UTF-8");
+ //final ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
+ //InputStream resourceInputStream = contextCl.getResourceAsStream(entry);
+ //String content = IOUtils.toString(resourceInputStream, "UTF-8");
+
+ GateInContainerConfigLoader currentLoader = GateInGuiceServletContextListener.getCurrentLoader();
+ String content = currentLoader.loadContentAsString(entry, "UTF-8");
loadFromString(content, all);
}
} catch (IOException e) {
Modified: portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-01-17 04:55:09 UTC (rev 5760)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-01-17 05:02:04 UTC (rev 5761)
@@ -79,7 +79,8 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class>
+ <!--<listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class>-->
+ <listener-class>org.exoplatform.portal.gadget.core.GateInGuiceServletContextListener</listener-class>
</listener>
<!-- Render a Gadget -->
Added: portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/default/container.js (rev 0)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/containers/default/container.js 2011-01-17 05:02:04 UTC (rev 5761)
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Default container configuration. To change the configuration, you have two options:
+//
+// A. If you run the Java server: Create your own "myContainer.js" file and
+// modify the value in web.xml.
+//
+// B. If you run the PHP server: Create a myContainer.js, copy the contents of container.js to it,
+// change
+// {"gadgets.container" : ["default"],
+// to
+// {"gadgets.container" : ["myContainer"],
+// And make your changes that you need to myContainer.js.
+// Just make sure on the iframe URL you specify &container=myContainer
+// for it to use that config.
+//
+// All configurations will automatically inherit values from this
+// config, so you only need to provide configuration for items
+// that you require explicit special casing for.
+//
+// Please namespace your attributes using the same conventions
+// as you would for javascript objects, e.g. gadgets.features
+// rather than "features".
+
+// NOTE: Please _don't_ leave trailing commas because the php json parser
+// errors out on this.
+
+// Container must be an array; this allows multiple containers
+// to share configuration.
+{"gadgets.container" : ["default"],
+
+// Set of regular expressions to validate the parent parameter. This is
+// necessary to support situations where you want a single container to support
+// multiple possible host names (such as for localized domains, such as
+// <language>.example.org. If left as null, the parent parameter will be
+// ignored; otherwise, any requests that do not include a parent
+// value matching this set will return a 404 error.
+"gadgets.parent" : null,
+
+// Should all gadgets be forced on to a locked domain?
+"gadgets.lockedDomainRequired" : false,
+
+// DNS domain on which gadgets should render.
+"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
+
+// Various urls generated throughout the code base.
+// iframeBaseUri will automatically have the host inserted
+// if locked domain is enabled and the implementation supports it.
+// query parameters will be added.
+"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
+
+// jsUriTemplate will have %host% and %js% substituted.
+// No locked domain special cases, but jsUriTemplate must
+// never conflict with a lockedDomainSuffix.
+"gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%",
+
+// Callback URL. Scheme relative URL for easy switch between https/http.
+"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
+
+// Use an insecure security token by default
+"gadgets.securityTokenType" : "secure",
+"gadgets.securityTokenKeyFile" : "key.txt",
+
+"gadgets.signingKeyFile" : "oauthkey.pem",
+"gadgets.signingKeyName" : "mytestkey",
+
+"gadgets.signedFetchDomain" : "eXo",
+// Config param to load Opensocial data for social
+// preloads in data pipelining. %host% will be
+// substituted with the current host.
+"gadgets.osDataUri" : "http://%host%/social/rpc",
+
+// Uncomment these to switch to a secure version
+//
+//"gadgets.securityTokenType" : "secure",
+//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
+
+"gadgets.content-rewrite" : {
+ "include-urls": ".*",
+ "exclude-urls": "",
+ "include-tags": ["link", "script", "embed", "img", "style"],
+ "expires": "86400",
+ "proxy-url": "/eXoGadgetServer/gadgets/proxy?url=",
+ "concat-url": "/eXoGadgetServer/gadgets/concat?"
+},
+
+// This config data will be passed down to javascript. Please
+// configure your object using the feature name rather than
+// the javascript name.
+
+// Only configuration for required features will be used.
+// See individual feature.xml files for configuration details.
+"gadgets.features" : {
+ "core.io" : {
+ // Note: /proxy is an open proxy. Be careful how you expose this!
+ "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ },
+ "views" : {
+ "home" : {
+ "isOnlyVisible" : false,
+ "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
+ "aliases": ["DASHBOARD", "default"]
+ },
+ "canvas" : {
+ "isOnlyVisible" : true,
+ "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
+ "aliases" : ["FULL_PAGE"]
+ }
+ },
+ "rpc" : {
+ // Path to the relay file. Automatically appended to the parent
+ /// parameter if it passes input validation and is not null.
+ // This should never be on the same host in a production environment!
+ // Only use this for TESTING!
+ "parentRelayUrl" : "/eXoGadgetServer/gadgets/files/container/rpc_relay.html",
+
+ // If true, this will use the legacy ifpc wire format when making rpc
+ // requests.
+ "useLegacyProtocol" : false
+ },
+ // Skin defaults
+ "skins" : {
+ "properties" : {
+ "BG_COLOR": "",
+ "BG_IMAGE": "",
+ "BG_POSITION": "",
+ "BG_REPEAT": "",
+ "FONT_COLOR": "",
+ "ANCHOR_COLOR": ""
+ }
+ },
+ "opensocial-0.8" : {
+ // Path to fetch opensocial data from
+ // Must be on the same domain as the gadget rendering server
+ "path" : "http://%host%/social",
+ "domain" : "shindig",
+ "enableCaja" : false,
+ "supportedFields" : {
+ "person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"],
+ "activity" : ["id", "title"]
+ }
+ },
+ "osapi.services" : {
+ // Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
+ // provided by the container and delay the gadget onLoad handler until that introspection is
+ // complete.
+ // Alternatively a container can directly configure services here rather than having them
+ // introspected. Simply list out the available servies and omit "container.listMethods" to
+ // avoid the initialization delay caused by gadgets.rpc
+ // E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
+ "gadgets.rpc" : ["container.listMethods"]
+ },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
+ "osml": {
+ // OSML library resource. Can be set to null or the empty string to disable OSML
+ // for a container.
+ "library": ""
+ }
+}}
14 years, 8 months
- 1
- 0
gatein SVN: r5760 - in epp/docs/branches: EPP_5_0_Branch/Reference_Guide/en-US and 14 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-01-16 23:55:09 -0500 (Sun, 16 Jan 2011)
New Revision: 5760
Modified:
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Introduction.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
Log:
Updating repos
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -11,8 +11,8 @@
<subtitle>An Installation Guide for JBoss Enterprise Portal Platform</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
- <edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <edition>2</edition>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -18,7 +18,7 @@
<title>Give us Feedback</title>
<para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the . The following link will take you to bug report for &PRODUCT;<ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
+ If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &PRODUCT; &BOOKID;. The following link will take you to bug report for &PRODUCT; <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
</para>
<para>
Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>2-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -35,7 +49,7 @@
<member>Numerous bug fixes.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.7</revnumber>
<date>Thu Dec 02 2010</date>
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,8 +8,8 @@
<subtitle>An in-depth guide to Enterprise Portal Platform 5.0.1</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
- <edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <edition>2</edition>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Middleware_Feedback.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Middleware_Feedback.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -18,7 +18,7 @@
<title>Give us Feedback</title>
<para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the . The following link will take you to bug report for &PRODUCT;<ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
+ If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &PRODUCT; &BOOKID;. The following link will take you to bug report for &PRODUCT; <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
</para>
<para>
Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>2-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-4.3</revnumber>
+ <date>Thu Dec 16 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated WSRP removal content.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -21,7 +49,7 @@
</simplelist>
</revdescription>
</revision>
- <revision>
+<!-- <revision>
<revnumber>1-4.0</revnumber>
<date>Thu Dec 09 2010</date>
<author>
@@ -35,7 +63,7 @@
</simplelist>
</revdescription>
</revision>
-<!-- <revision>
+ <revision>
<revnumber>1-1.12</revnumber>
<date>Thu Dec 02 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -178,8 +178,11 @@
</varlistentry>
</variablelist>
<para>
- If WSRP is not going to be used in your &PRODUCT; instance, the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</filename> can be removed to deactivate WSRP support.
- </para>
+ If WSRP is not going to be used in your &PRODUCT; instance your installation will not be adversely affected should you leave the WSRP files in place.
+ </para>
+ <para>
+ However, if you wish to completely remove WSRP from your &PRODUCT; installation, follow the procedure at <ulink type="http" url="http://community.jboss.org/wiki/WSRPserviceremovalprocedure"></ulink>.
+ </para> <!-- DOC NOTE: Port this procedure into the doc for EPP 5.1.1 JBEPP-739 -->
<section id="sect-Reference_Guide-Deploying_WSRP-Non_default_Ports_or_Hostnames">
<title>Non-default Ports or Hostnames</title>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -6,8 +6,8 @@
<subtitle>A User Guide for Enterprise Portal Platform</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
- <edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <edition>2</edition>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Middleware_Feedback.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Middleware_Feedback.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -18,7 +18,7 @@
<title>Give us Feedback</title>
<para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the . The following link will take you to bug report for &PRODUCT;<ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
+ If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &PRODUCT; &BOOKID;. The following link will take you to bug report for &PRODUCT; <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
</para>
<para>
Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>2-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -61,6 +61,11 @@
Click the <emphasis role="bold">Save</emphasis> button to accept the change.
</para>
</step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Close</emphasis> and then click <emphasis role="bold">Finish</emphasis>.
+ </para>
+ </step>
</procedure>
</section>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -289,6 +289,11 @@
Click on the <guilabel>View Page Properties</guilabel> button in the <emphasis role="bold">Page Editor</emphasis> window.
</para>
</step>
+ <step>
+ <para>
+ Click on <emphasis role="bold">View Page Properties</emphasis> in the <emphasis role="bold">Page Editor</emphasis>.
+ </para>
+ </step>
<step>
<para>
Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab.
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -203,7 +203,7 @@
<imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="100mm" />
+ <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="70mm" />
</imageobject>
</mediaobject>
<para>
@@ -214,7 +214,7 @@
<section id="proc-User_Guide-Manage_Portals-Edit_Properties">
<title>Edit Properties</title>
<para>
- Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Portal Properties</emphasis> link for the portal you wish to edit:
+ Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis role="bold">Edit Portal Properties</emphasis> link for the portal you wish to edit:
</para>
<mediaobject>
<imageobject role="html">
@@ -353,7 +353,7 @@
</section>
<section id="sect-User_Guide-Switching_between_Portals">
- <title>Switching between Portals</title>
+ <title>Switching between portals</title>
<para>
Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access rights:
</para>
@@ -366,7 +366,7 @@
</imageobject>
</mediaobject>
<para>
- Users switch between Portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
+ Users switch between portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
</para>
</section>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -212,9 +212,9 @@
<section id="sect-User_Guide-User_Management-Manage_groups">
<title>Manage groups</title>
<para>
- Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis>
</para>
- <para>Select the tab <emphasis>Group Management</emphasis></para>
+ <para>Select the tab <emphasis role="bold">Group Management</emphasis></para>
<para>
By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group along with a small form to add a new user to a group.
</para>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -78,7 +78,7 @@
<imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="70mm" />
</imageobject>
</mediaobject>
<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running &PRODUCT;. It forms part of the complete document suite along with the &PRODUCT; User Guide and the &PRODUCT; Reference Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." />.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -18,7 +18,7 @@
<title>Give us Feedback</title>
<para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the . The following link will take you to bug report for &PRODUCT;<ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
+ If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &PRODUCT; &BOOKID;. The following link will take you to bug report for &PRODUCT; <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
</para>
<para>
Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -122,7 +122,7 @@
<para>
Edit the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/messaging/messaging-jboss-beans.xml</filename> file and change the suckerPassword value from "CHANGE ME!!" to a plain text password:
</para>
-<programlisting>>property name="suckerPassword"<CHANGE ME!!</property>
+<programlisting><property name="suckerPassword">CHANGE ME!!</property>
</programlisting>
</step>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -36,7 +50,7 @@
</simplelist>
</revdescription>
</revision>
- <revision>
+ <!--<revision>
<revnumber>1-4.0</revnumber>
<date>Thu Dec 09 2010</date>
<author>
@@ -49,7 +63,7 @@
<member>Numerous bug fixes.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision>-->
<revision>
<revnumber>1-2.3</revnumber>
<date>Mon Nov 29 2010</date>
@@ -116,11 +130,11 @@
</author>
<revdescription>
<simplelist>
- <member>Added Recommended Practices section from earlier Release Notes.</member>
+ <member>Added Recommended Practices section.</member>
</simplelist>
</revdescription>
</revision>
- <revision>
+ <!--<revision>
<revnumber>1-1.7</revnumber>
<date>Tue Oct 26 2010</date>
<author>
@@ -147,7 +161,7 @@
<member>Edit Product version number for publishing restructure.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision>-->
<revision>
<revnumber>1-1.3</revnumber>
<date>Tue Apr 28 2010</date>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>4.6</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-4.6</revnumber>
<date>Sat Dec 18 2010</date>
<author>
@@ -35,7 +49,7 @@
</simplelist>
</revdescription>
</revision>
- <revision>
+ <!-- <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -77,7 +91,7 @@
</simplelist>
</revdescription>
</revision>
-<!-- <revision>
+ <revision>
<revnumber>1-1.22</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -132,7 +146,7 @@
<member>Removed version-specific content and documentation notes for limited Beta release.</member>
</simplelist>
</revdescription>
- </revision> -->
+ </revision>
<revision>
<revnumber>1-1.17</revnumber>
@@ -148,7 +162,7 @@
</simplelist>
</revdescription>
</revision>
- <!-- <revision>
+ <revision>
<revnumber>1-1.15</revnumber>
<date>Thu Nov 11 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -657,7 +657,16 @@
</para>
</listitem>
</varlistentry>
-
+
+ <varlistentry>
+ <term><ulink type="http" url="https://issues.jboss.org/jira/browse/JBEPP-640"></ulink></term>
+ <listitem>
+ <para>
+ Using the <literal>OrganizationPortlet</literal> to edit existing user entries, the changes were applied to LDAP even though the attribute was marked as <literal>readOnly</literal> in the picketlink configuration. This has been fixed in PicketLink and any updates to <literal>readOnly</literal> attributes are now silently failing.
+ </para>
+ </listitem>
+ </varlistentry>
+
<!-- JBEPP-642 -->
<varlistentry>
<term><ulink url="https://issues.jboss.org/jira/browse/JBEPP-642"/></term>
@@ -763,10 +772,10 @@
<term><ulink type="http" url="https://issues.jboss.org/browse/JBEPP-737"></ulink></term>
<listitem>
<para>
- The upload service will not work with Internet Explorer 7, any application using the upload service (such as EPP SP) will not behave correctly with this web browser unless if a name has been provided.
+ The upload service will not work with Internet Explorer 7, any application using the upload service (such as the Enterprise Portal Platform Site Publisher extension) will not behave correctly with this web browser unless a name has been provided.
</para>
<para>
- A patch is available from the Red Hat Customer Support Portal.
+ A patch is available from the <ulink type="http" url="https://access.redhat.com/jbossnetwork/restricted/softwareDetail.html?sof...">Red Hat Customer Support Portal</ulink>.
</para>
</listitem>
</varlistentry>
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -7,7 +7,7 @@
<title>5.1.0 Release Notes</title>
<subtitle>For use with JBoss Enterprise Portal Platform 5.1.0</subtitle>
<edition>1</edition>
- <pubsnumber>1.5</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<abstract>
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-1.7</revnumber>
+ <date>Sat Dec 18 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated Issues Fixed list.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-1.5</revnumber>
<date>Mon Dec 06 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running &PRODUCT;. It forms the documentation suite along with the &PRODUCT; User Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html" />
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -55,7 +55,7 @@
Installation of the Site Publisher add-on requires various configuration files to be copied to the configuration location of your &JBEPP; instance.
</para>
<para>
- There are three possible locations for these configuration files depending on your &PRODUCT; configuration setup:
+ There are three possible locations for these configuration files depending on your &JBEPP; configuration setup:
</para>
<variablelist>
<varlistentry>
@@ -113,7 +113,7 @@
</step>
<step>
<para>
- Download the <filename>eppsp-5.1.0-exo-2.1.2-GA.zip</filename> file from the Red Hat JBoss Customer Support Portal and extract it to an easily accessible location.
+ Download the <filename>jboss-eppsp-5.1.0-exo-2.1.2-GA.zip</filename> file from the Red Hat JBoss Customer Support Portal and extract it to an easily accessible location.
</para>
</step>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Introduction.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Introduction.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Introduction.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -6,7 +6,7 @@
<chapter id="chap-Installation_Guide-Introduction">
<title>Introduction</title>
<para>
- &PRODUCT; is a new add-on component for JBoss Enterprise Portal Platform. It enables users to create, edit and publish rich web content within the context of their portal installation.
+ &PRODUCT; (powered by eXo) is a new add-on component for JBoss Enterprise Portal Platform. It enables users to create, edit and publish rich web content within the context of their portal installation.
</para>
<para>
Site Publisher simplifies the authoring and management for every website an organization needs to deploy. It includes the ability to administer sites, manage navigation, and publish content. Site Publisher delivers powerful functionality to everyone responsible for maintaining web content.
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Middleware_Feedback.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -18,7 +18,7 @@
<title>Give us Feedback</title>
<para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the . The following link will take you to bug report for &PRODUCT;<ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
+ If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &PRODUCT; &BOOKID;. The following link will take you to bug report for &PRODUCT; <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
</para>
<para>
Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
+ <revnumber>1-4.3</revnumber>
+ <date>Thu Dec 16</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Preparation for 5.1.0 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision> -->
+ <revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -21,7 +49,7 @@
</simplelist>
</revdescription>
</revision>
- <revision>
+<!-- <revision>
<revnumber>1-4.1</revnumber>
<date>Fri Dec 10 2010</date>
<author>
@@ -49,7 +77,7 @@
</simplelist>
</revdescription>
</revision>
-<!-- <revision>
+ <revision>
<revnumber>1-1.2</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -62,7 +90,7 @@
<member>Published to 5.1 branch.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.1</revnumber>
<date>Wed Nov 17 2010</date>
@@ -76,7 +104,7 @@
<member>Added first draft content.</member>
</simplelist>
</revdescription>
- </revision> -->
+ </revision>
<revision>
<revnumber>1-1.0</revnumber>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.2</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
These release notes contain important information related to &PRODUCT; &VERSION_MICRO; that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing the product.
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-1.3</revnumber>
+ <date>Sun Dec 19 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added Known Issues descriptions.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!--<revision>
<revnumber>1-1.2</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -21,7 +49,7 @@
</simplelist>
</revdescription>
</revision>
- <!--<revision>
+ <revision>
<revnumber>1-1.1</revnumber>
<date>Wed Nov 17 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -13,7 +13,7 @@
<note>
<title>Subscription</title>
<para>
- A subscriptions to &PRODUCT; are available at an additional fee over and above &EPP; Subscriptions.
+ A subscriptions to &PRODUCT; are available at an additional fee over and above &EPP; subscriptions.
</para>
</note>
<para>
@@ -42,6 +42,7 @@
</listitem>
</itemizedlist>
</section>
+
<!-- <section id="sect-Release_Notes-New_Features_and_Components">
<title>New and Upgraded Components</title>
<variablelist id="vari-Release_Notes-New_Features_and_Components-New_Features">
@@ -66,7 +67,6 @@
</listitem>
</varlistentry>
</variablelist>
-
</section>-->
<!--<section id="sect-Release_Notes-Component_Versions">
@@ -251,13 +251,35 @@
</para>
<variablelist>
<varlistentry>
- <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-XYZ" /></term>
- <listitem>
- <para>
- TEXT
- </para>
- </listitem>
- </varlistentry>
+ <term><ulink type="http" url="https://issues.jboss.org/browse/JBEPP-733"></ulink></term>
+ <listitem>
+ <para>
+ The upload service will not work with Internet Explorer 7. Any application using the upload service (such as Site Publisher) will not behave correctly with this web browser unless a name has been provided for the file being uploaded.
+ </para>
+ <para>
+ A patch is available from the <ulink type="http" url="https://access.redhat.com/jbossnetwork/restricted/softwareDetail.html?sof...">Red Hat Customer Support Portal</ulink>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><ulink type="http" url="https://issues.jboss.org/browse/JBEPP-645"></ulink></term>
+ <listitem>
+ <para>
+ A content duplicity check in Site Publisher's "Multiple content selector" does not work as expected. Users are able to select the same content item more than once if it has multiple "paths" in the the Java Content Repository (if the item is available in more than one category, for example).
+ </para>
+ <para>
+ The Multiple content selector should not allow selecting the same item more than once.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><ulink type="http" url="http://jira.exoplatform.org/browse/ECMS-1876"></ulink></term>
+ <listitem>
+ <para>
+ New users, when added as managers for newly created groups, are unable to administer actions on that group as they are not presented with the administration navigation needed to perform those actions.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -7,7 +7,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>4.2</pubsnumber>
+ <pubsnumber>5.1</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -8,6 +8,48 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-5.1</revnumber>
+ <date>Tue Dec 21 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>December 2010 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-4.4</revnumber>
+ <date>Sat Dec 18 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated futher QE feedback.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-4.3</revnumber>
+ <date>Fri Dec 17 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Converted images to 32 bit to resolve pdf color bug.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!--<revision>
<revnumber>1-4.2</revnumber>
<date>Mon Dec 13 2010</date>
<author>
@@ -35,7 +77,7 @@
</simplelist>
</revdescription>
</revision>
- <!--<revision>
+ <revision>
<revnumber>1-2.10</revnumber>
<date>Mon Dec 06 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -61,6 +61,11 @@
Click the <emphasis role="bold">Save</emphasis> button to accept the change.
</para>
</step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Close</emphasis> and then click <emphasis role="bold">Finish</emphasis>.
+ </para>
+ </step>
</procedure>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -283,6 +283,11 @@
Locate the page you want to edit using the <emphasis role="bold">Page Id</emphasis> column then click the edit icon (next to the trash icon). You will be taken to the <emphasis role="bold">Page Editor</emphasis>.
</para>
</step>
+ <step>
+ <para>
+ Click on <emphasis role="bold">View Page Properties</emphasis> in the <emphasis role="bold">Page Editor</emphasis>.
+ </para>
+ </step>
<step>
<para>
Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab.
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -222,7 +222,7 @@
<imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="70mm" />
</imageobject>
</mediaobject>
<para>
@@ -233,7 +233,7 @@
<section id="proc-User_Guide-Manage_Portals-Edit_Properties">
<title>Edit Properties</title>
<para>
- Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Portal Properties</emphasis> link for the portal you wish to edit:
+ Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis role="bold">Edit Portal Properties</emphasis> link for the portal you wish to edit:
</para>
<mediaobject>
<imageobject role="html">
@@ -372,7 +372,7 @@
</section>
<section id="sect-User_Guide-Switching_between_Portals">
- <title>Switching between Portals</title>
+ <title>Switching between portals</title>
<para>
Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access rights:
</para>
@@ -385,7 +385,7 @@
</imageobject>
</mediaobject>
<para>
- Users switch between Portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
+ Users switch between portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -212,9 +212,9 @@
<section id="sect-User_Guide-User_Management-Manage_groups">
<title>Manage groups</title>
<para>
- Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis>
</para>
- <para>Select the tab <emphasis>Group Management</emphasis></para>
+ <para>Select the tab <emphasis role="bold">Group Management</emphasis></para>
<para>
By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group along with a small form to add a new user to a group.
</para>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-01-15 14:54:22 UTC (rev 5759)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-01-17 04:55:09 UTC (rev 5760)
@@ -78,7 +78,7 @@
<imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="70mm" />
</imageobject>
</mediaobject>
<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
14 years, 8 months
- 1
- 0
gatein SVN: r5759 - components/pc/trunk/api/src/main/java/org/gatein/pc/api.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-15 09:54:22 -0500 (Sat, 15 Jan 2011)
New Revision: 5759
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
Log:
javadoc
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-15 14:52:32 UTC (rev 5758)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-15 14:54:22 UTC (rev 5759)
@@ -57,7 +57,7 @@
* @param portletContext the portlet context in the scope of this invoker
* @return the <code>PortletInfo</code> for the specified portlet
* @throws IllegalArgumentException if the portlet context is null
- * @throws PortletInvokerException a portlet invoker exception
+ * @throws PortletInvokerException a portlet invoker exception
*/
Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
@@ -66,9 +66,9 @@
* a relationship with this portlet invoker.
*
* @param portletContext the portlet context
- * @return
- * @throws IllegalArgumentException
- * @throws PortletInvokerException
+ * @return the portlet status
+ * @throws IllegalArgumentException if the portlet context is null
+ * @throws PortletInvokerException a portlet invoker exception
*/
PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
14 years, 8 months
- 1
- 0
gatein SVN: r5758 - in components/pc/trunk: federation/src/main/java/org/gatein/pc/federation/impl and 5 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-15 09:52:32 -0500 (Sat, 15 Jan 2011)
New Revision: 5758
Added:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletStatus.java
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java
Log:
GTNPC-49 : Add methods on PortletInvoker to determine the relationship between a portlet and an invoker
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -62,6 +62,17 @@
Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
/**
+ * Returns the status of a specified {@code #PortletContext} or null if the portlet context does not have
+ * a relationship with this portlet invoker.
+ *
+ * @param portletContext the portlet context
+ * @return
+ * @throws IllegalArgumentException
+ * @throws PortletInvokerException
+ */
+ PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException;
+
+ /**
* Determines whether the specified PortletContext is part of the set of exposed Portlets as returned by {@link
* #getPortlets()}.
*
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletStatus.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletStatus.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletStatus.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * 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.
+ */
+
+package org.gatein.pc.api;
+
+/**
+ * The status of the relationship of a portlet with an invoker.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public enum PortletStatus
+{
+
+ /**
+ * A portlet is managed by the PortletInvoker when the invoker is able to perform any operation on it.
+ */
+ MANAGED,
+
+ /**
+ * A portlet part of the set of exposed portlets as returned by {@link PortletInvoker#getPortlets()}.
+ */
+ OFFERED
+
+}
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -27,6 +27,7 @@
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.StateEvent;
import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.invocation.PortletInvocation;
@@ -107,16 +108,20 @@
return new FederatedPortlet(this, compoundPortletContext, portlet);
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
PortletContext context = dereference(portletContext);
- return portletInvoker.isExposed(context);
+ return portletInvoker.getStatus(context);
}
+ public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return getStatus(portletContext) == PortletStatus.OFFERED;
+ }
+
public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- PortletContext context = dereference(portletContext);
- return portletInvoker.isKnown(context);
+ return getStatus(portletContext) != null;
}
private class FederatedInstanceContext implements InstanceContext
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -31,6 +31,7 @@
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.StatefulPortletContext;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
@@ -204,16 +205,20 @@
return federated.getPortlet(compoundPortletContext);
}
- public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
PortletInvoker federated = getFederatedPortletInvokerFor(portletContext);
- return federated.isExposed(portletContext);
+ return federated.getStatus(portletContext);
}
+ public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return getStatus(portletContext) == PortletStatus.OFFERED;
+ }
+
public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- PortletInvoker federated = getFederatedPortletInvokerFor(portletContext);
- return federated.isKnown(portletContext);
+ return getStatus(portletContext) != null;
}
public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
Modified: components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -28,6 +28,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.info.MetaInfo;
import org.gatein.pc.api.info.PortletInfo;
import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
@@ -116,26 +117,16 @@
}
@Test
- public void testIsExposed() throws PortletInvokerException
+ public void testGetStatus() throws PortletInvokerException
{
- assertTrue(federatingInvoker.isExposed(PortletContext.createPortletContext("foo.MyPortlet")));
- assertTrue(federatingInvoker.isExposed(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
+ assertEquals(PortletStatus.OFFERED, federatingInvoker.getStatus(PortletContext.createPortletContext("foo.MyPortlet")));
+ assertEquals(PortletStatus.OFFERED, federatingInvoker.getStatus(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
- assertTrue(federatedInvoker.isExposed(PortletContext.createPortletContext("foo.MyPortlet")));
- assertTrue(localInvoker.isExposed(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
+ assertEquals(PortletStatus.OFFERED, federatedInvoker.getStatus(PortletContext.createPortletContext("foo.MyPortlet")));
+ assertEquals(PortletStatus.OFFERED, localInvoker.getStatus(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
}
@Test
- public void testIsKnown() throws PortletInvokerException
- {
- assertTrue(federatingInvoker.isKnown(PortletContext.createPortletContext("foo.MyPortlet")));
- assertTrue(federatingInvoker.isKnown(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
-
- assertTrue(federatedInvoker.isKnown(PortletContext.createPortletContext("foo.MyPortlet")));
- assertTrue(localInvoker.isKnown(PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet")));
- }
-
- @Test
public void testFederation() throws PortletInvokerException
{
Collection federateds = federatingInvoker.getFederatedInvokers();
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/PortletInvokerInterceptor.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -27,6 +27,7 @@
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.state.DestroyCloneFailure;
@@ -82,6 +83,11 @@
return safeGetNext().getPortlet(portletContext);
}
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return safeGetNext().getStatus(portletContext);
+ }
+
public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
return safeGetNext().isExposed(portletContext);
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/container/ContainerPortletInvoker.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -28,6 +28,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.info.PortletInfo;
import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.invocation.PortletInvocation;
@@ -87,17 +88,27 @@
return new HashSet<Portlet>(portlets.values());
}
- @Override
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ if (portletContext == null)
+ {
+ throw new IllegalArgumentException("The portlet context cannot be null");
+ }
+ if (portlets.containsKey(portletContext.getId()))
+ {
+ return PortletStatus.OFFERED;
+ }
+ return null;
+ }
+
public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- ParameterValidation.throwIllegalArgExceptionIfNull(portletContext, "PortletContext");
- return portlets.containsKey(portletContext.getId());
+ return getStatus(portletContext) == PortletStatus.OFFERED;
}
- @Override
public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- return isExposed(portletContext);
+ return getStatus(portletContext) != null;
}
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -30,6 +30,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.StateEvent;
import org.gatein.pc.api.StatefulPortletContext;
import org.gatein.pc.api.info.PortletInfo;
@@ -125,18 +126,25 @@
}
@Override
- public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
try
{
- return getPortlet(portletContext) != null;
+ getPortlet(portletContext);
+ return PortletStatus.MANAGED;
}
catch (NoSuchPortletException e)
{
- return false;
+ return null;
}
}
+ @Override
+ public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return getStatus(portletContext) != null;
+ }
+
private <S extends Serializable> Portlet _getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
Modified: components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java
===================================================================
--- components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java 2011-01-15 01:21:08 UTC (rev 5757)
+++ components/pc/trunk/portlet/src/test/java/org/gatein/pc/portlet/support/PortletInvokerSupport.java 2011-01-15 14:52:32 UTC (rev 5758)
@@ -29,6 +29,7 @@
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.PortletStatus;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.state.DestroyCloneFailure;
@@ -132,14 +133,19 @@
return internalGetPortlet(portletContext);
}
+ public PortletStatus getStatus(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return portlets.containsKey(portletContext.getId()) ? PortletStatus.OFFERED : null;
+ }
+
public boolean isExposed(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- return portlets.containsKey(portletContext.getId());
+ return getStatus(portletContext) == PortletStatus.OFFERED;
}
public boolean isKnown(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- return isExposed(portletContext);
+ return getStatus(portletContext) != null;
}
public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
14 years, 8 months
- 1
- 0