September 2010 - gatein-commits - Jboss List Archives

gatein SVN: r4301 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/config and 39 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-09-21 23:54:57 -0400 (Tue, 21 Sep 2010) New Revision: 4301 Added: portal/trunk/component/web/api/src/main/java/org/exoplatform/web/filter/ResourceOverridingFilter.java portal/trunk/examples/extension/war/src/main/resources/ portal/trunk/examples/extension/war/src/main/resources/tomcat/ portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml portal/trunk/examples/portal/war/src/main/resources/ portal/trunk/examples/portal/war/src/main/resources/tomcat/ portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml Removed: portal/trunk/examples/extension/war/src/main/resources/tomcat/ portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml portal/trunk/examples/portal/war/src/main/resources/tomcat/ portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/config/ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/account/ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UILoginForm.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/UILoginForm.java Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/jboss-log4j.xml portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java Log: GTNPORTAL-1457: Merge branch r4047 into trunk Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -154,8 +154,11 @@ { GroupHandler groupHandler = orgService.getGroupHandler(); Collection<String> descendantGroups = getDescendantGroups(group, groupHandler); + Collection<String> deletedNavigationGroups = new ArrayList<String>(); + deletedNavigationGroups.addAll(descendantGroups); + deletedNavigationGroups.add(group.getId()); PageNavigation navigation = null; - for (String childGroup : descendantGroups) + for (String childGroup : deletedNavigationGroups) { navigation = dataService.getPageNavigation(PortalConfig.GROUP_TYPE, childGroup); if (navigation != null) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -314,7 +314,7 @@ "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND " + "(" + - "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%')"; + "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%' ESCAPE '\\')"; } else { Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -127,6 +127,31 @@ group = groupHandler.findGroupById("/groupTest"); assertNull(group); } + + public void testGroupNavigation() throws Exception + { + GroupHandler groupHandler = org.getGroupHandler(); + Group group = groupHandler.createGroupInstance(); + group.setGroupName("testGroupNavigation"); + group.setLabel("testGroupNavigation"); + + groupHandler.addChild(null, group, true); + + PageNavigation pageNavigation = new PageNavigation(); + pageNavigation.setOwnerId(group.getId()); + pageNavigation.setOwnerType(PortalConfig.GROUP_TYPE); + storage.create(pageNavigation); + + pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId()); + assertNotNull(pageNavigation); + + // Remove group + groupHandler.removeGroup(group, true); + + // Group navigations is removed after remove group + pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId()); + assertNull(pageNavigation); + } public void testUserLayout() throws Exception { Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java =================================================================== --- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyPrinter.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -18,12 +18,16 @@ */ package org.exoplatform.groovyscript; +import groovy.lang.GString; import groovy.lang.GroovyInterceptable; import groovy.lang.GroovyObjectSupport; import org.exoplatform.commons.utils.Text; import java.io.IOException; import java.io.Writer; +import java.text.DateFormat; +import java.util.Date; +import java.util.Locale; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -32,6 +36,19 @@ abstract class GroovyPrinter extends GroovyObjectSupport implements GroovyInterceptable { + /** An optional locale. */ + private Locale locale; + + public Locale getLocale() + { + return locale; + } + + public void setLocale(Locale locale) + { + this.locale = locale; + } + /** * Optimize the call to the various print methods. * @@ -82,21 +99,65 @@ } } + /** + * We handle in this method a conversion of an object to another one for formatting purposes. + * + * @param o the object to format + * @return the formatted object + */ + private Object format(Object o) + { + if (o instanceof Date) + { + if (locale != null) + { + DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); + o = dateFormat.format((Date)o); + } + } + + // + return o; + } + + private String toString(Object o) + { + Object f = format(o); + if (f == null) + { + return "null"; + } + else if (f instanceof String) + { + return (String)f; + } + else + { + return o.toString(); + } + } + public final void print(Object o) { try { - if (o == null) + if (o instanceof Text) { - write("null"); + write((Text)o); } - else if (o instanceof Text) + else if (o instanceof GString) { - write((Text)o); + GString gs = (GString)o; + Object[] values = gs.getValues(); + for (int i = 0;i < values.length;i++) + { + values[i] = format(values[i]); + } + write(o.toString()); } else { - write(o.toString()); + write(toString(o)); } } catch (IOException ignore) Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java =================================================================== --- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyScript.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.Writer; +import java.util.Locale; import java.util.Map; /** @@ -70,7 +71,19 @@ return scriptClass; } - public void render(Map context, Writer writer) throws IOException, TemplateRuntimeException + /** + * Renders the script with the provided context and locale to the specified writer. + * + * @param context the context + * @param writer the writer + * @param locale the locale + * @throws IOException + * @throws TemplateRuntimeException + */ + public void render( + Map context, + Writer writer, + Locale locale) throws IOException, TemplateRuntimeException { Binding binding = context != null ? new Binding(context) : new Binding(); @@ -86,6 +99,9 @@ } // + printer.setLocale(locale); + + // BaseScript script = (BaseScript)InvokerHelper.createScript(scriptClass, binding); script.printer = printer; Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java =================================================================== --- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -22,6 +22,7 @@ import java.io.Reader; import java.io.StringWriter; import java.io.Writer; +import java.util.Locale; import java.util.Map; /** @@ -104,12 +105,22 @@ public void render(Writer writer) throws IOException, TemplateRuntimeException { - render(writer, null); + render(writer, (Map)null); } + public void render(Writer writer, Locale locale) throws IOException, TemplateRuntimeException + { + render(writer, null, locale); + } + + public void render(Writer writer, Map binding, Locale locale) throws IOException, TemplateRuntimeException + { + script.render(binding, writer, locale); + } + public void render(Writer writer, Map binding) throws IOException, TemplateRuntimeException { - script.render(binding, writer); + script.render(binding, writer, null); } public String render() throws IOException, TemplateRuntimeException @@ -117,10 +128,20 @@ return render((Map)null); } + public String render(Locale locale) throws IOException, TemplateRuntimeException + { + return render((Map)null, locale); + } + public String render(Map binding) throws IOException, TemplateRuntimeException { + return render(binding, null); + } + + public String render(Map binding, Locale locale) throws IOException, TemplateRuntimeException + { StringWriter buffer = new StringWriter(); - render(buffer, binding); + render(buffer, binding, locale); buffer.close(); return buffer.toString(); } Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java =================================================================== --- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -44,6 +44,7 @@ import java.io.InputStream; import java.util.ArrayList; +import java.util.Locale; /** * Created by The eXo Platform SAS Dec 26, 2005 @@ -113,8 +114,7 @@ GroovyTemplate template = getTemplate(name, context.getResourceResolver()); context.put("_ctx", context); context.setGroovyTemplateService(this); - template.render(context.getWriter(), context); - + template.render(context.getWriter(), context, (Locale)context.get("locale")); long endTime = System.currentTimeMillis(); TemplateStatistic templateStatistic = statisticService.getTemplateStatistic(name); @@ -137,7 +137,7 @@ throw new Exception("Binding cannot be null"); context.put("_ctx", context); GroovyTemplate template = getTemplate(name, context.getResourceResolver()); - template.render(context.getWriter(), context); + template.render(context.getWriter(), context, (Locale)context.get("locale")); } final public GroovyTemplate getTemplate(String name, ResourceResolver resolver) throws Exception Modified: portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java =================================================================== --- portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -26,6 +26,7 @@ import java.io.*; import java.util.EmptyStackException; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -45,6 +46,32 @@ assertEquals("abcde", baos.toString("UTF-8")); } + public void testDate1() throws Exception + { + GroovyTemplate template = new GroovyTemplate("<% print(new Date(0)); %>"); + assertEquals("1 janv. 1970", template.render(Locale.FRENCH)); + assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH)); + assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render()); + } + + public void testDate2() throws Exception + { + GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0) %>$date"); + System.out.println("template.getGroovy() = " + template.getGroovy()); + assertEquals("1 janv. 1970", template.render(Locale.FRENCH)); + assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH)); + assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render()); + } + + public void testDate3() throws Exception + { + GroovyTemplate template = new GroovyTemplate("<%= new Date(0) %>"); + System.out.println("template.getGroovy() = " + template.getGroovy()); + assertEquals("1 janv. 1970", template.render(Locale.FRENCH)); + assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH)); + assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render()); + } + public void testFoo() throws Exception { GroovyTemplate template = new GroovyTemplate("a"); Copied: portal/trunk/component/web/api/src/main/java/org/exoplatform/web/filter/ResourceOverridingFilter.java (from rev 4299, portal/branches/branch-r4047/component/web/api/src/main/java/org/exoplatform/web/filter/ResourceOverridingFilter.java) =================================================================== --- portal/trunk/component/web/api/src/main/java/org/exoplatform/web/filter/ResourceOverridingFilter.java (rev 0) +++ portal/trunk/component/web/api/src/main/java/org/exoplatform/web/filter/ResourceOverridingFilter.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2003-2010 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>. + */ +package org.exoplatform.web.filter; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.exoplatform.container.PortalContainer; + +/** + * A filter enables resource overriding via extension mechanism. + * + * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> + * Sep 8, 2010 + */ + +public class ResourceOverridingFilter implements Filter { + + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + HttpServletRequest upcastedRequest = (HttpServletRequest)request; + + PortalContainer portalContainer = PortalContainer.getInstance(); + ServletContext mergedContext = portalContainer.getPortalContext(); + + String path = upcastedRequest.getRequestURI(); + String ctx = upcastedRequest.getContextPath(); + + if(ctx != null && ctx.length() > 0 && path.startsWith(ctx)) + { + path = path.substring(ctx.length()); + } + + mergedContext.getRequestDispatcher(path).include(request, response); + } + +} Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -19,9 +19,8 @@ package org.exoplatform.portal.resource; +import org.exoplatform.commons.utils.Safe; import org.exoplatform.commons.xml.DocumentSource; -import org.exoplatform.container.PortalContainer; -import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; import org.exoplatform.portal.resource.config.xml.SkinConfigParser; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; @@ -53,15 +52,9 @@ /** . */ private static final String GATEIN_CONFIG_RESOURCE = "/WEB-INF/gatein-resources.xml"; - /** - * The name of the portal container - */ - private final String portalContainerName; - - public GateInSkinConfigDeployer(String portalContainerName, SkinService _skinService) + public GateInSkinConfigDeployer(SkinService _skinService) { this.skinService = _skinService; - this.portalContainerName = portalContainerName; } @Override @@ -72,42 +65,29 @@ WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) { - ServletContext scontext = null; - try + ServletContext scontext = event.getWebApp().getServletContext(); + InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); + if (is != null) { - scontext = event.getWebApp().getServletContext(); - InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); - if (is == null) - return; try { - is.close(); + register(scontext); } catch (Exception ex) { - // ignore me + log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" + + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); } - final PortalContainerPostInitTask task = new PortalContainerPostInitTask() + finally { - - public void execute(ServletContext scontext, PortalContainer portalContainer) - { - register(scontext, portalContainer); - skinService.registerContext(scontext); - } - }; - PortalContainer.addInitTask(scontext, task, portalContainerName); + Safe.close(is); + } } - catch (Exception ex) - { - log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" - + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); - } } } } - private void register(ServletContext scontext, PortalContainer container) + private void register(ServletContext scontext) { URL url; try @@ -127,5 +107,8 @@ log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '" + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); } + + // + skinService.registerContext(scontext); } } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -36,11 +36,8 @@ private SkinService service; - private String portalContainerName; - - public GateInSkinConfigRemoval(String _portalContainerName, SkinService _service) + public GateInSkinConfigRemoval(SkinService _service) { - this.portalContainerName = _portalContainerName; this.service = _service; } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -151,8 +151,8 @@ portletThemes_ = new HashMap<String, Set<String>>(); portalContainerName = context.getPortalContainerName(); mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_); - deployer = new GateInSkinConfigDeployer(portalContainerName, this); - removal = new GateInSkinConfigRemoval(portalContainerName, this); + deployer = new GateInSkinConfigDeployer(this); + removal = new GateInSkinConfigRemoval(this); } /** Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -82,8 +82,8 @@ availableScriptsPaths_ = new ArrayList<String>(); availableScriptsKey_ = new ArrayList<Javascript>(); extendedJavascripts = new HashMap<String, String>(); - deployer = new JavascriptDeployer(context.getPortalContainerName(), this); - removal = new JavascriptRemoval(context.getPortalContainerName(), this); + deployer = new JavascriptDeployer(this); + removal = new JavascriptRemoval(this); object_view_of_merged_JS = new HashMap<String, List<String>>(); } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -19,8 +19,7 @@ package org.exoplatform.web.application.javascript; -import org.exoplatform.container.PortalContainer; -import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; +import org.exoplatform.commons.utils.Safe; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.gatein.wci.WebAppEvent; @@ -29,7 +28,6 @@ import org.gatein.wci.impl.DefaultServletContainerFactory; import org.picocontainer.Startable; -import java.io.IOException; import java.io.InputStream; import javax.servlet.ServletContext; @@ -52,15 +50,9 @@ /** . */ private final JavascriptConfigService javascriptService; - /** - * The name of the portal container - */ - private final String portalContainerName; - - public JavascriptDeployer(String portalContainerName, JavascriptConfigService javascriptService) + public JavascriptDeployer(JavascriptConfigService javascriptService) { this.javascriptService = javascriptService; - this.portalContainerName = portalContainerName; } public void start() @@ -80,47 +72,33 @@ WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event; if (waEvent.getType() == WebAppLifeCycleEvent.ADDED) { - ServletContext scontext = null; - try + ServletContext scontext = event.getWebApp().getServletContext(); + InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); + if (is != null) { - scontext = event.getWebApp().getServletContext(); - - InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); - if (is == null) - return; try { - is.close(); + register(scontext); } catch (Exception ex) { - // ignore me + LOG.error("An error occurs while registering 'Javascript in gatein-resources.xml' from the context '" + + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); } - final PortalContainerPostInitTask task = new PortalContainerPostInitTask() + finally { - - public void execute(ServletContext scontext, PortalContainer portalContainer) - { - register(scontext, portalContainer); - } - }; - PortalContainer.addInitTask(scontext, task, portalContainerName); + Safe.close(is); + } } - catch (Exception ex) - { - LOG.error("An error occurs while registering 'Javascript in gatein-resources.xml' from the context '" - + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex); - } } } } - private void register(ServletContext scontext, PortalContainer container) + private void register(ServletContext scontext) { - InputStream is = null; + InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); try { - is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE); JavascriptConfigParser.processConfigResource(is, javascriptService, scontext); } catch (Exception ex) @@ -130,17 +108,7 @@ } finally { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - // ignore me - } - } + Safe.close(is); } } } \ No newline at end of file Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -34,13 +34,10 @@ public class JavascriptRemoval implements WebAppListener, Startable { - private String portalContainerName; - private JavascriptConfigService javascriptService; - public JavascriptRemoval(String _portalContainerName, JavascriptConfigService _javascriptService) + public JavascriptRemoval(JavascriptConfigService _javascriptService) { - this.portalContainerName = _portalContainerName; this.javascriptService = _javascriptService; } Copied: portal/trunk/examples/extension/war/src/main/resources (from rev 4299, portal/branches/branch-r4047/examples/extension/war/src/main/resources) Copied: portal/trunk/examples/extension/war/src/main/resources/tomcat (from rev 4299, portal/branches/branch-r4047/examples/extension/war/src/main/resources/tomcat) Deleted: portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml =================================================================== --- portal/branches/branch-r4047/examples/extension/war/src/main/resources/tomcat/sample-ext.xml 2010-09-22 01:05:10 UTC (rev 4299) +++ portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -1 +0,0 @@ -<Context path="/sample-ext" docBase="../../../../../examples/extension/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Copied: portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml (from rev 4299, portal/branches/branch-r4047/examples/extension/war/src/main/resources/tomcat/sample-ext.xml) =================================================================== --- portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml (rev 0) +++ portal/trunk/examples/extension/war/src/main/resources/tomcat/sample-ext.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -0,0 +1 @@ +<Context path="/sample-ext" docBase="../../../../../examples/extension/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Copied: portal/trunk/examples/portal/war/src/main/resources (from rev 4299, portal/branches/branch-r4047/examples/portal/war/src/main/resources) Copied: portal/trunk/examples/portal/war/src/main/resources/tomcat (from rev 4299, portal/branches/branch-r4047/examples/portal/war/src/main/resources/tomcat) Deleted: portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml =================================================================== --- portal/branches/branch-r4047/examples/portal/war/src/main/resources/tomcat/sample-portal.xml 2010-09-22 01:05:10 UTC (rev 4299) +++ portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -1 +0,0 @@ -<Context path="/sample-portal" docBase="../../../../../examples/portal/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Copied: portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml (from rev 4299, portal/branches/branch-r4047/examples/portal/war/src/main/resources/tomcat/sample-portal.xml) =================================================================== --- portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml (rev 0) +++ portal/trunk/examples/portal/war/src/main/resources/tomcat/sample-portal.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -0,0 +1 @@ +<Context path="/sample-portal" docBase="../../../../../examples/portal/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -185,7 +185,25 @@ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> + + <servlet> + <servlet-name>StickyCaptcha</servlet-name> + <servlet-class>org.exoplatform.web.security.CaptchaServlet</servlet-class> + <init-param> + <param-name>width</param-name> + <param-value>200</param-value> + </init-param> + <init-param> + <param-name>height</param-name> + <param-value>75</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>StickyCaptcha</servlet-name> + <url-pattern>/captcha</url-pattern> + </servlet-mapping> +  <servlet-mapping> <servlet-name>InitiateLoginServlet</servlet-name> Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java =================================================================== --- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -40,6 +40,7 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; @@ -419,7 +420,7 @@ PortalRequestContext prContext = Util.getPortalRequestContext(); prContext.setResponseComplete(true); - prContext.getResponse().sendRedirect(prContext.getPortalURI() + selectedNode.getUri()); + prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(selectedNode.getUri(), "UTF-8")); } } } @@ -437,7 +438,7 @@ //We should redirect to current node while adding new tab fails PageNode currentNode = tabPane.uiPortal.getSelectedNode(); PortalRequestContext prContext = Util.getPortalRequestContext(); - prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri()); + prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8")); Object[] args = {newTabLabel}; context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args)); @@ -450,7 +451,7 @@ { PortalRequestContext prContext = Util.getPortalRequestContext(); prContext.setResponseComplete(true); - prContext.getResponse().sendRedirect(prContext.getPortalURI() + uri); + prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(uri, "UTF-8")); } } } @@ -475,11 +476,10 @@ String newTabLabel = context.getRequestParameter(RENAMED_TAB_LABEL_PARAMETER); if (!tabPane.validateName(newTabLabel)) { - //TODO nguyenanhkien2a(a)gmail.com //We should redirect to current node while renaming fails PageNode currentNode = tabPane.uiPortal.getSelectedNode(); PortalRequestContext prContext = Util.getPortalRequestContext(); - prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri()); + prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8")); Object[] args = {newTabLabel}; context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args)); @@ -491,7 +491,7 @@ if (newUri != null) { PortalRequestContext prContext = Util.getPortalRequestContext(); - prContext.getResponse().sendRedirect(prContext.getPortalURI() + newUri); + prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(newUri, "UTF-8")); } } } Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -235,7 +235,7 @@ <mime-type>text/html</mime-type> <portlet-mode>help</portlet-mode> </supports> - <supported-locale>en,fr,vi,ar</supported-locale> + <supported-locale>en</supported-locale> <resource-bundle>locale.portlet.exoadmin.AdminToolbarPortlet</resource-bundle> <portlet-info> <title>Administration Toolbar Portlet</title> Deleted: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UILoginForm.gtmpl =================================================================== --- portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UILoginForm.gtmpl 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UILoginForm.gtmpl 2010-09-22 03:54:57 UTC (rev 4301) @@ -1,13 +0,0 @@ -<div class="UILoginForm" id="ChildTest"> - <%uiform.begin()%> - <div class="FieldContainer"> - <label for="userName"><%=_ctx.appRes("UILoginForm.label.login")%></label> - <% uiform.renderChild(0); %> - </div> - <div class="FieldContainer"> - <label for="password"><%=_ctx.appRes("UILoginForm.label.password")%></label> - <% uiform.renderChild(1); %> - </div> - <a class="Button" href="<%=uicomponent.url("Login");%>"><span></span></a> - <%uiform.end()%> -</div> Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/jboss-log4j.xml =================================================================== --- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/jboss-log4j.xml 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/jboss-log4j.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -211,8 +211,8 @@ <priority value="INFO"/> </category> -  - <category name="jcr"> +  + <category name="exo.jcr"> <priority value="INFO"/> </category> Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -107,7 +107,8 @@ UIMaskLayer.prototype.createMask = function(blockContainerId, object, opacity, position) { try { var Browser = eXo.core.Browser ; - var blockContainer = document.getElementById(blockContainerId) ; + if(typeof(blockContainerId) == "string") blockContainerId = document.getElementById(blockContainerId) ; + var blockContainer = blockContainerId ; var maskLayer = document.createElement("div") ; this.object = object ; @@ -121,12 +122,11 @@ * reference with method eXo.core.UIMaskLayer.doScroll() */ document.getElementById("MaskLayer").id = "subMaskLayer"; - } - blockContainer.appendChild(maskLayer) ; - + } + blockContainer.appendChild(maskLayer) ; maskLayer.className = "MaskLayer" ; - maskLayer.id = "MaskLayer" ; - maskLayer.maxZIndex = 4; //3 ; + maskLayer.id = "MaskLayer" ; + maskLayer.maxZIndex = eXo.webui.UIPopup.zIndex + 1; //3 ; maskLayer.style.width = Browser.getBrowserWidth() + "px"; maskLayer.style.height = Browser.getBrowserHeight() + "px"; maskLayer.style.top = "0px" ; @@ -137,14 +137,14 @@ Browser.setOpacity(maskLayer, opacity) ; } - if(object != null){ - if(object.nextSibling) { - maskLayer.nextSiblingOfObject = object.nextSibling ; - maskLayer.parentOfObject = null ; + if(object != null) { + var tempNextSibling = document.createElement("span"); + if(object.nextSibling) { + object.parentNode.insertBefore(tempNextSibling, object.nextSibling); } else { - maskLayer.nextSiblingOfObject = null ; - maskLayer.parentOfObject = object.parentNode ; + object.parentNode.appendChild(tempNextSibling); } + maskLayer.nextSiblingOfObject = tempNextSibling ; //object.style.zIndex = maskLayer.maxZIndex + 1 ; object.style.zIndex = maskLayer.maxZIndex; @@ -185,27 +185,31 @@ maskLayer.id = object.id + "MaskLayer" ; maskLayer.maxZIndex = 3 ; maskLayer.style.width = blockContainer.offsetWidth + "px" ; - maskLayer.style.height = blockContainer.offsetHeight + eXo.core.Browser.findPosY(blockContainer) + "px" ; - maskLayer.style.top = "0px" ; - maskLayer.style.left = "0px" ; + maskLayer.style.height = blockContainer.offsetHeight + "px" ; + var parentOfBlockContainer = eXo.core.DOMUtil.findAncestorById(blockContainer, "UIMaskWorkspace"); + if (!parentOfBlockContainer) { + parentOfBlockContainer = document.getElementById("UIWorkingWorkspace"); + } + maskLayer.style.top = eXo.core.Browser.findPosYInContainer(blockContainer, parentOfBlockContainer) + "px" ; + maskLayer.style.left = eXo.core.Browser.findPosXInContainer(blockContainer, parentOfBlockContainer) + "px" ; maskLayer.style.zIndex = maskLayer.maxZIndex ; if(opacity) { Browser.setOpacity(maskLayer, opacity) ; } if(object != null){ - if(object.nextSibling) { - maskLayer.nextSiblingOfObject = object.nextSibling ; - maskLayer.parentOfObject = null ; - } else { - maskLayer.nextSiblingOfObject = null ; - maskLayer.parentOfObject = object.parentNode ; - } + var tempNextSibling = document.createElement("span"); + if(object.nextSibling) { + object.parentNode.insertBefore(tempNextSibling, object.nextSibling); + } else { + object.parentNode.appendChild(tempNextSibling); + } + maskLayer.nextSiblingOfObject = tempNextSibling ; + + object.style.zIndex = maskLayer.maxZIndex + 1 ; + object.style.display = "block" ; - object.style.zIndex = maskLayer.maxZIndex + 1 ; - object.style.display = "block" ; - - blockContainer.appendChild(object) ; + blockContainer.appendChild(object) ; } }catch(err) {} @@ -278,17 +282,12 @@ if (maskLayer) { var parentNode = maskLayer.parentNode ; maskLayer.nextSibling.style.display = "none" ; - - if (maskLayer.nextSiblingOfObject) { - maskLayer.nextSiblingOfObject.parentNode.insertBefore(maskLayer.nextSibling, maskLayer.nextSiblingOfObject) ; - maskLayer.nextSiblingOfObject = null ; - } else { - maskLayer.parentOfObject.appendChild(maskLayer.nextSibling) ; - maskLayer.parentOfObject = null ; - } - - parentNode.removeChild(maskLayer) ; + + maskLayer.nextSiblingOfObject.parentNode.insertBefore(maskLayer.nextSibling, maskLayer.nextSiblingOfObject) ; + maskLayer.nextSiblingOfObject.parentNode.removeChild(maskLayer.nextSiblingOfObject); + maskLayer.nextSiblingOfObject = null ; + parentNode.removeChild(maskLayer) ; } } ; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -669,6 +669,19 @@ } attEl.appendChild(el); } + else if (type == "bool") { + var el = document.createElement("input"); + el.type = "checkbox"; + el.name = prefix + att; + el.id = elID; + if (userPrefs[att] && userPrefs[att] == "true") { + el.checked = userPrefs[att]; + } else { + if(prefs[att].default == "true") + el.checked = true; + } + attEl.appendChild(el); + } formEl.appendChild(attEl); j++; } @@ -745,6 +758,8 @@ var userPrefNamePrefix = 'm_' + this.id + '_up_'; var userPrefName = input.name.substring(userPrefNamePrefix.length); var userPrefValue = input.value; + if(input.type == 'checkbox') + userPrefValue = input.checked ? "true" : "false"; prefs[userPrefName] = userPrefValue; } } Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -19,7 +19,6 @@ function UIPortalControl() { this.scrollManagers = new Array(); - this.t = 0; }; /** * Change state of window @@ -70,18 +69,20 @@ if(e.keyCode) code = e.keyCode; else if (e.which) code = e.which; if(code ==13) { - if(this.t != 13) { - var uiPortalLoginFormAction = document.getElementById("UIPortalLoginFormAction"); - if(uiPortalLoginFormAction) { - uiPortalLoginFormAction.onclick() ; - } - else - { - if(executeScript) - eval(executeScript); - } + if (window.event) { + e.returnValue = false; + } else { + e.preventDefault(); + } + var uiPortalLoginFormAction = document.getElementById("UIPortalLoginFormAction"); + if(uiPortalLoginFormAction) { + uiPortalLoginFormAction.onclick() ; } - this.t = code; + else + { + if(executeScript) + eval(executeScript); + } } }; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -68,12 +68,18 @@ } ; UIPopupWindow.prototype.showMask = function(popup, isShowPopup) { - var maskId = popup.id + "MaskLayer" ; - var mask = document.getElementById(maskId) ; + var mask = popup.previousSibling; if(isShowPopup) { - if (mask == null) eXo.core.UIMaskLayer.createMaskForFrame(popup.parentNode, popup, 1) ; + //Modal if popup is portal component + if (eXo.core.DOMUtil.findAncestorByClass(popup, "PORTLET-FRAGMENT") == null) { + eXo.core.UIMaskLayer.createMask(popup.parentNode, popup, 1) ; + } else { + //If popup is portlet's component, modal with just its parent + eXo.core.UIMaskLayer.createMaskForFrame(popup.parentNode, popup, 1) ; + } } else { - if(mask != null) eXo.core.UIMaskLayer.removeMask(mask) ; + //Make sure mask is not TextNode because of previousSibling property + if(mask != null && mask.className == "MaskLayer") eXo.core.UIMaskLayer.removeMask(mask) ; } } ; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -39,11 +39,6 @@ var compId = portletFrag.parentNode.id; var nodeIndex = inputElement.id; - //Change the tab label - var spanElement = document.createElement("span"); - spanElement.innerHTML = newTabLabel; - inputElement.parentNode.replaceChild(spanElement, inputElement); - //Send request to server to change node name var href = eXo.env.server.portalBaseURL + "?portal:componentId=" + compId; href += "&portal:type=action"; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js 2010-09-22 03:54:57 UTC (rev 4301) @@ -49,32 +49,43 @@ UIUpload.prototype.createUploadEntry = function(uploadId, isAutoUpload) { - var iframe = document.getElementById(uploadId+'uploadFrame'); + var iframe = document.getElementById(uploadId+'uploadFrame'); var idoc = iframe.contentWindow.document ; var uploadAction = eXo.env.server.context + "/upload?" ; - uploadAction += "uploadId=" + uploadId+"&action=upload" ; - idoc.open(); - idoc.write("<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"); - idoc.write("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='" +eXo.core.I18n.lang+ "' dir='" +eXo.core.I18n.dir+ "'>"); - idoc.write("<head>"); - idoc.write("<style type='text/css'>"); - idoc.write(".UploadButton {width: 20px; height: 20px; cursor: pointer; vertical-align: bottom;"); - idoc.write(" background: url('/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif') no-repeat left; }"); - idoc.write("</style>"); - idoc.write("<script type='text/javascript'>var eXo = parent.eXo</script>"); - idoc.write("</head>"); - idoc.write("<body style='margin: 0px; border: 0px;'>"); - idoc.write(" <form id='"+uploadId+"' class='UIUploadForm' style='margin: 0px; padding: 0px' action='"+uploadAction+"' enctype='multipart/form-data' method='post'>"); + uploadAction += "uploadId=" + uploadId+"&action=upload" ; + + var uploadHTML = ""; + uploadHTML += "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"; + uploadHTML += "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='" +eXo.core.I18n.lang+ "' dir='" +eXo.core.I18n.dir+ "'>"; + uploadHTML += "<head>"; + uploadHTML += "<style type='text/css'>"; + uploadHTML += ".UploadButton {width: 20px; height: 20px; cursor: pointer; vertical-align: bottom;"; + uploadHTML += " background: url('/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif') no-repeat left; }"; + uploadHTML += "</style>"; + uploadHTML += "</head>"; + uploadHTML += "<body style='margin: 0px; border: 0px;'>"; + uploadHTML += " <form id='"+uploadId+"' class='UIUploadForm' style='margin: 0px; padding: 0px' action='"+uploadAction+"' enctype='multipart/form-data' method='post'>"; if(isAutoUpload){ - idoc.write(" <input type='file' name='file' id='file' value='' onchange='eXo.webui.UIUpload.upload(this, "+uploadId+")' onkeypress='return false;' />"); + uploadHTML += " <input type='file' name='file' id='file' value='' onchange='parent.eXo.webui.UIUpload.upload(this, "+uploadId+")' onkeypress='return false;' />"; }else{ - idoc.write(" <input type='file' name='file' id='file' value='' onkeypress='return false;' />"); - idoc.write(" <img class='UploadButton' onclick='eXo.webui.UIUpload.upload(this, "+uploadId+")' alt='' src='/eXoResources/skin/sharedImages/Blank.gif'/>"); + uploadHTML += " <input type='file' name='file' id='file' value='' onkeypress='return false;' />"; + uploadHTML += " <img class='UploadButton' style='width: 20px; height: 20px; cursor: pointer; vertical-align: bottom; background: url(\"/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif\") no-repeat left;' onclick='parent.eXo.webui.UIUpload.upload(this, "+uploadId+")' alt='' src='/eXoResources/skin/sharedImages/Blank.gif'/>"; } - idoc.write(" </form>"); - idoc.write("</body>"); - idoc.write("</html>"); - idoc.close(); + uploadHTML += " </form>"; + uploadHTML += "</body>"; + uploadHTML += "</html>"; + + if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1) { + //workaround for Chrome + //When submit in iframe with Chrome, the iframe.contentWindow.document seems not be reconstructed correctly + idoc.open(); + idoc.close(); + idoc.documentElement.innerHTML = uploadHTML; + } else { + idoc.open(); + idoc.write(uploadHTML); + idoc.close(); + } }; /** Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -254,7 +254,7 @@ UILoginForm.label.Signin=Anmelden UILoginForm.label.ForAccount=Jetzt ein Konto registrieren UILoginForm.label.SigninFail=Anmeldung fehlgeschlagen. Falscher Benutzername oder falsches Passwort. -UILoginForm.label.Copyright=Copyright © 2009. Alle Rechte vorbehalten, eXo Platform SAS und Red Hat, Inc. +UILoginForm.label.Copyright=Copyright © 2010. Alle Rechte vorbehalten, eXo Platform SAS und Red Hat, Inc. ############################################################################# # Message Error # @@ -925,7 +925,7 @@ # org.exoplatform.portal.component.customization.UIPortalToolPanel # ############################################################################ -UIPortalToolPanel.label.copyrightText=Copyright © 2009. Alle Rechte vorbehalten, +UIPortalToolPanel.label.copyrightText=Copyright © 2010. Alle Rechte vorbehalten, UIPortalToolPanel.label.companyTitleText= eXo Platform SAS und Red Hat, Inc.. ############################################################################ Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -263,7 +263,7 @@ UILoginForm.label.Signin=Sign in UILoginForm.label.ForAccount=Register now for an account UILoginForm.label.SigninFail=Sign in failed. Wrong username or password. -UILoginForm.label.Copyright=Copyright &copy 2009-2010. All rights reserved, Red Hat, Inc and eXo Platform SAS +UILoginForm.label.Copyright=Copyright &copy 2010. All rights reserved, Red Hat, Inc and eXo Platform SAS ############################################################################# # Message Error # @@ -485,6 +485,14 @@ UIPageEditor.action.SwitchMode=Switch View mode ############################################################################# + # org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace # + ############################################################################# + +UIEditInlineWorkspace.confirm.close=Modifications have been made. Are you sure you want to close without saving ? +UIEditInlineWorkspace.confirm.yes=Yes +UIEditInlineWorkspace.confirm.no=No + + ############################################################################# # org.exoplatform.portal.component.customization.UIPageForm # ############################################################################# Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -922,7 +922,7 @@ ############################################################################ UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights Reserved, -UIPortalToolPanel.label.companyTitleText= eXo Platform SAS and Red Hat, Inc.. +UIPortalToolPanel.label.companyTitleText= eXo SAS Plataforma y Red Hat, Inc.. ############################################################################ # org.exoplatform.portal.component.view.UIContainer # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -239,7 +239,7 @@ UILoginForm.label.Signup=Enregistrement UILoginForm.label.ForAccount=Créer un compte UILoginForm.label.SigninFail=La connexion a échouée. Le nom d'utilisateur ou mot de passe est incorrecte. -UILoginForm.label.Copyright=Copyright &copy 2009-2010. All rights reserved, Red Hat, Inc. and eXo Platform SAS +UILoginForm.label.Copyright=Copyright &copy 2010. All rights reserved, Red Hat, Inc. and eXo Platform SAS ############################################################################# # Message Error # @@ -911,7 +911,7 @@ # org.exoplatform.portal.component.customization.UIPortalToolPanel # ############################################################################ -UIPortalToolPanel.label.copyrightText=Copyright © 2009-2010. Tous droits réservés, +UIPortalToolPanel.label.copyrightText=Copyright © 2010. Tous droits réservés, UIPortalToolPanel.label.companyTitleText=Red Hat, Inc. et eXo Platform SAS ############################################################################ Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -254,7 +254,7 @@ UILoginForm.label.Signin=\u30b5\u30a4\u30f3\u30a4\u30f3 UILoginForm.label.ForAccount=\u30a2\u30ab\u30a6\u30f3\u30c8\u767b\u9332 UILoginForm.label.SigninFail=\u30b5\u30a4\u30f3\u30a4\u30f3\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8aa4\u3063\u305f\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002 -UILoginForm.label.Copyright=Copyright &copy 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc. +UILoginForm.label.Copyright=Copyright &copy 2010. All rights Reserved, eXo Platform SAS \u3057\u3066 Red Hat, Inc. ############################################################################# # Message Error # @@ -926,8 +926,8 @@ # org.exoplatform.portal.component.customization.UIPortalToolPanel # ############################################################################ -UIPortalToolPanel.label.copyrightText=Copyright © 2009. All rights Reserved, -UIPortalToolPanel.label.companyTitleText= eXo Platform SAS and Red Hat, Inc.. +UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights Reserved, +UIPortalToolPanel.label.companyTitleText= eXo Platform SAS \u3057\u3066 Red Hat, Inc.. ############################################################################ # org.exoplatform.portal.component.view.UIContainer # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -922,8 +922,8 @@ # org.exoplatform.portal.component.customization.UIPortalToolPanel # ############################################################################ -UIPortalToolPanel.label.copyrightText=Copyright © 2009. All rights Reserved, -UIPortalToolPanel.label.companyTitleText= eXo Platform SAS and Red Hat, Inc.. +UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights reserved, +UIPortalToolPanel.label.companyTitleText= SAS eXo Platform e Red Hat, Inc.. ############################################################################ # org.exoplatform.portal.component.view.UIContainer # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-09-22 03:54:57 UTC (rev 4301) @@ -898,7 +898,7 @@ ############################################################################ UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights Reserved, -UIPortalToolPanel.label.companyTitleText= eXo Platform SAS and Red Hat, Inc.. +UIPortalToolPanel.label.companyTitleText= eXo Platform SAS і Red Hat Inc.. ############################################################################ # org.exoplatform.portal.component.view.UIContainer # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-09-22 03:54:57 UTC (rev 4301) @@ -114,11 +114,6 @@ <dispatcher>ERROR</dispatcher> </filter-mapping> - <filter-mapping> - <filter-name>GenericFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> <filter-name>ResourceRequestFilter</filter-name> <url-pattern>*.css</url-pattern> @@ -163,6 +158,12 @@ <filter-name>RestEncodingFilter</filter-name> <url-pattern>/rest/*</url-pattern> </filter-mapping> + + <filter-mapping> + <filter-name>GenericFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> +   Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-09-22 03:54:57 UTC (rev 4301) @@ -37,14 +37,7 @@ <div class="FixHeight"> <% if(hasPermission) { - if(portletTitle == null || portletTitle.trim().length() < 1) { - try { - String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName(); - print _ctx.getRequestContext().getApplicationResourceBundle().getString("UIPortlet.description." + portletName); - } catch(Exception e){ - print uicomponent.getDisplayName(); - } - } else print portletTitle; + print uicomponent.getDisplayTitle(); } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; %> </div> @@ -62,12 +55,8 @@ if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { if(uicomponent.getShowInfoBar()) { - String title = portletTitle; + String title = uicomponent.getDisplayTitle(); if(title == null || title.trim().length() < 1) - title = uicomponent.getTitle(); - if(title == null || title.trim().length() < 1) - title = uicomponent.getDisplayName(); - if(title == null || title.trim().length() < 1) title = portletId; /*Begin Window Portlet Bar*/ String visibility = "visible"; @@ -292,9 +281,7 @@ String portletIcon = uicomponent.getIcon(); if(portletIcon == null) portletIcon = "PortletIcon"; - String title = portletTitle; - if(title == null || title.trim().length() < 1) - title = uicomponent.getDisplayTitle(); + String title = uicomponent.getDisplayTitle(); if(title.length() > 30) title = title.substring(0,27) + "..."; %> <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-09-22 03:54:57 UTC (rev 4301) @@ -14,7 +14,7 @@ <div class="OverflowContainer"> <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> <% if(uicomponent.isShowControl) { %> - <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("Abort")%>"><span></span></a> + <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("CloseComposer")%>"><span></span></a> <% if (uicomponent.isUsedInWizard()) { %> <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>" onclick="eXo.core.DOMUtil.disableOnClick(this);" ><span></span></a> <a class="BackButton"" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2010-09-22 03:54:57 UTC (rev 4301) @@ -41,7 +41,7 @@ void printMessage(String message, String messageType) { - println "<div class=\"UITabContent\""; + println "<div class=\"UITabContent\">"; println " <div class=\"PopupMessageBox\">"; println " <div class=\"$messageType\">"; println " <div class=\"PopupMessageContainer\">"; @@ -76,7 +76,7 @@ } } %> - <div class="UIPopupWindow" id="$popupId" style="width: 550px; display: none;"> + <div class="UIPopupWindow UIDragObject" id="$popupId" style="width: 550px; display: none;"> <div class="ExoMessageDecorator"> <div class="TopLeftCornerDecorator"> <div class="TopRightCornerDecorator"> @@ -136,9 +136,9 @@ </div> <% - rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false);"); + rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false, null, null, $uicomponent.showMask);"); if(uicomponent.hasMessage()){ - rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId');"); + rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId', $uicomponent.showMask);"); rcontext.getJavascriptManager().addJavascript("window.setTimeout(\"eXo.webui.UIPopupWindow.increasezIndex('$popupId')\", 100);"); } %> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2010-09-22 03:54:57 UTC (rev 4301) @@ -161,9 +161,9 @@ </div> </div> <% - rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false);"); + rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false, null, null, $uicomponent.showMask);"); if(uicomponent.hasMessage()){ - rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId');"); + rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId', $uicomponent.showMask);"); rcontext.getJavascriptManager().addJavascript("window.setTimeout(\"eXo.webui.UIPopupWindow.increasezIndex('$popupId')\", 100);"); } %> \ No newline at end of file Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIConfirmation.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -24,7 +24,6 @@ import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.form.UIFormInputWithActions.ActionData; /** * Created by The eXo Platform SAS @@ -56,6 +55,7 @@ { this.message_ = ""; this.caller_ = new Object(); + setShowMask(true); setShow(true); } @@ -63,6 +63,7 @@ { this.message_ = message; this.caller_ = caller; + setShowMask(true); setShow(true); } @@ -116,19 +117,16 @@ return (message_!=null) && (!message_.equals("")); } - private void hidePopup(WebuiRequestContext context) + private void hidePopup(Event<UIConfirmation> event) throws Exception { + WebuiRequestContext context = event.getRequestContext(); this.clearMessage(); - if(this.getParent() == null) - { - context.addUIComponentToUpdateByAjax(this); - return; - } - - if(!this.isShow()) - { - return; - } + context.addUIComponentToUpdateByAjax(this); + UIComponent uiParent = getParent(); + Event<UIComponent> pEvent = + uiParent.createEvent("ClosePopup", event.getExecutionPhase(), event.getRequestContext()); + if (pEvent != null) + pEvent.broadcast(); } public static class CloseActionListener extends EventListener<UIConfirmation> @@ -137,8 +135,7 @@ public void execute(Event<UIConfirmation> event) throws Exception { UIConfirmation uiConfirmation = event.getSource(); - WebuiRequestContext context = event.getRequestContext(); - uiConfirmation.hidePopup(context); + uiConfirmation.hidePopup(event); } } @@ -158,7 +155,7 @@ xEvent.broadcast(); } - uiConfirmation.hidePopup(context); + uiConfirmation.hidePopup(event); } } Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -189,14 +189,12 @@ { option.setSelected(true); } - if (config.getLanguage().equals("en")) - { - lang.add(0, option); - continue; - } lang.add(option); } + // Set default language for new user is empty + lang.add(new SelectItemOption<String>("", "")); + Collections.sort(lang, new LanguagesComparator()); langSelectBox.setOptions(lang); Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java =================================================================== --- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -63,6 +63,7 @@ errors_ = new ArrayList<ApplicationMessage>(); warnings_ = new ArrayList<ApplicationMessage>(); infos_ = new ArrayList<ApplicationMessage>(); + setShowMask(true); setShow(true); } Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java =================================================================== --- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -101,9 +101,10 @@ * */ protected void renderTemplate(String template, WebuiBindingContext bcontext) throws Exception - { + { + WebuiRequestContext context = bcontext.getRequestContext(); bcontext.put("decorator", decorator_); - WebuiRequestContext context = bcontext.getRequestContext(); + bcontext.put("locale", context.getLocale()); ExoContainer pcontainer = context.getApplication().getApplicationServiceContainer(); TemplateService service = (TemplateService)pcontainer.getComponentInstanceOfType(TemplateService.class); ResourceResolver resolver = bcontext.getResourceResolver(); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -20,6 +20,7 @@ package org.exoplatform.portal.application; import org.exoplatform.Constants; +import org.exoplatform.commons.utils.ExpressionUtil; import org.exoplatform.commons.utils.PortalPrinter; import org.exoplatform.container.ExoContainer; import org.exoplatform.portal.config.UserPortalConfigService; @@ -224,6 +225,7 @@ if (page != null) { title = page.getTitle(); + return ExpressionUtil.getExpressionValue(this.getApplicationResourceBundle(), title); } else { Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/UILoginForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/UILoginForm.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/UILoginForm.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -1,92 +0,0 @@ -/** - * Copyright (C) 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.exoplatform.portal.webui; - -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; -import org.exoplatform.services.organization.OrganizationService; -import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.config.annotation.EventConfig; -import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; -import org.exoplatform.webui.exception.MessageException; -import org.exoplatform.webui.form.UIForm; -import org.exoplatform.webui.form.UIFormStringInput; - -import java.net.URLEncoder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * Created by The eXo Platform SARL - * Author : Nhu Dinh Thuan - * nhudinhthuan(a)exoplatform.com - * Jul 11, 2006 - */ -@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/portal/webui/UILoginForm.gtmpl", events = { - @EventConfig(listeners = UILoginForm.SigninActionListener.class), - @EventConfig(phase = Phase.DECODE, listeners = UIMaskWorkspace.CloseActionListener.class)}) -public class UILoginForm extends UIForm -{ - - public UILoginForm() throws Exception - { - addUIFormInput(new UIFormStringInput("username", "username", null)).addUIFormInput( - new UIFormStringInput("password", "password", null).setType(UIFormStringInput.PASSWORD_TYPE)); - } - - static public class SigninActionListener extends EventListener<UILoginForm> - { - - public void execute(Event<UILoginForm> event) throws Exception - { - UILoginForm uiForm = event.getSource(); - String username = uiForm.getUIStringInput("username").getValue(); - String password = uiForm.getUIStringInput("password").getValue(); - - OrganizationService orgService = uiForm.getApplicationComponent(OrganizationService.class); - boolean authentication = orgService.getUserHandler().authenticate(username, password); - if (!authentication) - { - throw new MessageException(new ApplicationMessage("UILoginForm.msg.Invalid-account", null)); - } - - PortalRequestContext prContext = Util.getPortalRequestContext(); - HttpServletRequest request = prContext.getRequest(); - HttpSession session = request.getSession(); - session.setAttribute("authentication.username", username); - session.setAttribute("authentication.password", password); - UIPortal uiPortal = Util.getUIPortal(); - prContext.setResponseComplete(true); - String portalName = uiPortal.getName(); - portalName = URLEncoder.encode(portalName, "UTF-8"); - String redirect = request.getContextPath() + "/private/" + portalName + "/"; - prContext.getResponse().sendRedirect(redirect); - } - - } - -} Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -160,6 +160,9 @@ private StateString navigationalState; + /** A field storing localized value of javax.portlet.title **/ + private String configuredTitle; + public UIPortlet() { // That value will be overriden when it is mapped onto a data storage @@ -386,16 +389,6 @@ supportedPublicParams_ = supportedPublicRenderParameters; } - public String getDisplayTitle() - { - String title = getTitle(); - if (title == null) - { - title = getDisplayName(); - } - return title; - } - public String getDisplayName() { if (displayName == null) @@ -942,4 +935,37 @@ { this.navigationalState = navigationalState; } + + protected void setConfiguredTitle(String _configuredTitle) + { + this.configuredTitle = _configuredTitle; + } + + /** + * Returns the title showed on the InfoBar. The title is computed in following manner. + * + * 1. First, the method getTitle(), inherited from UIPortalComponent is called. The getTitle() returns + * what users set in the PortletSetting tab, the current method returns call result if it is not null. + * + * 2. configuredTitle, which is the localized value of javax.portlet.title is returned if it is not null. + * + * 3. If the method does not terminate at neither (1) nor (2), the configured display name is returned. + * @return + */ + public String getDisplayTitle() + { + String displayedTitle = getTitle(); + if(displayedTitle != null && displayedTitle.trim().length() > 0) + { + return displayedTitle; + } + + if(configuredTitle != null) + { + return configuredTitle; + } + + return getDisplayName(); + + } } \ No newline at end of file Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -170,7 +170,6 @@ // Text markup = null; - String portletTitle = null; try { @@ -217,8 +216,8 @@ markup = Text.create(""); break; } - portletTitle = fragmentResponse.getTitle(); - + uicomponent.setConfiguredTitle(fragmentResponse.getTitle()); + // setup portlet properties if (fragmentResponse.getProperties() != null) { @@ -337,7 +336,6 @@ WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext); bcontext.put(UIComponent.UICOMPONENT, uicomponent); bcontext.put("portletContent", markup); - bcontext.put("portletTitle", portletTitle); try { renderTemplate(uicomponent.getTemplate(), bcontext); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -60,6 +60,7 @@ import org.exoplatform.webui.event.Event.Phase; import java.util.List; +import java.util.ResourceBundle; import javax.servlet.http.HttpServletRequest; @@ -67,6 +68,7 @@ @ComponentConfigs({ @ComponentConfig(template = "app:/groovy/portal/webui/portal/UIPortalComposer.gtmpl", events = { @EventConfig(listeners = UIPortalComposer.ViewPropertiesActionListener.class), + @EventConfig(listeners = UIPortalComposer.CloseComposerActionListener.class), @EventConfig(listeners = UIPortalComposer.AbortActionListener.class), @EventConfig(listeners = UIPortalComposer.FinishActionListener.class), @EventConfig(listeners = UIPortalComposer.SwitchModeActionListener.class), @@ -74,6 +76,7 @@ @EventConfig(listeners = UIPortalComposer.ToggleActionListener.class)}), @ComponentConfig(id = "UIPageEditor", template = "app:/groovy/portal/webui/portal/UIPortalComposer.gtmpl", events = { @EventConfig(name = "ViewProperties", listeners = UIPortalComposer.ViewProperties2ActionListener.class), + @EventConfig(listeners = UIPortalComposer.CloseComposerActionListener.class), @EventConfig(name = "Abort", listeners = UIPortalComposer.Abort2ActionListener.class), @EventConfig(name = "Finish", listeners = UIPortalComposer.Finish2ActionListener.class), @EventConfig(name = "Back", listeners = UIPortalComposer.BackActionListener.class), @@ -95,7 +98,7 @@ UITabPane uiTabPane = addChild(UITabPane.class, "UIPortalComposerTab", null); uiTabPane.addChild(UIApplicationList.class, null, null).setRendered(true); uiTabPane.addChild(UIContainerList.class, null, null); - uiTabPane.setSelectedTab(1); + uiTabPane.setSelectedTab(1); } public int getPortalMode() @@ -619,6 +622,27 @@ event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); } } + + static public class CloseComposerActionListener extends EventListener<UIPortalComposer> + { + public void execute(Event<UIPortalComposer> event) throws Exception + { + UIPortalComposer uiPortalComposer = event.getSource(); + UIEditInlineWorkspace uiEditInlineWorkspace = uiPortalComposer.getAncestorOfType(UIEditInlineWorkspace.class); + if (uiPortalComposer.isEditted()) + { + ResourceBundle resourceBundle = event.getRequestContext().getApplicationResourceBundle(); + String closeMessage = resourceBundle.getString("UIEditInlineWorkspace.confirm.close"); + + uiEditInlineWorkspace.showConfirmWindow(closeMessage); + } + else + { + Event<UIComponent> abortEvent = uiPortalComposer.createEvent("Abort", event.getExecutionPhase(), event.getRequestContext()); + abortEvent.broadcast(); + } + } + } static public class Abort2ActionListener extends EventListener<UIPortalComposer> { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -171,8 +171,13 @@ LocaleConfigService localeConfigService = getApplicationComponent(LocaleConfigService.class); LocaleConfig localeConfig = localeConfigService.getLocaleConfig(editPortal.getLocale()); - this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox> getChildById(FIELD_LOCALE).setValue( - localeConfig.getLanguage()); + String lang = localeConfig.getLanguage(); + if (localeConfig.getLocale().getCountry() != null && localeConfig.getLocale().getCountry().length() > 0) + { + lang += "_" + localeConfig.getLocale().getCountry(); + } + + this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox> getChildById(FIELD_LOCALE).setValue(lang); setActions(new String[]{"Save", "Close"}); } @@ -187,7 +192,6 @@ private void createDefaultItem() throws Exception { - UIPortal uiPortal = Util.getUIPortal(); LocaleConfigService localeConfigService = getApplicationComponent(LocaleConfigService.class); Collection<?> listLocaleConfig = localeConfigService.getLocalConfigs(); LocaleConfig defaultLocale = localeConfigService.getDefaultLocaleConfig(); @@ -198,28 +202,27 @@ { LocaleConfig localeConfig = (LocaleConfig)iterator.next(); ResourceBundle localeResourceBundle = getResourceBundle(currentLocale); - - String key = "Locale." + localeConfig.getLocale().getLanguage(); - if (localeConfig.getLocale().getCountry() != null) + Locale local = localeConfig.getLocale(); + String lang = local.getLanguage(); + if (local.getCountry() != null && local.getCountry().length() > 0) { - key += "_" + localeConfig.getLocale().getCountry(); + lang += "_" + local.getCountry(); } String displayName = null; try { + String key = "Locale." + lang; String translation = localeResourceBundle.getString(key); displayName = translation; } catch (MissingResourceException e) { - displayName = capitalizeFirstLetter(localeConfig.getLocale().getDisplayName(currentLocale));; + displayName = capitalizeFirstLetter(local.getDisplayName(currentLocale));; } - SelectItemOption<String> option = - new SelectItemOption<String>(displayName, localeConfig - .getLanguage()); - if (defaultLanguage.equals(localeConfig.getLanguage())) + SelectItemOption<String> option = new SelectItemOption<String>(displayName, lang); + if (defaultLanguage.equals(lang)) { option.setSelected(true); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIEditInlineWorkspace.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -19,19 +19,29 @@ package org.exoplatform.portal.webui.workspace; +import java.util.ArrayList; +import java.util.List; +import java.util.ResourceBundle; + import org.exoplatform.portal.webui.portal.UIPortalComposer; +import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.core.UIConfirmation; import org.exoplatform.webui.core.UIContainer; +import org.exoplatform.webui.core.UIConfirmation.ActionConfirm; import org.exoplatform.webui.core.lifecycle.UIContainerLifecycle; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; /** - * Created by The eXo Platform SAS - * Author : Tan Pham Dinh - * pdtanit(a)gmail.com - * Aug 27, 2009 + * Created by The eXo Platform SAS Author : Tan Pham Dinh pdtanit(a)gmail.com Aug + * 27, 2009 */ -@ComponentConfig(lifecycle = UIContainerLifecycle.class) +@ComponentConfig(lifecycle = UIContainerLifecycle.class, events = { + @EventConfig(listeners = UIEditInlineWorkspace.ConfirmCloseActionListener.class), + @EventConfig(listeners = UIEditInlineWorkspace.AbortCloseActionListener.class)}) public class UIEditInlineWorkspace extends UIContainer { @@ -39,6 +49,17 @@ { addChild(UIPortalComposer.class, null, null); addChild(UIPortalToolPanel.class, null, null); + + ResourceBundle resourceBundle = WebuiRequestContext.getCurrentInstance().getApplicationResourceBundle(); + String yes = resourceBundle.getString("UIEditInlineWorkspace.confirm.yes"); + String no = resourceBundle.getString("UIEditInlineWorkspace.confirm.no"); + + List<ActionConfirm> actionConfirms = new ArrayList<ActionConfirm>(); + actionConfirms.add(new ActionConfirm("ConfirmClose", yes)); + actionConfirms.add(new ActionConfirm("AbortClose", no)); + UIConfirmation uiConfirmation = addChild(UIConfirmation.class, null, null); + uiConfirmation.setCaller(this); + uiConfirmation.setActions(actionConfirms); } public void setUIComponent(UIComponent uiComp) @@ -55,4 +76,41 @@ { return getChild(UIPortalComposer.class); } + + public void showConfirmWindow(String message) + { + UIConfirmation uiConfirmation = getChild(UIConfirmation.class); + uiConfirmation.setMessage(message); + ((WebuiRequestContext)WebuiRequestContext.getCurrentInstance()).addUIComponentToUpdateByAjax(uiConfirmation); + } + + static public class ConfirmCloseActionListener extends EventListener<UIEditInlineWorkspace> + { + + @Override + public void execute(Event<UIEditInlineWorkspace> event) throws Exception + { + UIEditInlineWorkspace uiEditInlineWorkspace = event.getSource(); + + UIConfirmation uiConfirmation = uiEditInlineWorkspace.getChild(UIConfirmation.class); + uiConfirmation.createEvent("Close", event.getExecutionPhase(), event.getRequestContext()).broadcast(); + + UIPortalComposer uiPortalComposer = uiEditInlineWorkspace.getChild(UIPortalComposer.class); + Event<UIComponent> abortEvent = + uiPortalComposer.createEvent("Abort", event.getExecutionPhase(), event.getRequestContext()); + abortEvent.broadcast(); + } + } + + static public class AbortCloseActionListener extends EventListener<UIEditInlineWorkspace> + { + + @Override + public void execute(Event<UIEditInlineWorkspace> event) throws Exception + { + UIEditInlineWorkspace uiEditInlineWorkspace = event.getSource(); + UIConfirmation uiConfirmation = uiEditInlineWorkspace.getChild(UIConfirmation.class); + uiConfirmation.createEvent("Close", event.getExecutionPhase(), event.getRequestContext()).broadcast(); + } + } } Modified: portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java =================================================================== --- portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-09-22 02:20:40 UTC (rev 4300) +++ portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-09-22 03:54:57 UTC (rev 4301) @@ -107,6 +107,9 @@ { try { + //Needed to localize title via predefined I18n key javax.portlet.title + res.setTitle(getTitle(req)); + getPortletApplication().render(req, res); } catch (Exception ex)

14 years, 3 months

1
0
0 / 0

gatein SVN: r4300 - portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: vuthelinh Date: 2010-09-21 22:20:40 -0400 (Tue, 21 Sep 2010) New Revision: 4300 Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java Log: resolve Selegen - 23 and 24 Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-09-22 01:05:10 UTC (rev 4299) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-09-22 02:20:40 UTC (rev 4300) @@ -374,6 +374,11 @@ sb.append("(\""); sb.append(param2); sb.append("\"));\n"); + } else if (param1.equals("verifyVisible")) { + sb.append("TestCase.assertTrue(selenium.isVisible"); + sb.append("(\""); + sb.append(param2); + sb.append("\"));\n"); } else if (param1.equals("verifyChecked")) { sb.append("verifyTrue(selenium.isChecked"); sb.append("(\""); @@ -456,6 +461,8 @@ sb.append("selenium.waitForPageToLoad(timeout);\n"); } else if (param1.equals("storeAttribute")) { sb.append("String ").append(param3).append(" = ").append("selenium.getAttribute(\"").append(param2).append("\");\n"); + } else if (param1.equals("storeElementPositionTop")) { + sb.append("String ").append(param3).append(" = ").append("selenium.getElementPositionTop(\"").append(param2).append("\");\n"); } else if (param1.equals("verifyElementPositionTop")) { sb.append("verifyEquals(").append("\"").append(param3).append("\", ").append("selenium.getElementPositionTop(\"").append(param2).append("\"));\n"); } else if (param1.equals("echo")) {

14 years, 3 months

1
0
0 / 0

gatein SVN: r4299 - epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-09-21 21:05:10 -0400 (Tue, 21 Sep 2010) New Revision: 4299 Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml Log: JBEPP-377: Updated JIRA descriptions, added new Fixed Issues and removed Doc Notes Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml 2010-09-21 16:12:02 UTC (rev 4298) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml 2010-09-22 01:05:10 UTC (rev 4299) @@ -44,7 +44,7 @@ JBoss Enterprise Application Platform </entry> <entry> - 5.0.1 GA + 5.0.1-GA </entry> </row> <row> @@ -60,7 +60,7 @@ GateIn Common </entry> <entry> - 2.0.2 + 2.0.2-GA </entry> </row> <row> @@ -68,7 +68,7 @@ GateIn WCI </entry> <entry> - 2.0.1 + 2.0.1-GA </entry> </row> <row> @@ -76,7 +76,7 @@ GateIn PC </entry> <entry> - 2.1.1 + 2.1.1-GA </entry> </row> <row> @@ -84,7 +84,7 @@ GateIn WSRP </entry> <entry> - 1.1.1 + 1.1.1-GA </entry> </row> <row> @@ -92,7 +92,7 @@ GateIn MOP </entry> <entry> - 1.0.2 + 1.0.2-GA </entry> </row> <row> @@ -113,18 +113,18 @@ </row> <row> <entry> - eXoplatform JCR + eXo JCR </entry> <entry> - 1.12.3 + 1.12.3-GA </entry> </row> <row> <entry> - eXoplatform Kernel + eXo Kernel </entry> <entry> - 2.2.1-GA + 2.2.3-GA </entry> </row> <row> @@ -132,7 +132,7 @@ Portlet Bridge </entry> <entry> - 2.0 + 2.0.0 </entry> </row> <row> @@ -170,6 +170,7 @@ <title> Issues fixed in this release </title> + <para> Following is a list of issues fixed in this release: </para> @@ -188,30 +189,39 @@ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-452"></ulink></term> <listitem> <para> - &PRODUCT;'s <literal>request.getLocale()</literal> only reflected a user's <emphasis>browser</emphasis> language preference, regardless of what language was set in the portal itself. + &PRODUCT;'s <literal>request.getLocale()</literal> was only reflecting a user's browser language preference, regardless of what language was set in the portal itself. </para> <para> - A <literal>LocalizationFilter</literal> to wrap <literal>HttpServletRequest</literal> and override <literal>getLocale()</literal> / <literal>getLocales()</literal> and return values that are in sync with the rest of the portal was installed to address this issue. + A fix was installed to address this issue and return values that are aligned with the rest of the portal. </para> <para> - As a result, portlets use the preferred locale of a user and not the locale from the http servlet request. + As a result, portlets use the preferred locale of the portal user and not the locale from the http servlet request. </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> </listitem> </varlistentry> <varlistentry> <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-403"></ulink></term> <listitem> <para> - The <literal>LocalizationFilter</literal> fix implemented for <ulink type="http" url="https://jira.jboss.org/browse/JBEPP-452"></ulink> also corrected an issue wherein a failed login attempt would present the login form in an incorrect language (that is; not the language set for the portal). + The language fix implemented for <ulink type="http" url="https://jira.jboss.org/browse/JBEPP-452"></ulink> also corrected an issue wherein a failed login attempt would present the login form in an incorrect language (that is; not the language set for the portal). </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> </listitem> </varlistentry> <varlistentry> <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-383"></ulink></term> <listitem> <para> - The <literal>LocalizationFilter</literal> fix also corrected an issue which caused language settings for languages with country variants (such as Chinese - China and Chinese - Taiwan) were not stored between logins. + The language fix also corrected an issue which caused language settings for languages with country variants (such as Chinese - China and Chinese - Taiwan) were not stored between logins. </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> </listitem> </varlistentry> <varlistentry> @@ -223,6 +233,9 @@ <para> This error was resolved with a patch to Apache Shindig which allows a reset of the input stream before the <literal>doPost</literal> method is invoked. </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> </listitem> </varlistentry> <varlistentry> @@ -248,13 +261,13 @@ </listitem> </varlistentry> <varlistentry> - <term><ulink type="http" url="https://jira.jboss.org/browse/GTNPORTAL-1309"></ulink></term> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-477"></ulink></term> <listitem> <para> The updated PicketLink IDM component removes case-sensitivity from the username field of the portal login page. </para> <para> - This allows users whose login names contain capital latters to authenticate successfully, regardless of the case used in the username field of the login form. + This allows users whose login names contain capital letters to authenticate successfully, regardless of the case used in the username field of the login form. </para> <para> Note that the password field remains case-sensitive for security. @@ -265,7 +278,7 @@ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-368"></ulink></term> <listitem> <para> - The datasource defined in <filename>jboss-epp-5.0/jboss-as/docs/examples/portal/gatein-sample-portal-ds.xml</filename> has been updated from <literal>local-tx-datasourc</literal> to <literal>no-tx-datasource</literal>. + The datasource defined in <filename>jboss-epp-5.0/jboss-as/docs/examples/portal/gatein-sample-portal-ds.xml</filename> has been updated from <literal>local-tx-datasource</literal> to <literal>no-tx-datasource</literal>. </para> <para> This update prevents exceptions being thrown by the JCR when the name of the datasource in <filename>server/default/deploy/gatein-ds.xml</filename> is changed to suit operational requirements. @@ -287,27 +300,59 @@ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-192"></ulink></term> <listitem> <para> - There is not enough information in this (or the associated JIRAs) for me to draft a description. Please assist. + When changing a portlet title it was possible to exploit an XSS vulnerability. A fix has been applied to encode the content before rendering. </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> </listitem> </varlistentry> <varlistentry> <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-167"></ulink></term> <listitem> <para> - A bug in the IBM JDK (1.5) would prevent the <literal>HAPartition</literal> service from starting. This, in turn, prevented JBoss AS from starting correctly when using the <literal>all</literal> configuration. The HAPartition would return the following error: + A bug in the IBM JDK (1.5) prevented &PRODUCT; from starting correctly when using the <literal>default</literal> configuration profile. </para> -<screen>ERROR [AbstractKernelController] Error installing to Start: name=HAPartition state=Create -org.jboss.cache.config.ConfigurationException: Unable to build interceptor chain -</screen> <para> This release includes a copy of the <filename>jcip-annotations.jar</filename> in the <filename>/server/default/lib</filename> directory as a workaround. </para> - <para> - This file is needed to avoid the above exception and may be removed in a later release. - </para> </listitem> </varlistentry> + <varlistentry> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-448"></ulink></term> + <listitem> + <para> + Users and group management replication was not successful in a clustered environment, producing the following exception: + </para> +<programlisting language="Java">java.io.NotSerializableException: Type TypeModel[name=org.exoplatform.commons.utils.LazyPageList] is not serializable + at org.exoplatform.commons.serialization.serial.ObjectWriter.write(ObjectWriter.java:209) + at org.exoplatform.commons.serialization.serial.ObjectWriter.write(ObjectWriter.java:82) + at org.exoplatform.commons.serialization.serial.ObjectWriter.replaceObject(ObjectWriter.java:238) +</programlisting> + <para> + The issue has been corrected in this release as the relevant classes have been made serializable. + </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-470"></ulink></term> + <listitem> + <para> + Adding a WSRP portlet to a category using the application registry was leading to the following exception: + </para> +<programlisting language="Java">ERROR [portal:UIPortalApplication] Error during the processAction phase +org.chromattic.api.UndeclaredRepositoryException: javax.jcr.RepositoryException: Illegal path entry: "app:": Illegal path entry: "app:": Illegal path entry: "app:"</programlisting> + <para> + This has been resolved with code that properly handles a 'slash' (/) in an application name. + </para> + <para> + Refer to the source commit logs in the above JIRA for specific code changes in this fix. + </para> + </listitem> + </varlistentry> </variablelist> </section> @@ -321,12 +366,6 @@ <para> <ulink type="http" url="https://jira.jboss.org/secure/IssueNavigator.jspa?mode=hide&requestId..."></ulink> </para> - <warning> - <title>DOC NOTE</title> - <para> - Is this list appropriate to offer readers? It points to a JIRA filter for all Open/Unresolved bugs attached to EPP 5.0.1 (so it doesn't catch related JIRAs for GTN or PLIDM etc, unless they're cloned to JBEPP). - </para> - </warning> </section> <!-- <section> @@ -407,7 +446,7 @@ <section> <title>Site Publisher</title> <para> - &PRODUCT; 5.1 will include an optional web content authoring system add on called Site Publisher. A technical preview of this add on is available for download from the <ulink type="http" url="https://support.redhat.com/jbossnetwork/restricted/softwareDetail.html?so...">Red Hat Customer Support Portal</ulink>. + &PRODUCT; 5.1 will include an optional web content authoring system add-on called Site Publisher. A technical preview is available for download from the <ulink type="http" url="https://support.redhat.com/jbossnetwork/restricted/softwareDetail.html?so...">Red Hat Customer Support Portal</ulink>. </para> <para> Site Publisher provides many additional features for organizations looking to enable line of business resources to directly manage sites, pages and content within the context of the portal versus through integration with an external web content management system. Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml 2010-09-21 16:12:02 UTC (rev 4298) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml 2010-09-22 01:05:10 UTC (rev 4299) @@ -5,7 +5,7 @@ <title>5.0.1 Release Notes</title> <subtitle>For use with JBoss Enterprise Portal Platform 5.0.1</subtitle> <edition>1.0</edition> - <pubsnumber>1.2</pubsnumber> + <pubsnumber>1.3</pubsnumber> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.0</productnumber> <abstract> Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml 2010-09-21 16:12:02 UTC (rev 4298) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml 2010-09-22 01:05:10 UTC (rev 4299) @@ -6,6 +6,20 @@ <simpara> <revhistory> <revision> + <revnumber>1.3</revnumber> + <date>Wed Sep 22 2010</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Refined JIRA descriptions and added new JIRA links.</member> + </simplelist> + </revdescription> + </revision> + <revision> <revnumber>1.2</revnumber> <date>Mon Sep 20 2010</date> <author>

14 years, 3 months

1
0
0 / 0

gatein SVN: r4298 - portal/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 12:12:02 -0400 (Tue, 21 Sep 2010) New Revision: 4298 Modified: portal/trunk/pom.xml Log: GTNPORTAL-1490 : Update dependencies to wci 2.0.2-GA and pc 2.2.0-Beta03 Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) +++ portal/trunk/pom.xml 2010-09-21 16:12:02 UTC (rev 4298) @@ -45,8 +45,8 @@ <org.shindig.version>1.0-r790473-Patch02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> - <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version> - <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version> + <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> + <org.gatein.pc.version>2.2.0-Beta03</org.gatein.pc.version> <org.picketlink.idm>1.1.5.GA</org.picketlink.idm> <org.gatein.wsrp.version>2.0.0-Alpha01</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>

