gatein SVN: r5624 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-22 03:43:58 -0500 (Wed, 22 Dec 2010)
New Revision: 5624
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_12_ImportApplication.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
Log:
TESTVN-2247 - Daily tests on GateIn - Clean and improve scripts
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_12_ImportApplication.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_12_ImportApplication.html 2010-12-22 07:04:43 UTC (rev 5623)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_12_ImportApplication.html 2010-12-22 08:43:58 UTC (rev 5624)
@@ -296,7 +296,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2010-12-22 07:04:43 UTC (rev 5623)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2010-12-22 08:43:58 UTC (rev 5624)
@@ -257,16 +257,36 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Switch View mode</td>
<td></td>
@@ -561,7 +581,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
14 years
- 1
- 0
gatein SVN: r5623 - exo/portal/branches/webos-gatein-branch.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-12-22 02:04:43 -0500 (Wed, 22 Dec 2010)
New Revision: 5623
Modified:
exo/portal/branches/webos-gatein-branch/pom.xml
Log:
Update dependencies to released versions
Modified: exo/portal/branches/webos-gatein-branch/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-22 06:46:03 UTC (rev 5622)
+++ exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-22 07:04:43 UTC (rev 5623)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.6-GA-SNAPSHOT</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.6-GA-SNAPSHOT</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.6-GA-SNAPSHOT</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.6-GA-SNAPSHOT</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.6-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.6-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.6-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.6-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
14 years
- 1
- 0
gatein SVN: r5622 - in portal/branches/branch-GTNPORTAL-1731: portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component and 8 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-12-22 01:46:03 -0500 (Wed, 22 Dec 2010)
New Revision: 5622
Modified:
portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
Log:
GTNPORTAL-1720: Rename the confusing methods setFullRender/getFullRender in PortalRequestContext
Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -324,7 +324,7 @@
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -140,7 +140,7 @@
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(
uiApp.findFirstComponentOfType(UIWorkingWorkspace.class));
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
UIAccountEditInputSet accountInput = uiUserInfo.getChild(UIAccountEditInputSet.class);
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -403,11 +403,30 @@
* 2) Portlets will be fully rendered if are inner of the portal ui components being updated
*
* @param forceFullUpdate
+ *
+ * This method is deprecated, ignoreAJAXUpdateOnPortlets should be used instead
*/
+ @Deprecated()
final public void setFullRender(boolean forceFullUpdate)
{
this.forceFullUpdate = forceFullUpdate;
}
+
+ /**
+ * Call to this method makes sense only in the scope of an AJAX request.
+ *
+ * Invoking ignoreAJAXUpdateOnPortlets(true) as there is need to update only UI components
+ * of portal (ie: the components outside portlet windows) are updated by AJAX. In the request
+ * response, all the blocks <PortletRespond > are empty. The content displayed in portlet
+ * windows are retrieved by non-AJAX render request to associated portlet object.
+ *
+ *
+ * @param ignoreAJAXUpdateOnPortlets
+ */
+ final public void ignoreAJAXUpdateOnPortlets(boolean ignoreAJAXUpdateOnPortlets)
+ {
+ this.forceFullUpdate = ignoreAJAXUpdateOnPortlets;
+ }
final public void sendRedirect(String url) throws IOException
{
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -262,7 +262,7 @@
PortalRequestContext pcontext = Util.getPortalRequestContext();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
static public class AddApplicationActionListener extends EventListener<UIAddNewApplication>
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -526,7 +526,7 @@
{
log
.info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page");
- context.setFullRender(true);
+ context.ignoreAJAXUpdateOnPortlets(true);
}
if (newEvents != null && !newEvents.isEmpty())
{
@@ -751,7 +751,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE);
if (windowState == null)
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -170,7 +170,7 @@
try
{
PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance();
- prcontext.setFullRender(true);
+ prcontext.ignoreAJAXUpdateOnPortlets(true);
StatefulPortletContext portletContext = uiPortlet_.getPortletContext();
ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_);
@@ -407,7 +407,7 @@
UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIPortlet.class);
}
}
@@ -429,7 +429,7 @@
uiMaskWorkspace.setUIComponent(null);
uiMaskWorkspace.setWindowSize(-1, -1);
pcontext.addUIComponentToUpdateByAjax(uiMaskWorkspace);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIPortlet.class);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -82,7 +82,7 @@
UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -145,7 +145,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIContainer.class);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -116,7 +116,7 @@
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
return;
}
@@ -136,7 +136,7 @@
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
return;
}
}
@@ -166,7 +166,7 @@
uiPopup.setShow(false);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
}
private void setNavigation(List<PageNavigation> navs, PageNavigation nav)
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -452,7 +452,7 @@
// convert Page to UIPage
PortalDataMapper.toUIPage(uiPage, selectPage);
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
else
{
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -254,7 +254,7 @@
uiToolPanel.setShowMaskLayer(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIContainer uiParent = uiPageNodeSelector.getParent();
PageNode node = null;
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -64,7 +64,7 @@
//This code snippet is to make sure that Javascript/Skin is fully loaded at the first request
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = Util.getPortalRequestContext();
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
PageNavigation currentNav = showedUIPortal.getSelectedNavigation();
@@ -422,7 +422,7 @@
}
}
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- pcontext.setFullRender(false);
+ pcontext.ignoreAJAXUpdateOnPortlets(false);
pcontext.setResponseComplete(true);
pcontext.getWriter().write(EventListener.RESULT_OK);
}
@@ -445,7 +445,7 @@
}
DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
dataService.save(page);
- pcontext.setFullRender(false);
+ pcontext.ignoreAJAXUpdateOnPortlets(false);
pcontext.setResponseComplete(true);
pcontext.getWriter().write(EventListener.RESULT_OK);
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -454,7 +454,7 @@
//uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -321,7 +321,7 @@
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
@@ -339,7 +339,7 @@
UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel();
toolPanel.setShowMaskLayer(true);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -100,7 +100,7 @@
UIPortal uiPortal = Util.getUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
void updateWizardComponent()
@@ -111,7 +111,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
static public class AbortActionListener extends EventListener<UIPageWizard>
@@ -124,7 +124,7 @@
UIPortal uiPortal = Util.getUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -168,7 +168,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
// event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS) ;
- Util.getPortalRequestContext().setFullRender(false);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false);
if (language == null || language.trim().length() < 1)
return;
// if(!uiPortal.isModifiable()) return;
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -72,7 +72,7 @@
{
PortalRequestContext pContext = (PortalRequestContext)event.getRequestContext();
HttpServletRequest request = pContext.getRequest();
- pContext.setFullRender(false);
+ pContext.ignoreAJAXUpdateOnPortlets(false);
pContext.setResponseComplete(true);
pContext.getWriter().write("" + request.getSession().getMaxInactiveInterval());
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -231,7 +231,7 @@
if (newComponent)
{
portalComposer.updateWorkspaceComponent();
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class);
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -408,7 +408,7 @@
uiEditWS.getComposer().setEditted(false);
uiEditWS.setRendered(false);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
UISiteBody siteBody = uiWorkingWS.findFirstComponentOfType(UISiteBody.class);
UIPortal uiPortal = uiWorkingWS.getBackupUIPortal();
@@ -459,7 +459,7 @@
uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive()));
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
String uri = (uiPortal.getSelectedNode() != null)? (uiPortal.getSelectedNode().getUri()) : null;
@@ -582,7 +582,7 @@
}
event.getSource().updateWorkspaceComponent();
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
}
@@ -655,7 +655,7 @@
UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
UIPortal uiPortal = uiPortalApp.getShowedUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
@@ -704,7 +704,7 @@
uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageId}, 1));
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
PageNodeEvent<UIPortal> pnevent =
new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE,
(uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null));
@@ -761,7 +761,7 @@
}
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
PageNodeEvent<UIPortal> pnevent =
new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null
? uiPortal.getSelectedNode().getUri() : null));
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -100,7 +100,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
//event.getRequestContext().addUIComponentToUpdateByAjax(uiApp) ;
- Util.getPortalRequestContext().setFullRender(false);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false);
if (skin == null || skin.trim().length() < 1)
return;
uiApp.setSkin(skin);
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -67,7 +67,7 @@
PortalRequestContext portalRequestContext = (PortalRequestContext)context.getParentAppRequestContext();
UIWorkingWorkspace uiWorkingWS = portalApplication.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
portalRequestContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- portalRequestContext.setFullRender(true);
+ portalRequestContext.ignoreAJAXUpdateOnPortlets(true);
}
/**
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -315,7 +315,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
return uiWorkingWS;
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -97,7 +97,7 @@
pageBody.setUIComponent(null);
event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
}
@@ -202,7 +202,7 @@
uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-12-21 19:29:13 UTC (rev 5621)
+++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-12-22 06:46:03 UTC (rev 5622)
@@ -47,7 +47,7 @@
{
context.addUIComponentToUpdateByAjax(uicomponent.<UIComponent>getChildById(UIPortalApplication.UI_WORKING_WS_ID));
context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIMaskWorkspace.class));
- ((PortalRequestContext)context).setFullRender(true);
+ ((PortalRequestContext)context).ignoreAJAXUpdateOnPortlets(true);
return;
}
if (uiTarget == uicomponent)
14 years
- 1
- 0
gatein SVN: r5621 - in components/wci/trunk/test/servers: jboss42 and 34 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-12-21 14:29:13 -0500 (Tue, 21 Dec 2010)
New Revision: 5621
Added:
components/wci/trunk/test/servers/tomcat7/
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/test/servers/tomcat7/src/
components/wci/trunk/test/servers/tomcat7/src/assembly/
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml
components/wci/trunk/test/servers/tomcat7/src/integration-tests/
components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
components/wci/trunk/test/servers/tomcat7/src/test/
components/wci/trunk/test/servers/tomcat7/src/test/resources/
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/
components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml
Modified:
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
Log:
Missed changes on last commit.
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -17,7 +17,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,6 +94,12 @@
<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>
@@ -109,11 +115,23 @@
<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>
@@ -173,6 +191,13 @@
<artifactId>jboss-remoting</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -244,11 +269,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
- <scope>test</scope>
+ <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>
@@ -299,7 +333,7 @@
<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-tomcat.jar.path}" />
+ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.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}" />
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -17,7 +17,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -84,6 +84,12 @@
<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>
@@ -99,11 +105,23 @@
<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>
@@ -163,6 +181,21 @@
<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>
@@ -234,11 +267,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
- <scope>test</scope>
+ <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>
@@ -286,9 +328,12 @@
<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-tomcat.jar.path}" />
+ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.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" />
@@ -322,6 +367,8 @@
</plugins>
</build>
<properties>
+ <!-- Fix 1.0.3 deployment problems with jboss51 deployer-->
+ <version.cargo>1.0.2</version.cargo>
</properties>
<profiles>
Modified: components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -10,7 +10,7 @@
</service>
<deployer>
<remote>
- <name>jboss5x</name>
+ <name>jboss51x</name>
<host>localhost</host>
<port>8080</port>
</remote>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.1.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
@@ -94,6 +94,12 @@
<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>
@@ -109,11 +115,23 @@
<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>
@@ -172,13 +190,20 @@
<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>
<!-- Jetty Deployer -->
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-jetty-deployer</artifactId>
<type>war</type>
- <version>${version.cargo}</version>
+ <version>${version.cargo.jetty.deployer}</version>
</dependency>
</dependencies>
@@ -252,11 +277,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
- <scope>test</scope>
+ <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>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -64,6 +64,7 @@
</activation>
<modules>
<module>tomcat6</module>
+ <module>tomcat7</module>
<module>jboss42</module>
<module>jboss51</module>
</modules>
@@ -72,6 +73,7 @@
<id>all-servers</id>
<modules>
<module>tomcat6</module>
+ <module>tomcat7</module>
<module>jboss42</module>
<module>jboss51</module>
<module>jetty6</module>
@@ -81,9 +83,22 @@
<id>tomcat</id>
<modules>
<module>tomcat6</module>
+ <module>tomcat7</module>
</modules>
</profile>
<profile>
+ <id>tomcat6</id>
+ <modules>
+ <module>tomcat6</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tomcat7</id>
+ <modules>
+ <module>tomcat7</module>
+ </modules>
+ </profile>
+ <profile>
<id>jboss42</id>
<modules>
<module>jboss42</module>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -17,7 +17,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,6 +94,12 @@
<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>
@@ -109,11 +115,23 @@
<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>
@@ -173,6 +191,13 @@
<artifactId>jboss-remoting</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -249,6 +274,21 @@
<version>${version.cargo}</version>
<scope>test</scope>
</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>
@@ -298,7 +338,7 @@
<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-tomcat.jar.path}" />
+ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.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}" />
Added: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,417 @@
+<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-Alpha01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-tomcat7</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - WCI Tomcat 7 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-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>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</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>
+
+ </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.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.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-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}" />
+
+ <!-- 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>
+ </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/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,47 @@
+<assembly>
+ <id>spi-lifecycle-listener-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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,48 @@
+<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-kernel</include>
+ <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>
+ <!-- others -->
+ <include>apache-log4j:log4j</include>
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:resolver</include>
+ <include>apache-xerces:xml-apis</include>
+ <include>concurrent:concurrent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
+
Added: components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<project name="tomcat-integration-test" default="tests">
+
+ <import file="${common.xml.file}"/>
+
+ <!-- SYSTEM PROPERTIES -->
+ <property environment="env"/>
+ <property name="test.cargo.home" value="${env.TOMCAT_7_0_HOME}"/>
+
+
+ <!-- properties unique per app server -->
+ <property name="test.server.name" value="Tomcat"/>
+ <property name="test.server.version" value="7.0"/>
+ <property name="test.remote.server.name" value="RemoteTomcat_7_0"/>
+ <property name="cargo.container.id" value="tomcat7x"/>
+
+ <!-- end unique properties -->
+
+ <target name="tests" unless="maven.test.skip">
+ <antcall target="tests.common"/>
+ </target>
+
+ <path id="server.libs">
+ <path refid="jboss-logging"/>
+ <path refid="gatein-common-shared"/>
+
+ <!-- tomcat specific dependencies -->
+ <path path="${dependency.log4j.jar}"/>
+ <path path="${dependency.activation.jar}"/>
+ <path path="${dependency.junit.jar}"/>
+ <path path="${dependency.gatein-wci-core.jar}"/>
+ <path path="${dependency.gatein-wci-tomcat.jar}"/>
+ <path path="${dependency.gatein-wci-exo.jar}"/>
+ <path path="${dependency.jboss-serialization.jar}"/>
+ </path>
+
+ <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"
+ 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}"/>
+
+ <file file="${target.dir}/test-classes/config/server/tomcat-users.xml" tofile="conf/tomcat-users.xml"/>
+ <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}">
+ </configuration>
+ </cargo>
+ </target>
+
+</project>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -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/tomcat7/src/test/resources/config/server/tomcat-users.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,5 @@
+<tomcat-users>
+ <role rolename="test"/>
+ <user name="manager" password="manager" roles="manager-script"/>
+ <user name="foo" password="bar" roles="test"/>
+</tomcat-users>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/servers.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,24 @@
+<servers>
+ <server>
+ <server-name>RemoteTomcat_7_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>tomcat7x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ <authentication>
+ <username>manager</username>
+ <password>manager</password>
+ </authentication>
+ </deployer>
+ </node>
+ </server>
+</servers>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,53 @@
+<?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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,53 @@
+<?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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,53 @@
+<?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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,67 @@
+<?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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,65 @@
+<?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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,53 @@
+<?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/jboss/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>
+ <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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml 2010-12-21 19:29:13 UTC (rev 5621)
@@ -0,0 +1,77 @@
+<?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.tomcat.TC7ContainerServlet</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>
+
+ <welcome-file-list>
+ <welcome-file/>
+ </welcome-file-list>
+</web-app>
14 years
- 1
- 0
gatein SVN: r5620 - components/wci/trunk.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-12-21 13:36:10 -0500 (Tue, 21 Dec 2010)
New Revision: 5620
Added:
components/wci/trunk/tomcat/
Removed:
components/wci/trunk/tomcat-tmp/
Modified:
components/wci/trunk/pom.xml
Log:
Move tomcat-tmp folder back to tomcat now that the old tomcat folder has been removed in svn.
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
+++ components/wci/trunk/pom.xml 2010-12-21 18:36:10 UTC (rev 5620)
@@ -142,8 +142,8 @@
<modules>
<module>wci</module>
<module>exo</module>
- <module>tomcat-tmp/tomcat6</module>
- <module>tomcat-tmp/tomcat7</module>
+ <module>tomcat/tomcat6</module>
+ <module>tomcat/tomcat7</module>
<module>jetty</module>
<module>test</module>
</modules>
Copied: components/wci/trunk/tomcat (from rev 5619, components/wci/trunk/tomcat-tmp)
14 years
- 1
- 0
gatein SVN: r5619 - in components/wci/trunk: exo and 26 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-12-21 13:31:20 -0500 (Tue, 21 Dec 2010)
New Revision: 5619
Added:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
components/wci/trunk/tomcat-tmp/
components/wci/trunk/tomcat-tmp/tomcat6/
components/wci/trunk/tomcat-tmp/tomcat7/
components/wci/trunk/tomcat-tmp/tomcat7/pom.xml
components/wci/trunk/tomcat-tmp/tomcat7/src/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java
components/wci/trunk/wci/src/main/doc/
components/wci/trunk/wci/src/main/doc/wci-authentication.odp
components/wci/trunk/wci/src/main/doc/wci-authentication.pdf
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationEvent.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationListener.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationResult.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/ProgrammaticAuthenticationResult.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/Ticket.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/TicketService.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/security/
components/wci/trunk/wci/src/main/java/org/gatein/wci/security/Credentials.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginModule.java
Removed:
components/wci/trunk/tomcat/
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
components/wci/trunk/pom.xml
components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml
components/wci/trunk/test/src/test/build.xml
components/wci/trunk/test/src/test/resources/config/servers.xml
components/wci/trunk/tomcat-tmp/tomcat6/pom.xml
components/wci/trunk/tomcat-tmp/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
components/wci/trunk/wci/pom.xml
components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
Log:
Merge in changes from the adf branch.
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/exo/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -14,6 +14,11 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
===================================================================
--- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -10,6 +10,8 @@
import javax.servlet.http.HttpServletResponse;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.authentication.AuthenticationResult;
+import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.spi.ServletContainerContext;
@@ -60,7 +62,16 @@
this.registration = null;
}
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
+ {
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
+ }
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ GenericAuthentication.getInstance().logout(request, response);
+ }
+
public void start()
{
DefaultServletContainerFactory.registerContext(this);
@@ -99,7 +110,6 @@
else if (bean instanceof WebAppContext)
{
WebAppContext wac = (WebAppContext)bean;
- System.out.println("ADDING WEBAPP " + wac.getWar());
registerWebAppContext(wac);
}
}
@@ -125,7 +135,7 @@
public void remove(Relationship relationship)
{
- //ignore event for now
+ removeBean(relationship.getChild());
}
private void startWebAppContext(WebAppContext webappContext)
@@ -180,7 +190,6 @@
private void unregisterWebAppContext(WebAppContext wac)
{
- System.out.println("UNREGISTERWEBAPPCONTEXT : " + wac);
if (monitoredContexts.contains(wac.getServletContext().getServletContextName()))
{
monitoredContexts.remove(wac.getServletContext().getServletContextName());
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -32,7 +32,8 @@
<version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.1-alpha-2</version.cargo>
+ <version.cargo>1.0.3</version.cargo>
+ <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
</properties>
@@ -52,6 +53,16 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
<version>${version.gatein.common}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -70,9 +81,14 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jetty</artifactId>
@@ -126,7 +142,8 @@
<modules>
<module>wci</module>
<module>exo</module>
- <module>tomcat</module>
+ <module>tomcat-tmp/tomcat6</module>
+ <module>tomcat-tmp/tomcat7</module>
<module>jetty</module>
<module>test</module>
</modules>
Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2010, 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. *
@@ -22,6 +22,7 @@
******************************************************************************/
package org.gatein.wci.container;
+import org.gatein.wci.authentication.AuthenticationResult;
import org.gatein.wci.spi.ServletContainerContext;
import org.gatein.wci.RequestDispatchCallback;
@@ -59,4 +60,14 @@
{
this.registration = null;
}
+
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
+ {
+ throw new UnsupportedOperationException();
}
+
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Added: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java (rev 0)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,197 @@
+/*
+* Copyright (C) 2003-2009 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.wci.spi;
+
+import org.gatein.wci.ServletContainer;
+import org.gatein.wci.ServletTestCase;
+import org.gatein.wci.TestServlet;
+import org.gatein.wci.WebRequest;
+import org.gatein.wci.WebResponse;
+import org.gatein.wci.authentication.AuthenticationEvent;
+import org.gatein.wci.authentication.AuthenticationException;
+import org.gatein.wci.authentication.AuthenticationListener;
+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.security.Credentials;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.jboss.unit.Failure;
+import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+
+import static org.jboss.unit.api.Assert.*;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class SPIAuthenticationTestCase extends ServletTestCase
+{
+ private final String username = "foo";
+ private final String password = "bar";
+
+ /** . */
+ private ServletContainer container;
+
+ /** . */
+ private final Value v = new Value();
+
+ /** . */
+ private AuthenticationResult result;
+
+ @Override
+ public DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException
+ {
+ if (getRequestCount() == 0)
+ {
+ assertNull(req.getUserPrincipal());
+ container = DefaultServletContainerFactory.getInstance().getServletContainer();
+ container.addAuthenticationListener(new TestListener(v));
+ assertEquals("", v.value);
+ result = container.login(req, resp, username, password, TicketService.DEFAULT_VALIDITY);
+ assertNotNull(result);
+ if (result instanceof GenericAuthenticationResult)
+ {
+ GenericAuthenticationResult gAuthentication = (GenericAuthenticationResult) result;
+ // Test Ticket Expiration
+ GenericAuthentication.getInstance();
+ String expireTicket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials("foo", "bar"), 5);
+ boolean expired = false;
+ try
+ {
+ Thread.sleep(5);
+ GenericAuthentication.TICKET_SERVICE.validateTicket(expireTicket, true);
+ }
+ catch (InterruptedException ignore)
+ {
+ }
+ catch (AuthenticationException ae)
+ {
+ expired = true;
+ }
+ if (!expired) return new FailureResponse(Failure.createAssertionFailure(""));
+
+
+ // Test Ticket Service
+ Credentials srcCredentials = new Credentials(username, password);
+ String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(srcCredentials, TicketService.DEFAULT_VALIDITY);
+ Credentials resultCredentials = GenericAuthentication.TICKET_SERVICE.validateTicket(ticket, false);
+ assertEquals(srcCredentials.getUsername(), resultCredentials.getUsername());
+ assertEquals(srcCredentials.getPassword(), resultCredentials.getPassword());
+ assertNotNull(GenericAuthentication.TICKET_SERVICE.validateTicket(ticket, true));
+ assertNull(GenericAuthentication.TICKET_SERVICE.validateTicket(ticket, true));
+
+ // Test Generic login
+ GenericAuthenticationResult gResult = (GenericAuthenticationResult) result;
+ String t = gResult.getTicket();
+ Credentials credentials = GenericAuthentication.TICKET_SERVICE.validateTicket(t, true);
+ assertNotNull(credentials);
+ assertEquals("", v.value);
+ gAuthentication.perform(req, resp);
+
+ // Test login Event
+ assertEquals("login", v.value);
+ assertTrue(resp.isCommitted());
+
+ }
+ else if (result instanceof ProgrammaticAuthenticationResult)
+ {
+ assertEquals("login", v.value);
+ assertNotNull(req.getUserPrincipal());
+ assertTrue(req.isUserInRole("test"));
+ }
+
+ //
+ String url = resp.renderURL("/", null, null);
+ return new InvokeGetResponse(url);
+ }
+ else if (getRequestCount() == 1)
+ {
+ if (result instanceof GenericAuthenticationResult)
+ {
+ // Test logout
+ assertNotNull(req.getSession(false));
+ assertEquals("login", v.value);
+ container.logout(req, resp);
+ assertNull(req.getSession(false));
+
+ // Test logout Event
+ assertEquals("logout", v.value);
+ }
+ else if (result instanceof ProgrammaticAuthenticationResult)
+ {
+ assertEquals("login", v.value);
+
+ container.logout(req, resp);
+
+ assertEquals("logout", v.value);
+ assertNull(req.getUserPrincipal());
+ }
+ return new EndTestResponse();
+ }
+
+ return new FailureResponse(Failure.createAssertionFailure(""));
+ }
+
+ @Override
+ public DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand)
+ {
+ if (getRequestCount() == -1)
+ {
+ return new InvokeGetResponse("/test-spi-server");
+ }
+ else
+ {
+ return new FailureResponse(Failure.createAssertionFailure(""));
+ }
+ }
+
+ class Value
+ {
+ public String value = "";
+ }
+
+ public static class TestListener implements AuthenticationListener
+ {
+ private Value value;
+
+ public TestListener(Value value) {
+ this.value = value;
+ }
+
+ public void onLogin(AuthenticationEvent ae)
+ {
+ value.value = "login";
+ }
+
+ public void onLogout(AuthenticationEvent ae)
+ {
+ value.value = "logout";
+ }
+ }
+}
Modified: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml
===================================================================
--- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -75,4 +75,13 @@
</uninstall>
</bean>
+ <bean name="SPIAuthenticationTestCase" class="org.gatein.wci.spi.SPIAuthenticationTestCase">
+ <install bean="TestSuite" method="mount">
+ <parameter><this/></parameter>
+ </install>
+ <uninstall bean="TestSuite" method="unmount">
+ <parameter><this/></parameter>
+ </uninstall>
+ </bean>
+
</deployment>
Modified: components/wci/trunk/test/src/test/build.xml
===================================================================
--- components/wci/trunk/test/src/test/build.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/test/src/test/build.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -27,6 +27,7 @@
<target name="tests.call.all" unless="tests">
<antcall target="tests.jboss5"/>
<antcall target="tests.jboss"/>
+ <antcall target="tests.tomcat7"/>
<antcall target="tests.tomcat"/>
<!-- <antcall target="tests.jetty"/> -->
</target>
@@ -45,6 +46,9 @@
<target name="tests.tomcat">
<antcall target="tests.tomcat-6.0"/>
</target>
+ <target name="tests.tomcat7">
+ <antcall target="tests.tomcat-7.0"/>
+ </target>
<target name="tests.jetty">
<antcall target="tests.jetty-6.1"/>
</target>
@@ -116,6 +120,14 @@
</not>
</and>
</condition>
+ <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_7_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
<and>
<isset property="env.JETTY_6_1_HOME"/>
@@ -160,7 +172,7 @@
</condition>
</fail>
- <fail message="Please set the environment variable TOMCAT_6_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
+ <fail message="Please set the environment variable TOMCAT_6_0_HOME or TOMCAT_7_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
<condition>
<and>
<not>
@@ -169,6 +181,9 @@
<not>
<isset property="TOMCAT_6_0_HOME"/>
</not>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
</and>
</condition>
</fail>
@@ -276,6 +291,27 @@
<path location="${dependency.jboss-serialization.jar}"/>
</path>
+ <path id="tomcat-7.0">
+ <path refid="gatein-common"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.log4j.jar}"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.concurrent.jar}"/>
+ </path>
+
+ <path id="tomcat-7.0-shared">
+ <path refid="jboss-logging"/>
+ <path refid="gatein-common-shared"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.junit.jar}"/>
+ <path path="${dependency.gatein-wci-core.jar}"/>
+ <path path="${dependency.gatein-wci-tomcat.jar}"/>
+ <path path="${dependency.gatein-wci-exo.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ </path>
<path id="jetty-6.1">
<path refid="gatein-common"/>
<path refid="jboss-unit"/>
@@ -381,8 +417,81 @@
<fileset dir="${target}/test-classes/spi/exo/app-war"/>
</jar>
+ <!-- **************************** -->
+ <!-- Tomcat 7.0 container servlet -->
+ <!-- **************************** -->
+ <copy todir="${test.support}/tomcat-7.0-container-servlet/server-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/tomcat-7.0-container-servlet"/>
+ <war jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-server.war">
+ <fileset dir="${test.support}/tomcat-7.0-container-servlet/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-cs-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/app-war"/>
+ </jar>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-generic-app.war">
+ <fileset dir="${target}/test-classes/spi/generic/app-war"/>
+ </jar>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-container-servlet/test-exo-app.war">
+ <fileset dir="${target}/test-classes/spi/exo/app-war"/>
+ </jar>
+
<!-- **************************** -->
+ <!-- Tomcat 7.0 lifecyle listener -->
+ <!-- **************************** -->
+
+ <copy todir="${test.support}/tomcat-7.0-lifecycle-listener/server-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/tomcat-7.0-lifecycle-listener"/>
+ <war jarfile="${test.temp.lib}/tomcat-7.0-lifecycle-listener/test-spi-server.war">
+ <fileset dir="${test.support}/tomcat-7.0-lifecycle-listener/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-lifecycle-listener/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/app-war"/>
+ </jar>
+
+ <!-- ****************** -->
+ <!-- Tomcat 7.0 generic -->
+ <!-- ****************** -->
+
+ <!-- -->
+ <mkdir dir="${test.support}/tomcat-7.0-generic/server-war/WEB-INF/lib"/>
+ <copy todir="${test.support}/tomcat-7.0-generic/server-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/tomcat-7.0-generic"/>
+ <war jarfile="${test.temp.lib}/tomcat-7.0-generic/test-spi-server.war">
+ <fileset dir="${test.support}/tomcat-7.0-generic/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-generic/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/generic/app-war"/>
+ </jar>
+
+ <!-- ****************** -->
+ <!-- Tomcat 7.0 eXo -->
+ <!-- ****************** -->
+
+ <!-- -->
+ <mkdir dir="${test.support}/tomcat-7.0-exo/server-war/WEB-INF/lib"/>
+ <copy todir="${test.support}/tomcat-7.0-exo/server-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/tomcat-7.0-exo"/>
+ <war jarfile="${test.temp.lib}/tomcat-7.0-exo/test-spi-server.war">
+ <fileset dir="${test.support}/tomcat-7.0-exo/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0-exo/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/exo/app-war"/>
+ </jar>
+
+ <!-- **************************** -->
<!-- Jetty 6.1 handler -->
<!-- **************************** -->
@@ -596,6 +705,36 @@
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
+ <!-- ********** -->
+ <!-- Tomcat 7.0 -->
+ <!-- ********** -->
+
+ <mkdir dir="${test.temp.lib}/tomcat-7.0"/>
+
+ <copy todir="${test.support}/tomcat-7.0-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <war jarfile="${test.temp.lib}/tomcat-7.0/default-servlet-mapping.war">
+ <fileset dir="${test.support}/tomcat-7.0-endpoint/default-servlet-mapping-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
+ </war>
+
+ <copy todir="${test.support}/tomcat-7.0-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <war jarfile="${test.temp.lib}/tomcat-7.0/path-mapping.war">
+ <fileset dir="${test.support}/tomcat-7.0-endpoint/path-mapping-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
+ </war>
+
+ <copy todir="${test.support}/tomcat-7.0-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <war jarfile="${test.temp.lib}/tomcat-7.0/root-path-mapping.war">
+ <fileset dir="${test.support}/tomcat-7.0-endpoint/root-path-mapping-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
+ </war>
+
<!-- ********* -->
<!-- JETTY 6.1 -->
<!-- ********* -->
@@ -1084,6 +1223,119 @@
</target>
+ <target name="cargo.tomcat-7.0.start" depends="cargo.setup">
+
+ <cargo
+ containerId="tomcat7x"
+ home="${test.tomcat-7.0.home}"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+
+ <path refid="tomcat-7.0-shared"/>
+
+ </sharedClasspath>
+ <configuration home="${target}/cargo">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
+
+ <deployable type="war" file="${test.temp.lib}/manager.war"/>
+ <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
+ <deployable type="war" file="${cargo.war}"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.tomcat-7.0.stop" depends="cargo.setup">
+ <cargo
+ containerId="tomcat7x"
+ home="${test.tomcat-7.0.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ action="stop">
+ <configuration home="${target}/cargo">
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="tests.tomcat-7.0.execute" unless="tests.tomcat-7.0.execute.skip">
+ <echo message="Starting Tomcat 7.0 ${test.tomcat-7.0.name} with ${test.tomcat-7.0.home} to execute ${test.id} tests"/>
+ <antcall target="cargo.tomcat-7.0.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="cargo.war" value="${test.war}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.remote.server.name" value="${test.tomcat-7.0.name}"/>
+ <param name="test.remote.archive.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="cargo.tomcat-7.0.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.tomcat-7.0.spi">
+ <condition property="tests.tomcat-7.0.execute.skip">
+ <not>
+ <available file="${test.tomcat-7.0.home}" type="dir"/>
+ </not>
+ </condition>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-spi-container-servlet"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0-container-servlet/test-spi-server.war"/>
+ <param name="test.archive.path" value="tomcat-7.0-container-servlet"/>
+ </antcall>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-spi-generic"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0-generic/test-spi-server.war"/>
+ <param name="test.archive.path" value="tomcat-7.0-generic"/>
+ </antcall>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-spi-exo"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0-exo/test-spi-server.war"/>
+ <param name="test.archive.path" value="tomcat-7.0-exo"/>
+ </antcall>
+ </target>
+
+ <target name="tests.tomcat-7.0.endpoint">
+ <condition property="tests.tomcat-7.0.execute.skip">
+ <not>
+ <available file="${test.tomcat-7.0.home}" type="dir"/>
+ </not>
+ </condition>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-default-servlet-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0/default-servlet-mapping.war"/>
+ <param name="test.archive.path" value=""/>
+ </antcall>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-root-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0/root-path-mapping.war"/>
+ <param name="test.archive.path" value=""/>
+ </antcall>
+ <antcall target="tests.tomcat-7.0.execute">
+ <param name="test.id" value="${test.tomcat-7.0.name}-endpoint-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/tomcat-7.0/path-mapping.war"/>
+ <param name="test.archive.path" value=""/>
+ </antcall>
+ </target>
+
+ <target name="tests.tomcat-7.0">
+ <!-- spi tests -->
+ <antcall target="tests.tomcat-7.0.spi">
+ <param name="test.tomcat-7.0.name" value="RemoteTomcat_7_0"/>
+ <param name="test.tomcat-7.0.home" value="${TOMCAT_7_0_HOME}"/>
+ </antcall>
+
+ <!-- endpoint tests -->
+
+ <antcall target="tests.tomcat-7.0.endpoint">
+ <param name="test.tomcat-7.0.name" value="RemoteTomcat_7_0"/>
+ <param name="test.tomcat-7.0.home" value="${TOMCAT_7_0_HOME}"/>
+ </antcall>
+
+ </target>
+
<target name="cargo.jetty-6.1.start" depends="cargo.setup">
<cargo
containerId="jetty6x"
Modified: components/wci/trunk/test/src/test/resources/config/servers.xml
===================================================================
--- components/wci/trunk/test/src/test/resources/config/servers.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/test/src/test/resources/config/servers.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -22,6 +22,28 @@
</node>
</server>
<server>
+ <server-name>RemoteTomcat_7_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>tomcat7x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ <authentication>
+ <username>admin</username>
+ <password>admin</password>
+ </authentication>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJetty_6_1</server-name>
<node>
<node-id>default</node-id>
@@ -126,7 +148,7 @@
</service>
<deployer>
<remote>
- <name>jboss5x</name>
+ <name>jboss51x</name>
<host>localhost</host>
<port>8080</port>
</remote>
Copied: components/wci/trunk/tomcat-tmp/tomcat6 (from rev 5615, components/wci/trunk/tomcat)
Modified: components/wci/trunk/tomcat-tmp/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/wci/trunk/tomcat-tmp/tomcat6/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -5,9 +5,9 @@
<version>2.1.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<packaging>jar</packaging>
- <name>GateIn - WCI Tomcat compatibility component</name>
+ <name>GateIn - WCI Tomcat 6 compatibility component</name>
<dependencies>
<dependency>
@@ -17,12 +17,6 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: components/wci/trunk/tomcat-tmp/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/wci/trunk/tomcat-tmp/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -34,6 +34,8 @@
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.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.spi.ServletContainerContext;
@@ -97,6 +99,16 @@
this.registration = null;
}
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
+ {
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
+ }
+
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ GenericAuthentication.getInstance().logout(request, response);
+ }
+
public synchronized void containerEvent(ContainerEvent event)
{
if (event.getData() instanceof Host)
Added: components/wci/trunk/tomcat-tmp/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat-tmp/tomcat7/pom.xml (rev 0)
+++ components/wci/trunk/tomcat-tmp/tomcat7/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,24 @@
+<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-Alpha01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-tomcat7</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - WCI Tomcat 7 compatibility component</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>7.0.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
===================================================================
--- components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java (rev 0)
+++ components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,127 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.gatein.wci.tomcat;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerServlet;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Wrapper;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision: 1.0 $
+ */
+public class TC7ContainerServlet extends HttpServlet implements ContainerServlet
+{
+
+ /** . */
+ private Wrapper wrapper;
+
+ /** . */
+ private TC7ServletContainerContext 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 TC7ServletContainerContext(engine);
+ containerContext.start();
+ break;
+ }
+ }
+ }
+
+ private void stop()
+ {
+ if (containerContext != null)
+ {
+ containerContext.stop();
+
+ //
+ containerContext = null;
+ }
+ }
+}
Added: components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java
===================================================================
--- components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java (rev 0)
+++ components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,97 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.gatein.wci.tomcat;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
+import org.apache.catalina.Service;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision: 1.0 $
+ */
+public class TC7LifecycleListener implements LifecycleListener
+{
+
+ /** . */
+ private TC7ServletContainerContext containerContext;
+
+ public synchronized void lifecycleEvent(LifecycleEvent event)
+ {
+ Lifecycle lifecycle = event.getLifecycle();
+
+ //
+ if (lifecycle instanceof Server)
+ {
+ Server server = (Server)lifecycle;
+
+ //
+ Engine engine = getEngine(server);
+
+ //
+ if (engine != null)
+ {
+ if (Lifecycle.START_EVENT.equals(event.getType()))
+ {
+ containerContext = new TC7ServletContainerContext(engine);
+ containerContext.start();
+ }
+ else if (Lifecycle.STOP_EVENT.equals(event.getType()))
+ {
+ if (containerContext != null)
+ {
+ containerContext.stop();
+ }
+ }
+ }
+ }
+ }
+
+ private Engine getEngine(Server server)
+ {
+ Service[] services = server.findServices();
+ for (int i = 0; i < services.length; i++)
+ {
+ Service service = services[i];
+ Engine engine = getEngine(service.getContainer());
+ if (engine != null)
+ {
+ return engine;
+ }
+ }
+ return null;
+ }
+
+ private Engine getEngine(Container container)
+ {
+ if (container instanceof Engine)
+ {
+ return (Engine)container;
+ }
+ return null;
+ }
+}
Added: components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
===================================================================
--- components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java (rev 0)
+++ components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,343 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.gatein.wci.tomcat;
+
+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.LifecycleState;
+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;
+
+/**
+ * An implementation of the <code>ServletContainerContext</code> for Tomcat 7.
+ *
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision: 1.0 $
+ */
+public class TC7ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener
+{
+ private final static Logger log = LoggerFactory.getLogger(TC7ServletContainerContext.class);
+
+ /** . */
+ 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 TC7ServletContainerContext(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)
+ {
+ 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 (LifecycleState.STARTED.equals(context.getState()))
+ {
+ start(context);
+ }
+
+ //
+ monitoredContexts.add(context.getName());
+ }
+ }
+
+ private void unregisterContext(StandardContext context)
+ {
+ if (monitoredContexts.contains(context.getName()))
+ {
+ monitoredContexts.remove(context.getName());
+
+ //
+ if (LifecycleState.STARTED.equals(context.getState()))
+ {
+ stop(context);
+ }
+
+ //
+ context.removeLifecycleListener(this);
+ }
+ }
+
+ private void start(Context context)
+ {
+ try
+ {
+ log.debug("Context added " + context.getPath());
+ TC7WebAppContext webAppContext = new TC7WebAppContext(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/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java
===================================================================
--- components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java (rev 0)
+++ components/wci/trunk/tomcat-tmp/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,127 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.gatein.wci.tomcat;
+
+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;
+
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision: 1.0 $
+ */
+public class TC7WebAppContext implements WebAppContext
+{
+
+ /** . */
+ private Document descriptor;
+
+ /** . */
+ private ServletContext servletContext;
+
+ /** . */
+ private ClassLoader loader;
+
+ /** . */
+ private String contextPath;
+
+ /** . */
+ private final Context context;
+
+ /** . */
+ private Wrapper commandServlet;
+
+ TC7WebAppContext(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/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/wci/pom.xml 2010-12-21 18:31:20 UTC (rev 5619)
@@ -13,13 +13,12 @@
<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>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Added: components/wci/trunk/wci/src/main/doc/wci-authentication.odp
===================================================================
(Binary files differ)
Property changes on: components/wci/trunk/wci/src/main/doc/wci-authentication.odp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wci/trunk/wci/src/main/doc/wci-authentication.pdf
===================================================================
(Binary files differ)
Property changes on: components/wci/trunk/wci/src/main/doc/wci-authentication.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2010, 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. *
@@ -22,6 +22,8 @@
******************************************************************************/
package org.gatein.wci;
+import org.gatein.wci.authentication.AuthenticationListener;
+import org.gatein.wci.authentication.AuthenticationResult;
import org.gatein.wci.spi.ServletContainerContext;
import javax.servlet.ServletContext;
@@ -91,4 +93,36 @@
* @throws IllegalArgumentException if the context is null
*/
void register(ServletContainerContext context);
+
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ * @param userName the username which try to login
+ * @param password the password of the username
+ */
+ AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException;
+
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ */
+ void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException;
+
+ /**
+ * Add the authentication listener.
+ *
+ * @param listener AuthenticationListener to add
+ */
+ void addAuthenticationListener(AuthenticationListener listener);
+
+ /**
+ * Remove the authentication listener.
+ *
+ * @param listener AuthenticationListener to remove
+ */
+ void removeAuthenticationlistener(AuthenticationListener listener);
}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationEvent.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationEvent.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationEvent.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,92 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+import org.gatein.wci.security.Credentials;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class AuthenticationEvent
+{
+ private final HttpServletRequest request;
+ private final HttpServletResponse response;
+ private final Credentials credentials;
+
+ public AuthenticationEvent(HttpServletRequest request, HttpServletResponse response)
+ {
+
+ if (request == null)
+ {
+ throw new IllegalArgumentException("request is null");
+ }
+
+ if (response == null)
+ {
+ throw new IllegalArgumentException("response is null");
+ }
+
+ this.request = request;
+ this.response = response;
+ this.credentials = null;
+ }
+
+ public AuthenticationEvent(HttpServletRequest request, HttpServletResponse response, Credentials credentials)
+ {
+
+ if (request == null)
+ {
+ throw new IllegalArgumentException("request is null");
+ }
+
+ if (response == null)
+ {
+ throw new IllegalArgumentException("response is null");
+ }
+
+ if (credentials == null)
+ {
+ throw new IllegalArgumentException("credentials is null");
+ }
+
+ this.request = request;
+ this.response = response;
+ this.credentials = credentials;
+ }
+
+ public HttpServletRequest getRequest()
+ {
+ return request;
+ }
+
+ public HttpServletResponse getResponse()
+ {
+ return response;
+ }
+
+ public Credentials getCredentials()
+ {
+ return credentials;
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,46 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class AuthenticationException extends RuntimeException
+{
+ public AuthenticationException()
+ {
+ }
+
+ public AuthenticationException(String message)
+ {
+ super(message);
+ }
+
+ public AuthenticationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public AuthenticationException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationListener.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationListener.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationListener.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,30 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public interface AuthenticationListener
+{
+ void onLogin(AuthenticationEvent ae);
+ void onLogout(AuthenticationEvent ae);
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationResult.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationResult.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/AuthenticationResult.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,28 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public abstract class AuthenticationResult
+{
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,53 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+import org.gatein.wci.security.Credentials;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class GenericAuthentication
+{
+ public static final TicketService TICKET_SERVICE = new TicketService();
+ private static final GenericAuthentication GENERIC_AUTHENTICATION = new GenericAuthentication();
+
+ private GenericAuthentication() {}
+
+ public AuthenticationResult login(String login, String password, HttpServletRequest request, HttpServletResponse response, long validityMillis)
+ {
+ String ticket = TICKET_SERVICE.createTicket(new Credentials(login, password), validityMillis);
+
+ return new GenericAuthenticationResult(login, ticket);
+ }
+
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ request.getSession().invalidate();
+ }
+
+ public static GenericAuthentication getInstance() {
+ return GENERIC_AUTHENTICATION;
+ }
+}
\ No newline at end of file
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,61 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+import org.gatein.wci.impl.DefaultServletContainer;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.security.Credentials;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class GenericAuthenticationResult extends AuthenticationResult {
+ private String username;
+ private String ticket;
+
+ public GenericAuthenticationResult(String username, String ticket) {
+ this.username = username;
+ this.ticket = ticket;
+ }
+
+ public String getTicket() {
+ return ticket;
+ }
+
+ public void perform(HttpServletRequest req, HttpServletResponse resp) throws IOException
+ {
+ req.getSession().removeAttribute(Credentials.CREDENTIALS);
+ String url = "j_security_check?j_username=" + username + "&j_password=" + ticket;
+ url = resp.encodeRedirectURL(url);
+ resp.sendRedirect(url);
+ resp.flushBuffer();
+
+ Object o = DefaultServletContainerFactory.getInstance().getServletContainer();
+ if (o instanceof DefaultServletContainer)
+ {
+ ((DefaultServletContainer)o).fireEvent(DefaultServletContainer.EventType.LOGIN, new AuthenticationEvent(req, resp, new Credentials(username, ticket)));
+ }
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/ProgrammaticAuthenticationResult.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/ProgrammaticAuthenticationResult.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/ProgrammaticAuthenticationResult.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,27 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class ProgrammaticAuthenticationResult extends AuthenticationResult {
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/Ticket.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/Ticket.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/Ticket.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,56 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+import org.gatein.wci.security.Credentials;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class Ticket
+{
+ /** . */
+ private final long expirationTimeMillis;
+
+ /** . */
+ private final Credentials payload;
+
+ public Ticket(long expirationTimeMillis, Credentials payload)
+ {
+ this.expirationTimeMillis = expirationTimeMillis;
+ this.payload = payload;
+ }
+
+ public long getExpirationTimeMillis()
+ {
+ return expirationTimeMillis;
+ }
+
+ public Credentials getPayload()
+ {
+ return payload;
+ }
+
+ public boolean isExpired()
+ {
+ return System.currentTimeMillis() > expirationTimeMillis;
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/TicketService.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/TicketService.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/TicketService.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,98 @@
+/*
+* Copyright (C) 2003-2009 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.wci.authentication;
+
+import org.gatein.wci.security.Credentials;
+
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class TicketService
+{
+ public static final long DEFAULT_VALIDITY = 60 * 1000;
+
+ protected final ConcurrentHashMap<String, Ticket> tickets = new ConcurrentHashMap<String, Ticket>();
+
+ protected final Random random = new Random();
+
+ public String createTicket(Credentials credentials, long validityMillis)
+ {
+ if (validityMillis < 0)
+ {
+ throw new IllegalArgumentException("validityMillis must be positive");
+ }
+ if (credentials == null)
+ {
+ throw new NullPointerException();
+ }
+ String tokenId = nextTicketId();
+ long expirationTimeMillis = System.currentTimeMillis() + validityMillis;
+ tickets.put(tokenId, new Ticket(expirationTimeMillis, credentials));
+ return tokenId;
+ }
+
+ public Credentials validateTicket(String stringKey, boolean remove)
+ {
+ if (stringKey == null)
+ {
+ throw new IllegalArgumentException("stringKey is null");
+ }
+
+ Ticket ticket;
+ if (remove)
+ {
+ ticket = tickets.remove(stringKey);
+ }
+ else
+ {
+ ticket = tickets.get(stringKey);
+ }
+
+ if (ticket != null)
+ {
+ boolean valid = ticket.getExpirationTimeMillis() > System.currentTimeMillis();
+
+ if (valid)
+ {
+ return ticket.getPayload();
+ }
+ else if (!remove)
+ {
+ tickets.remove(stringKey);
+ }
+ if (!valid)
+ {
+ throw new AuthenticationException("Ticket " + stringKey + " has expired");
+ }
+
+ }
+
+ return null;
+ }
+
+ private String nextTicketId()
+ {
+ return "wci-ticket-" + random.nextInt();
+ }
+}
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2010, 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. *
@@ -22,6 +22,11 @@
******************************************************************************/
package org.gatein.wci.impl;
+import org.gatein.wci.authentication.AuthenticationEvent;
+import org.gatein.wci.authentication.AuthenticationListener;
+import org.gatein.wci.authentication.AuthenticationResult;
+import org.gatein.wci.authentication.GenericAuthenticationResult;
+import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
import org.gatein.wci.spi.WebAppContext;
import org.gatein.wci.WebAppListener;
@@ -43,7 +48,9 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* A static registry for the servlet container context.
@@ -58,9 +65,12 @@
/** . */
private final Object lock = new Object();
- /** The event listeners. */
- private final ArrayList<WebAppListener> listeners = new ArrayList<WebAppListener>();
+ /** The event webapp listeners. */
+ private final ArrayList<WebAppListener> webAppListeners = new ArrayList<WebAppListener>();
+ /** The event authentication Listeners. */
+ private final List<AuthenticationListener> authenticationListeners = new CopyOnWriteArrayList<AuthenticationListener>();
+
/** The web applications. */
private final Map<String, WebAppImpl> webAppMap = new HashMap<String, WebAppImpl>();
@@ -88,6 +98,44 @@
}
}
+ /** . */
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException
+ {
+ AuthenticationResult result = registration.context.login(request, response, userName, password, validityMillis);
+
+ //
+ if (!(result instanceof GenericAuthenticationResult))
+ {
+ fireEvent(EventType.LOGIN, new AuthenticationEvent(request, response, new Credentials(userName, password)));
+ }
+
+ return result;
+ }
+
+ public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ {
+ registration.context.logout(request, response);
+
+ //
+ fireEvent(EventType.LOGOUT, new AuthenticationEvent(request, response));
+ }
+
+ public void addAuthenticationListener(AuthenticationListener listener) {
+ if (listener == null) {
+ throw new IllegalArgumentException("listener is null");
+ }
+
+ authenticationListeners.add(listener);
+ }
+
+ public void removeAuthenticationlistener(AuthenticationListener listener) {
+ if (listener == null) {
+ throw new IllegalArgumentException("listener is null");
+ }
+
+ authenticationListeners.remove(listener);
+ }
+
public WebExecutor getExecutor(HttpServletRequest request, HttpServletResponse response)
{
throw new NotYetImplemented();
@@ -101,11 +149,11 @@
{
throw new IllegalArgumentException();
}
- if (listeners.contains(listener))
+ if (webAppListeners.contains(listener))
{
return false;
}
- listeners.add(listener);
+ webAppListeners.add(listener);
for (Object response : webAppMap.values())
{
WebApp webApp = (WebApp)response;
@@ -124,7 +172,7 @@
{
throw new IllegalArgumentException();
}
- if (listeners.remove(listener))
+ if (webAppListeners.remove(listener))
{
for (WebApp webApp : webAppMap.values())
{
@@ -161,12 +209,32 @@
private void fireEvent(WebAppEvent event)
{
- for (WebAppListener listener : listeners)
+ for (WebAppListener listener : webAppListeners)
{
safeFireEvent(listener, event);
}
}
+ public void fireEvent(EventType type, AuthenticationEvent ae)
+ {
+ String methodName = String.format(
+ "on%s%s",
+ type.toString().substring(0, 1).toUpperCase(),
+ type.toString().substring(1).toLowerCase()
+ );
+ for (AuthenticationListener currentListener : authenticationListeners)
+ {
+ try
+ {
+ currentListener.getClass().getMethod(methodName, AuthenticationEvent.class).invoke(currentListener, ae);
+ }
+ catch (Exception ignore)
+ {
+ ignore.printStackTrace();
+ }
+ }
+ }
+
/**
* Generic detyped request dispatch to a servlet context using the include mechanism.
*
@@ -198,6 +266,10 @@
return registration.context.include(targetServletContext, request, response, callback, handback);
}
+ public static enum EventType {
+ LOGIN, LOGOUT
+ }
+
private static class RegistrationImpl implements ServletContainerContext.Registration
{
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2010, 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. *
@@ -23,6 +23,8 @@
package org.gatein.wci.impl.generic;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.authentication.AuthenticationResult;
+import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.spi.ServletContainerContext;
import org.gatein.wci.command.CommandDispatcher;
@@ -128,6 +130,15 @@
this.registration = null;
}
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
+ {
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
+ }
+
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ GenericAuthentication.getInstance().logout(request, response);
+ }
//
public void contextInitialized(ServletContextEvent servletContextEvent)
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/security/Credentials.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/security/Credentials.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/security/Credentials.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,79 @@
+/*
+* Copyright (C) 2003-2009 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.wci.security;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class Credentials implements Serializable
+{
+ /** . */
+ private final String username;
+
+ /** . */
+ private final String password;
+
+ /** . */
+ public static final String CREDENTIALS = "credentials";
+
+ /**
+ * Construct a new instance.
+ *
+ * @param username the username value
+ * @param password the password value
+ * @throws NullPointerException if any argument is null
+ */
+ public Credentials(String username, String password) throws NullPointerException
+ {
+ if (username == null)
+ {
+ throw new IllegalArgumentException("Username is null");
+ }
+ if (password == null)
+ {
+ throw new IllegalArgumentException("Password is null");
+ }
+ this.username = username;
+ this.password = password;
+ }
+
+ /**
+ * Returns the username.
+ *
+ * @return the username
+ */
+ public String getUsername()
+ {
+ return username;
+ }
+
+ /**
+ * Returns the password.
+ *
+ * @return the password
+ */
+ public String getPassword()
+ {
+ return password;
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,78 @@
+/*
+* Copyright (C) 2003-2009 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.wci.security;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class WCILoginController extends HttpServlet
+{
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(WCILoginController.class);
+
+ /** . */
+ protected Credentials credentials;
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ String username = req.getParameter("username");
+ String password = req.getParameter("password");
+
+ if (
+ req.getSession().getAttribute(Credentials.CREDENTIALS) != null
+ && username == null
+ && password == null
+ ) return;
+
+ //
+ if (username == null)
+ {
+ log.error("Tried to access the portal login controller without username provided");
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No username provided");
+ return;
+ }
+ if (password == null)
+ {
+ log.error("Tried to access the portal login controller without password provided");
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided");
+ return;
+ }
+
+ //
+ log.debug("Found username and password and set credentials in http session");
+ credentials = new Credentials(username, password);
+ req.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ }
+
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ doGet(req, resp);
+ }
+}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginModule.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginModule.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginModule.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -0,0 +1,89 @@
+/*
+* Copyright (C) 2003-2009 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.wci.security;
+
+import org.gatein.wci.authentication.GenericAuthentication;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+
+public class WCILoginModule implements LoginModule {
+ private Subject subject;
+ private CallbackHandler callbackHandler;
+ private Map sharedState;
+ private Map options;
+
+ public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
+ this.subject = subject;
+ this.callbackHandler = callbackHandler;
+ this.sharedState = sharedState;
+ this.options = options;
+ }
+
+ /**
+ * @see javax.security.auth.spi.LoginModule#login()
+ */
+ @SuppressWarnings("unchecked")
+ public boolean login() throws LoginException {
+ Callback[] callbacks = new Callback[2];
+ callbacks[0] = new NameCallback("Username");
+ callbacks[1] = new PasswordCallback("Password", false);
+
+ try
+ {
+ callbackHandler.handle(callbacks);
+ String password = new String(((PasswordCallback)callbacks[1]).getPassword());
+
+ Credentials credentials = GenericAuthentication.TICKET_SERVICE.validateTicket(password, true);
+ sharedState.put("javax.security.auth.login.name", credentials.getUsername());
+ sharedState.put("javax.security.auth.login.password", credentials.getPassword());
+ }
+ catch (Exception e)
+ {
+ LoginException le = new LoginException();
+ le.initCause(e);
+ throw le;
+ }
+ return true;
+ }
+
+ public boolean commit() throws LoginException {
+ return true;
+ }
+
+ public boolean abort() throws LoginException {
+ return true;
+ }
+
+ public boolean logout() throws LoginException {
+ return true;
+ }
+}
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2010-12-21 17:12:17 UTC (rev 5618)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2010-12-21 18:31:20 UTC (rev 5619)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2010, 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. *
@@ -22,14 +22,16 @@
******************************************************************************/
package org.gatein.wci.spi;
-import org.gatein.wci.RequestDispatchCallback;
+import java.io.IOException;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import java.io.IOException;
+import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.authentication.AuthenticationResult;
+
/**
* Defines the service provider interface for a servlet container. It is an attempt to abstract the non
* portable services required by a portal with respect to the web container layer.
@@ -74,6 +76,24 @@
void unsetCallback(Registration registration);
/**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ * @param userName the username which try to login
+ * @param password the password of the username
+ */
+ AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException;
+
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ */
+ void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException;
+
+ /**
* The callback interface that a servlet container context can obtain from its registration against
* the <code>org.jboss.portal.web.ServletContainer</code> singleton.
*/
14 years
- 1
- 0
gatein SVN: r5618 - in components/pc/branches/adf/test/servers: jboss51 and 8 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-12-21 12:12:17 -0500 (Tue, 21 Dec 2010)
New Revision: 5618
Added:
components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/
components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml
Modified:
components/pc/branches/adf/test/servers/jboss42/pom.xml
components/pc/branches/adf/test/servers/jboss51/pom.xml
components/pc/branches/adf/test/servers/jetty6/pom.xml
components/pc/branches/adf/test/servers/src/common/resources/common.xml
components/pc/branches/adf/test/servers/tomcat6/pom.xml
components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml
components/pc/branches/adf/test/servers/tomcat7/pom.xml
components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
Log:
cargo manager refactoring
Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -132,22 +132,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.ccpp</groupId>
@@ -179,6 +163,18 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -355,32 +351,38 @@
<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.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<executions>
<execution>
@@ -470,10 +472,6 @@
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
-
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -132,22 +132,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.ccpp</groupId>
@@ -185,6 +169,18 @@
<artifactId>jboss-profileservice-spi</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -486,10 +482,6 @@
<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}" />
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
-
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
@@ -509,6 +501,9 @@
</executions>
</plugin>
</plugins>
-
</build>
+ <properties>
+ <!-- Fix 1.0.3 deployment problems with jboss51 deployer-->
+ <version.cargo>1.0.2</version.cargo>
+ </properties>
</project>
\ No newline at end of file
Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -134,23 +134,7 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-jetty-deployer</artifactId>
<type>war</type>
<scope>test</scope>
@@ -186,6 +170,18 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jetty</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -362,32 +358,38 @@
<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.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<executions>
<execution>
@@ -477,10 +479,6 @@
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
-
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
Modified: components/pc/branches/adf/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -511,11 +511,6 @@
<fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/>
</jar>
- <!-- Strip cargo manager war filename-->
- <copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/>
- <!-- unjar the war -->
- <unzip src="${test.temp.lib}/manager.war" dest="${test.temp.lib}/manager"/>
-
</target>
<target name="__cargo.setup">
Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -133,22 +133,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.ccpp</groupId>
@@ -180,6 +164,18 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -356,32 +352,38 @@
<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.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<executions>
<execution>
@@ -471,10 +473,6 @@
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
-
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
Modified: components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -40,8 +40,7 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
- <deployable type="war" file="${test.temp.lib}/manager.war"/>
- <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
+ <file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-6.0/portlet-test.war"/>
</configuration>
</cargo>
Added: components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml (rev 0)
+++ components/pc/branches/adf/test/servers/tomcat6/src/test/resources/config/tomcat-users.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -0,0 +1,3 @@
+<tomcat-users>
+ <user name="admin" password="admin" roles="manager"/>
+</tomcat-users>
Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -145,22 +145,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <!--<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <scope>test</scope>
- </dependency>-->
- <!--<dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <scope>test</scope>
- </dependency>-->
<dependency>
<groupId>javax.ccpp</groupId>
@@ -501,10 +485,6 @@
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
-
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 15:53:21 UTC (rev 5617)
+++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 17:12:17 UTC (rev 5618)
@@ -40,8 +40,6 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
- <!--<deployable type="war" file="${test.temp.lib}/manager.war"/>-->
- <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>-->
<file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/>
</configuration>
14 years
- 1
- 0
gatein SVN: r5617 - in components/pc/branches/adf/test/servers: jboss51 and 3 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-12-21 10:53:21 -0500 (Tue, 21 Dec 2010)
New Revision: 5617
Modified:
components/pc/branches/adf/test/servers/jboss42/pom.xml
components/pc/branches/adf/test/servers/jboss51/pom.xml
components/pc/branches/adf/test/servers/jetty6/pom.xml
components/pc/branches/adf/test/servers/tomcat6/pom.xml
components/pc/branches/adf/test/servers/tomcat7/pom.xml
Log:
replace org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin by maven-antrun-plugin
Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
+++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
@@ -332,30 +332,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -369,9 +345,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -449,98 +424,58 @@
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
- value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
- value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
- value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.jsr168api.jar"
- value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property name="dependency.portal-common-common.jar"
- value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
- value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar"
- value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
- value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
- value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
- value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
- value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property name="dependency.portal-portlet-portlet.jar"
- value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
- value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
- value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
- value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
- value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
- value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
- value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <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.jboss-kernel.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
- value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
- value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
- value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
- value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
- value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
- value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
- value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
- value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
- value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
- value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
- value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
+++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
@@ -338,30 +338,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -375,9 +351,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -461,102 +436,62 @@
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
- value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
- value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
- value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.jsr168api.jar"
- value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property name="dependency.portal-common-common.jar"
- value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
- value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar"
- value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
- value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
- value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
- value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
- value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property name="dependency.portal-portlet-portlet.jar"
- value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
- value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
- value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
- value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
- value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
- value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
- value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <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.jboss-kernel.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
- value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
- value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
- value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
- value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
- value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
- value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
- value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
- value="${maven.dependency.jboss.jboss-serialization.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}" />
- <property name="dependency.cargo-core-uberjar.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
- value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
- value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
- value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
+++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
@@ -339,30 +339,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -376,9 +352,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -456,100 +431,59 @@
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
- value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
- value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
- value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.jsr168api.jar"
- value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property name="dependency.portal-common-common.jar"
- value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
- value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar"
- value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
- value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
- value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
- value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-jetty.jar"
- value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}"/>
- <property name="dependency.portal-portlet-portlet.jar"
- value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
- value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
- value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
- value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
- value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
- value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
- value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <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.jboss-kernel.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
- value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
- value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
- value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
- value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
- value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
- value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
- value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
- value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
- value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
- value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
- value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
- <property name="dependency.cargo.jetty-deployer"
- value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
+ <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
+++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
@@ -333,30 +333,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -370,9 +346,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -450,98 +425,58 @@
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
- value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
- value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
- value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.jsr168api.jar"
- value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property name="dependency.portal-common-common.jar"
- value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
- value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar"
- value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
- value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
- value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
- value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
- value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
- <property name="dependency.portal-portlet-portlet.jar"
- value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
- value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
- value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
- value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
- value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
- value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
- value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <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.jboss-kernel.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
- value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
- value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
- value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
- value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
- value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
- value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
- value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
- value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
- value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
- value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
- value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}"/>
Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
+++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:53:21 UTC (rev 5617)
@@ -370,9 +370,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<dependencies>
@@ -456,98 +455,58 @@
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar"
- value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar"
- value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar"
- value="${maven.dependency.javax.activation.activation.jar.path}"/>
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.jsr168api.jar"
- value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+ <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
- <property name="dependency.portal-common-common.jar"
- value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar"
- value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar"
- value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar"
- value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar"
- value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
- <property name="dependency.portal-wci-wci.jar"
- value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar"
- value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"/>
- <property name="dependency.portal-portlet-portlet.jar"
- value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar"
- value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar"
- value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
+ <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
+ <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
- <property name="dependency.jboss-unit.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar"
- value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar"
- value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar"
- value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
- value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
- <property name="dependency.concurrent.jar"
- value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <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.jboss-kernel.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar"
- value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar"
- value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar"
- value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar"
- value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar"
- value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.resolver.jar"
- value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar"
- value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar"
- value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar"
- value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
- <property name="dependency.cargo-core-uberjar.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
- <property name="dependency.cargo-ant.jar"
- value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.cargo-manager.war"
- value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
+ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.apache-jstl.jar"
- value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar"
- value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
+ <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
+ <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}"/>
14 years
- 1
- 0
gatein SVN: r5616 - in components/pc/branches/adf: test/servers/jboss51 and 5 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-12-21 10:07:49 -0500 (Tue, 21 Dec 2010)
New Revision: 5616
Added:
components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml
Modified:
components/pc/branches/adf/pom.xml
components/pc/branches/adf/test/servers/jboss51/pom.xml
components/pc/branches/adf/test/servers/src/common/resources/common.xml
components/pc/branches/adf/test/servers/tomcat6/pom.xml
components/pc/branches/adf/test/servers/tomcat7/pom.xml
components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
Log:
Tomcat 7 integration tests ok
Modified: components/pc/branches/adf/pom.xml
===================================================================
--- components/pc/branches/adf/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -50,11 +50,13 @@
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
+ <version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.4</version.cargo>
+ <version.cargo>1.0.3</version.cargo>
<version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
+ <version.cargo.jboss5.deployer>5.1.0.SP1</version.cargo.jboss5.deployer>
<preparationGoals>clean install</preparationGoals>
</properties>
@@ -162,7 +164,18 @@
<type>war</type>
<version>${version.cargo.jetty.deployer}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>${version.cargo.jboss5.deployer}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${version.discovery}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -183,7 +183,6 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-profileservice-spi</artifactId>
- <version>5.1.0.SP1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: components/pc/branches/adf/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -12,8 +12,7 @@
<echo message="test classpath: ${test_classpath}"/>
<echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, or -Dtests=tomcat"/>
- <echo message="-Dtests=local will only run the tests on your locally installed servlet containers"/>
+ <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
<antcall target="package-tests"/>
Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -444,9 +444,9 @@
<isset property="test.cargo.debug"/>
</condition>
<condition property="cargo.debug" value="">
- <not>
- <isset property="test.cargo.debug"/>
- </not>
+ <not>
+ <isset property="test.cargo.debug"/>
+ </not>
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -47,41 +47,54 @@
<artifactId>log4j</artifactId>
</dependency>
+ <!-- JBOSS UNIT DEPENDENCIES -->
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
- <exclusions>
- <exclusion>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <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>
<dependency>
@@ -138,16 +151,16 @@
<type>war</type>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
+ </dependency>-->
+ <!--<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>javax.ccpp</groupId>
@@ -179,6 +192,18 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat7</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -332,30 +357,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-maven2</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failOnError>true</failOnError>
- <testsuites>
- <testsuite>
- <config>test/local-jboss-unit.xml</config>
- </testsuite>
- </testsuites>
- <reports>
- <xml>target/tests/reports/xml/local</xml>
- <html>target/tests/reports/html/local</html>
- </reports>
- </configuration>
- </plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -380,32 +381,38 @@
<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.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<executions>
<execution>
Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615)
+++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -40,8 +40,9 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
- <deployable type="war" file="${test.temp.lib}/manager.war"/>
- <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
+ <!--<deployable type="war" file="${test.temp.lib}/manager.war"/>-->
+ <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>-->
+ <file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/>
</configuration>
</cargo>
@@ -53,7 +54,7 @@
home="${test.cargo.home}"
log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log"
action="stop">
- <configuration/>
+ <configuration home="${test.cargo.dir}"/>
</cargo>
</target>
</project>
Added: components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml (rev 0)
+++ components/pc/branches/adf/test/servers/tomcat7/src/test/resources/config/tomcat-users.xml 2010-12-21 15:07:49 UTC (rev 5616)
@@ -0,0 +1,3 @@
+<tomcat-users>
+ <user name="admin" password="admin" roles="manager-script"/>
+</tomcat-users>
14 years
- 1
- 0
gatein SVN: r5615 - in components/pc/branches/adf: test/servers/jboss42/src/test and 8 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-12-20 11:09:27 -0500 (Mon, 20 Dec 2010)
New Revision: 5615
Modified:
components/pc/branches/adf/pom.xml
components/pc/branches/adf/test/servers/jboss42/src/test/build.xml
components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml
components/pc/branches/adf/test/servers/jboss51/pom.xml
components/pc/branches/adf/test/servers/jboss51/src/test/build.xml
components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml
components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml
components/pc/branches/adf/test/servers/src/common/resources/common.xml
components/pc/branches/adf/test/servers/tomcat7/pom.xml
components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
Log:
JBoss as 5.1 integration tests ok + test-apps location changed.
Modified: components/pc/branches/adf/pom.xml
===================================================================
--- components/pc/branches/adf/pom.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -47,13 +47,13 @@
<properties>
<version.gatein.common>2.0.3-GA</version.gatein.common>
<version.gatein.wci>2.1.0-Alpha01-SNAPSHOT</version.gatein.wci>
- <version.apache.portals.bridges>1.0.3</version.apache.portals.bridges>
+ <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.3</version.cargo>
+ <version.cargo>1.0.4</version.cargo>
<version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
<preparationGoals>clean install</preparationGoals>
Modified: components/pc/branches/adf/test/servers/jboss42/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -5,13 +5,13 @@
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
- <property name="test.cargo.home" value="${env.JBOSS_4_2_0_HOME}"/>
+ <property name="test.cargo.home" value="${env.JBOSS_4_2_HOME}"/>
<!-- properties unique per app server -->
<property name="test.server.name" value="JBoss"/>
<property name="test.server.version" value="4.2"/>
- <property name="test.remote.server.name" value="RemoteJBoss_4_2_0"/>
+ <property name="test.remote.server.name" value="RemoteJBoss_4_2"/>
<property name="cargo.container.id" value="jboss42x"/>
<target name="tests" unless="maven.test.skip">
Modified: components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss42/src/test/resources/test/servers.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -1,6 +1,6 @@
<servers>
<server>
- <server-name>RemoteJBoss_4_2_0</server-name>
+ <server-name>RemoteJBoss_4_2</server-name>
<node>
<node-id>default</node-id>
<service>
Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -387,32 +387,38 @@
<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.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<executions>
<execution>
Modified: components/pc/branches/adf/test/servers/jboss51/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -5,7 +5,7 @@
<!-- SYSTEM PROPERTIES -->
<property environment="env"/>
- <property name="test.cargo.home" value="${env.JBOSS_5_1_0_HOME}"/>
+ <property name="test.cargo.home" value="${env.JBOSS_5_1_HOME}"/>
<!-- properties unique per app server -->
Modified: components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -25,7 +25,7 @@
"-//JBoss//DTD Web Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
<jboss-web>
- <class-loading java2ClassLoadingCompliance="false">
+ <class-loading java2ClassLoadingCompliance="true">
<loader-repository>test:loader=portlet</loader-repository>
</class-loading>
</jboss-web>
\ No newline at end of file
Modified: components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml
===================================================================
--- components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -25,7 +25,7 @@
"-//JBoss//DTD Web Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
<jboss-web>
- <class-loading java2ClassLoadingCompliance="false">
+ <class-loading java2ClassLoadingCompliance="true">
<loader-repository>test:loader=portlet</loader-repository>
</class-loading>
</jboss-web>
\ No newline at end of file
Modified: components/pc/branches/adf/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/src/common/resources/common.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -17,30 +17,16 @@
<antcall target="package-tests"/>
- <!--<antcall target="tests.call.single"/>-->
<!--<antcall target="__evaluate_properties.all"/>-->
<antcall target="test.container-servlet"/>
- <!--<antcall target="tests.call.all"/>-->
</target>
- <target name="tests.call.all" unless="tests">
- <antcall target="__evaluate_properties.all"/>
- <!--<antcall target="tests.jboss"/>-->
- <antcall target="tests.tomcat"/>
- <!--<antcall target="tests.jetty"/>-->
- </target>
-
- <target name="tests.call.single" if="tests">
- <antcall target="__evaluate_properties.${tests}"/>
- <antcall target="tests.${tests}"/>
- </target>
-
<target name="prepare_env">
<!--Relative path to target dir-->
<property name="target" value="${basedir}/target"/>
- <property name="test.temp.dir" value="${target}/test/tmp"/>
+ <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
<property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
<property name="test.temp.lib" value="${test.temp.dir}/lib"/>
@@ -140,9 +126,9 @@
<path location="${dependency.portal-wci-tomcat.jar}"/>
<!-- paths needed for remote jboss deployment -->
- <path path="${dependency.cargo-jboss-deployer.jar}"/>
- <path path="${dependency.jboss-profile-service.jar}"/>
- <path path="${dependency.cargo-core-container-jboss.jar}"/>
+ <path location="${dependency.cargo-jboss-deployer.jar}"/>
+ <path location="${dependency.jboss-profile-service.jar}"/>
+ <path location="${dependency.cargo-core-container-jboss.jar}"/>
</path>
<path id="Tomcat-6.0">
@@ -240,46 +226,22 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_1_HOME" value="${env.JBOSS_4_2_1_HOME}">
+ <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
<and>
- <isset property="env.JBOSS_4_2_1_HOME"/>
+ <isset property="env.JBOSS_4_2_HOME"/>
<not>
- <isset property="JBOSS_4_2_1_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
</and>
</condition>
- <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}">
+ <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
<and>
- <isset property="env.JBOSS_4_2_2_HOME"/>
+ <isset property="env.JBOSS_5_1_HOME"/>
<not>
- <isset property="JBOSS_4_2_2_HOME"/>
+ <isset property="JBOSS_5_1_HOME"/>
</not>
</and>
</condition>
- <condition property="JBOSS_4_2_0_HOME" value="${env.JBOSS_4_2_0_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_0_HOME"/>
- <not>
- <isset property="JBOSS_4_2_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_4_2_3_HOME" value="${env.JBOSS_4_2_3_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_3_HOME"/>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_5_1_0_HOME" value="${env.JBOSS_5_1_0_HOME}">
- <and>
- <isset property="env.JBOSS_5_1_0_HOME"/>
- <not>
- <isset property="JBOSS_5_1_0_HOME"/>
- </not>
- </and>
- </condition>
<condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
<and>
<isset property="env.TOMCAT_6_0_HOME"/>
@@ -305,11 +267,8 @@
</and>
</condition>
- <echo message="JBOSS_4_2_0_HOME: ${JBOSS_4_2_0_HOME}"/>
- <echo message="JBOSS_4_2_1_HOME: ${JBOSS_4_2_1_HOME}"/>
- <echo message="JBOSS_4_2_2_HOME: ${JBOSS_4_2_2_HOME}"/>
- <echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/>
- <echo message="JBOSS_5_1_0_HOME: ${JBOSS_5_1_0_HOME}"/>
+ <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
+ <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
<echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
<echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
<echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
@@ -340,29 +299,20 @@
</target>
<target name="__evaluate_properties.jboss">
- <fail message="Please set the environment variables JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME, JBOSS_4_2_2_HOME and JBOSS_4_2_3_HOME">
+ <fail message="Please set the environment variables JBOSS_4_2_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_4_2_0_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
- <not>
- <isset property="JBOSS_4_2_1_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_2_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </not>
</and>
</condition>
</fail>
- <fail message="Please set the environment variable JBOSS_5_1_0_HOME">
+ <fail message="Please set the environment variable JBOSS_5_1_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_5_1_0_HOME"/>
+ <isset property="JBOSS_5_1_HOME"/>
</not>
</and>
</condition>
@@ -570,7 +520,7 @@
</target>
<target name="__cargo.setup">
- <property name="cargo.log.dir" value="${target}/test/cargo"/>
+ <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
<mkdir dir="${cargo.log.dir}"/>
<taskdef resource="cargo.tasks">
<classpath>
Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -443,9 +443,9 @@
<isset property="test.cargo.debug"/>
</condition>
<condition property="cargo.debug" value="">
- <not>
- <isset property="test.cargo.debug"/>
- </not>
+ <not>
+ <isset property="test.cargo.debug"/>
+ </not>
</condition>
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614)
+++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 16:09:27 UTC (rev 5615)
@@ -40,6 +40,8 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
+ <deployable type="war" file="${test.temp.lib}/manager.war"/>
+ <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/>
</configuration>
</cargo>
14 years
- 1
- 0