14 years, 3 months

1
0
0 / 0

gatein SVN: r4297 - in components/wci/branches/adf: test/servers and 50 other directories.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2010-09-21 11:50:14 -0400 (Tue, 21 Sep 2010) New Revision: 4297 Added: components/wci/branches/adf/test/servers/tomcat7/ components/wci/branches/adf/test/servers/tomcat7/pom.xml components/wci/branches/adf/test/servers/tomcat7/src/ components/wci/branches/adf/test/servers/tomcat7/src/assembly/ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/ components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml components/wci/branches/adf/test/servers/tomcat7/src/test/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml components/wci/branches/adf/tomcat6/ components/wci/branches/adf/tomcat7/ components/wci/branches/adf/tomcat7/pom.xml components/wci/branches/adf/tomcat7/src/ components/wci/branches/adf/tomcat7/src/main/ components/wci/branches/adf/tomcat7/src/main/java/ components/wci/branches/adf/tomcat7/src/main/java/org/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java Removed: components/wci/branches/adf/tomcat/ Modified: components/wci/branches/adf/pom.xml components/wci/branches/adf/test/servers/jboss42/pom.xml components/wci/branches/adf/test/servers/jboss51/pom.xml components/wci/branches/adf/test/servers/jetty6/pom.xml components/wci/branches/adf/test/servers/pom.xml components/wci/branches/adf/test/servers/tomcat6/pom.xml components/wci/branches/adf/test/src/test/build.xml components/wci/branches/adf/test/src/test/resources/config/servers.xml components/wci/branches/adf/tomcat6/pom.xml Log: Tomcat 7 native support & integration tests Modified: components/wci/branches/adf/pom.xml =================================================================== --- components/wci/branches/adf/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -32,7 +32,7 @@ <version.discovery>0.4</version.discovery>  <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> </properties> @@ -70,9 +70,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 +131,8 @@ <modules> <module>wci</module> <module>exo</module> - <module>tomcat</module> + <module>tomcat6</module> + <module>tomcat7</module> <module>jetty</module> <module>test</module> </modules> Modified: components/wci/branches/adf/test/servers/jboss42/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss42/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jboss42/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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>  <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/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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>  <dependency> @@ -163,6 +181,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> @@ -234,11 +259,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,7 +320,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/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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-Alpha01</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>  <dependency> @@ -181,6 +199,13 @@ <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </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/branches/adf/test/servers/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat6/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/servers/tomcat6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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>  <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> @@ -298,7 +332,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}" /> Copied: components/wci/branches/adf/test/servers/tomcat7/pom.xml (from rev 4269, components/wci/branches/adf/test/servers/tomcat6/pom.xml) =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/pom.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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</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> +  + <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> +  + <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> +  + <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> +  + <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> + +  + <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" /> + +  +  + <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> +  + +  + <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}" /> + +  + <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}" /> + +  + <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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/assembly/spi-native-server.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> +  + <include>org.gatein.common:common-mc</include> +  + <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> +  + <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> +  + <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/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/integration-tests/build.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<project name="tomcat-integration-test" default="tests"> + + <import file="${common.xml.file}"/> + +  + <property environment="env"/> + <property name="test.cargo.home" value="${env.TOMCAT_7_0_HOME}"/> + + +  + <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"/> + +  + + <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"/> + +  + <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/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/remote-jboss-unit.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/server/tomcat-users.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,3 @@ +<tomcat-users> + <user name="manager" password="manager" roles="manager-script"/> +</tomcat-users> Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/config/servers.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,67 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/META-INF/context.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/branches/adf/test/servers/tomcat7/src/test/resources/support/native/server-war/WEB-INF/web.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,58 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <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> + + <welcome-file-list> + <welcome-file/> + </welcome-file-list> +</web-app> Modified: components/wci/branches/adf/test/src/test/build.xml =================================================================== --- components/wci/branches/adf/test/src/test/build.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/src/test/build.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -45,6 +45,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 +119,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 +171,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 +180,9 @@ <not> <isset property="TOMCAT_6_0_HOME"/> </not> + <not> + <isset property="TOMCAT_7_0_HOME"/> + </not> </and> </condition> </fail> @@ -276,6 +290,28 @@ <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,83 @@ <fileset dir="${target}/test-classes/spi/exo/app-war"/> </jar> +  +  +  + <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> +  +  +  + + <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> + +  +  +  + +  + <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> + +  +  +  + +  + <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> + + + +    @@ -596,6 +707,36 @@ <lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/> </war> +  +  +  + + <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> +    @@ -1084,6 +1225,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"> +  + <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> + +  + + <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/branches/adf/test/src/test/resources/config/servers.xml =================================================================== --- components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-21 15:30:51 UTC (rev 4296) +++ components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -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> Copied: components/wci/branches/adf/tomcat6 (from rev 4269, components/wci/branches/adf/tomcat) Modified: components/wci/branches/adf/tomcat6/pom.xml =================================================================== --- components/wci/branches/adf/tomcat/pom.xml 2010-09-21 07:58:08 UTC (rev 4269) +++ components/wci/branches/adf/tomcat6/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -5,9 +5,9 @@ <version>2.1.0-Alpha01</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> Added: components/wci/branches/adf/tomcat7/pom.xml =================================================================== --- components/wci/branches/adf/tomcat7/pom.xml (rev 0) +++ components/wci/branches/adf/tomcat7/pom.xml 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,30 @@ +<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</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> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + +</project> Added: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7LifecycleListener.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -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/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -0,0 +1,307 @@ +/****************************************************************************** + * 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.command.CommandDispatcher; +import org.gatein.wci.impl.DefaultServletContainerFactory; +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 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/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java =================================================================== --- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java (rev 0) +++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java 2010-09-21 15:50:14 UTC (rev 4297) @@ -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; + } +}

14 years, 3 months

1
0
0 / 0

gatein SVN: r4296 - portal/branches/navcontroller.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 11:30:51 -0400 (Tue, 21 Sep 2010) New Revision: 4296 Modified: portal/branches/navcontroller/pom.xml Log: update dependencies to wci 2.0.2 and pc 2.2.0-Beta03 Modified: portal/branches/navcontroller/pom.xml =================================================================== --- portal/branches/navcontroller/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) +++ portal/branches/navcontroller/pom.xml 2010-09-21 15:30:51 UTC (rev 4296) @@ -45,8 +45,8 @@ <org.shindig.version>1.0-r790473-Patch02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> - <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version> - <org.gatein.pc.version>2.2.0-Beta02</org.gatein.pc.version> + <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> + <org.gatein.pc.version>2.2.0-Beta03</org.gatein.pc.version> <org.picketlink.idm>1.1.5.CR01</org.picketlink.idm> <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>

14 years, 3 months

1
0
0 / 0

gatein SVN: r4295 - in components/pc/trunk: api and 12 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 09:22:22 -0400 (Tue, 21 Sep 2010) New Revision: 4295 Modified: components/pc/trunk/api/pom.xml components/pc/trunk/bridge/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/docs/pom.xml components/pc/trunk/docs/user-guide/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/jsr168api/pom.xml components/pc/trunk/management/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/samples/pom.xml components/pc/trunk/test/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/pc/trunk/api/pom.xml =================================================================== --- components/pc/trunk/api/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/api/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/bridge/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-bridge</artifactId> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/controller/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-controller</artifactId> Modified: components/pc/trunk/docs/pom.xml =================================================================== --- components/pc/trunk/docs/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/docs/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -3,7 +3,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> Modified: components/pc/trunk/docs/user-guide/pom.xml =================================================================== --- components/pc/trunk/docs/user-guide/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/docs/user-guide/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <groupId>org.gatein.pc</groupId> <artifactId>user-guide-${translation}</artifactId> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/federation/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-federation</artifactId> Modified: components/pc/trunk/jsr168api/pom.xml =================================================================== --- components/pc/trunk/jsr168api/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/jsr168api/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-jsr168api</artifactId> Modified: components/pc/trunk/management/pom.xml =================================================================== --- components/pc/trunk/management/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/management/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-management</artifactId> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/mc/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-mc</artifactId> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -29,7 +29,7 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -39,9 +39,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Be...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Beta03</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.2.0-Beta03</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url> </scm> <properties> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/portal/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portal</artifactId> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/portlet/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portlet</artifactId> Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/samples/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-samples</artifactId> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2010-09-21 13:21:53 UTC (rev 4294) +++ components/pc/trunk/test/pom.xml 2010-09-21 13:22:22 UTC (rev 4295) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03</version> + <version>2.2.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-test</artifactId>

14 years, 3 months

1
0
0 / 0

gatein SVN: r4294 - components/pc/tags.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 09:21:53 -0400 (Tue, 21 Sep 2010) New Revision: 4294 Added: components/pc/tags/2.2.0-Beta03/ Log: [maven-scm] copy for tag 2.2.0-Beta03 Copied: components/pc/tags/2.2.0-Beta03 (from rev 4293, components/pc/trunk)

14 years, 3 months

1
0
0 / 0

gatein SVN: r4293 - in components/pc/trunk: api and 12 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 09:21:28 -0400 (Tue, 21 Sep 2010) New Revision: 4293 Modified: components/pc/trunk/api/pom.xml components/pc/trunk/bridge/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/docs/pom.xml components/pc/trunk/docs/user-guide/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/jsr168api/pom.xml components/pc/trunk/management/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/samples/pom.xml components/pc/trunk/test/pom.xml Log: [maven-release-plugin] prepare release 2.2.0-Beta03 Modified: components/pc/trunk/api/pom.xml =================================================================== --- components/pc/trunk/api/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/api/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/bridge/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-bridge</artifactId> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/controller/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-controller</artifactId> Modified: components/pc/trunk/docs/pom.xml =================================================================== --- components/pc/trunk/docs/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/docs/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -3,7 +3,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> Modified: components/pc/trunk/docs/user-guide/pom.xml =================================================================== --- components/pc/trunk/docs/user-guide/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/docs/user-guide/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <groupId>org.gatein.pc</groupId> <artifactId>user-guide-${translation}</artifactId> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/federation/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-federation</artifactId> Modified: components/pc/trunk/jsr168api/pom.xml =================================================================== --- components/pc/trunk/jsr168api/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/jsr168api/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-jsr168api</artifactId> Modified: components/pc/trunk/management/pom.xml =================================================================== --- components/pc/trunk/management/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/management/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-management</artifactId> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/mc/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-mc</artifactId> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -29,7 +29,7 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> <packaging>pom</packaging> <parent> @@ -39,9 +39,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Be...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Beta03</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.2.0-Beta03</url> </scm> <properties> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/portal/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portal</artifactId> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/portlet/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portlet</artifactId> Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/samples/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-samples</artifactId> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) +++ components/pc/trunk/test/pom.xml 2010-09-21 13:21:28 UTC (rev 4293) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.2.0-Beta03-SNAPSHOT</version> + <version>2.2.0-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-test</artifactId>

14 years, 3 months

1
0
0 / 0

gatein SVN: r4292 - components/pc/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-09-21 09:14:47 -0400 (Tue, 21 Sep 2010) New Revision: 4292 Modified: components/pc/trunk/pom.xml Log: update pc wci version to 2.0.2-GA to harmonize dependencies Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2010-09-21 12:48:31 UTC (rev 4291) +++ components/pc/trunk/pom.xml 2010-09-21 13:14:47 UTC (rev 4292) @@ -46,7 +46,7 @@ <properties> <version.gatein.common>2.0.3-GA</version.gatein.common> - <version.gatein.wci>2.0.1-GA</version.gatein.wci> + <version.gatein.wci>2.0.2-GA</version.gatein.wci> <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>

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits September 2010