November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r5390 - portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-30 16:12:07 -0500 (Tue, 30 Nov 2010) New Revision: 5390 Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProviderFilter.java Log: rennable this code I commented before Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java 2010-11-30 20:49:57 UTC (rev 5389) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java 2010-11-30 21:12:07 UTC (rev 5390) @@ -24,6 +24,8 @@ import org.exoplatform.web.url.ResourceLocator; import org.exoplatform.web.url.ResourceType; +import java.util.Locale; + /** * @author <a href="trongtt(a)gmail.com">Trong Tran</a> * @version $Revision$ @@ -35,11 +37,14 @@ private ControllerContext controllerContext; private LocatorProvider locatorProvider; + + private Locale requestLocale; - public PortalURLProvider(ControllerContext controllerCtx, LocatorProvider locatorService) + public PortalURLProvider(ControllerContext controllerCtx, LocatorProvider locatorService, Locale requestLocale) { this.controllerContext = controllerCtx; this.locatorProvider = locatorService; + this.requestLocale = requestLocale; } public static void setCurrentPortalURLProvider(PortalURLProvider provider) @@ -57,9 +62,8 @@ PortalURLProvider portalURLProvider = currentProvider.get(); if (portalURLProvider != null) { -// L newLocator = locatorProvider.newLocator(resourceType); -// return new PortalURL<R, L>(controllerContext, newLocator, false, siteType, siteName, access); - throw new UnsupportedOperationException("is it used ?"); + L newLocator = locatorProvider.newLocator(resourceType); + return new PortalURL<R, L>(controllerContext, newLocator, false, requestLocale, siteType, siteName, access); } return null; } Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProviderFilter.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProviderFilter.java 2010-11-30 20:49:57 UTC (rev 5389) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProviderFilter.java 2010-11-30 21:12:07 UTC (rev 5390) @@ -56,7 +56,7 @@ try { ControllerContext controllerCtx = new ControllerContext(webAppController, httpRequest, httpResponse, null); - PortalURLProvider urlProvider = new PortalURLProvider(controllerCtx, locatorProvider); + PortalURLProvider urlProvider = new PortalURLProvider(controllerCtx, locatorProvider, null); PortalURLProvider.setCurrentPortalURLProvider(urlProvider); chain.doFilter(httpRequest, httpResponse); }

13 years, 5 months

1
0
0 / 0

gatein SVN: r5389 - in portal/branches/navcontroller: component/web/controller/src/main/java/org/exoplatform/web/url and 4 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-30 15:49:57 -0500 (Tue, 30 Nov 2010) New Revision: 5389 Modified: portal/branches/navcontroller/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/url/ControllerURL.java portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java Log: start to implement language in URL Modified: portal/branches/navcontroller/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java =================================================================== --- portal/branches/navcontroller/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -38,6 +38,7 @@ private Locale userProfileLocale; private String remoteUser; private Locale portalLocale; + private Locale requestLocale; /** * Setter for supportedLocales @@ -148,6 +149,24 @@ } /** + * Getter for requestLocale + * @return requestLocale + */ + public Locale getRequestLocale() + { + return requestLocale; + } + + /** + * Setter for requestLocale + * @param requestLocale default locale configured for the request + */ + public void setRequestLocale(Locale requestLocale) + { + this.requestLocale = requestLocale; + } + + /** * Helper method that returns the locale only if it's supported by portal. * Otherwise it returns null. * Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/url/ControllerURL.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/url/ControllerURL.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/url/ControllerURL.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -21,6 +21,7 @@ import org.gatein.common.util.ParameterMap; +import java.util.Locale; import java.util.Map; /** @@ -50,14 +51,18 @@ /** . */ protected MimeType mimeType; + /** . */ + private Locale locale; + /** * Create a resource URL instance. * * @param locator the resource locator that can't be null * @param ajax the ajax mode + * @param locale the locale * @throws NullPointerException if the resource locator is null */ - public ControllerURL(L locator, Boolean ajax) throws NullPointerException + public ControllerURL(L locator, Boolean ajax, Locale locale) throws NullPointerException { if (locator == null) { @@ -67,6 +72,7 @@ // this.locator = locator; this.ajax = ajax; + this.locale = locale; this.confirm = null; this.queryParams = null; this.mimeType = null; @@ -170,6 +176,16 @@ this.mimeType = mimeType; } + public Locale getLocale() + { + return locale; + } + + public void setLocale(Locale locale) + { + this.locale = locale; + } + public Map<String, String[]> getQueryParameters() { if (queryParams == null) Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-30 20:49:57 UTC (rev 5389) @@ -13,29 +13,35 @@ <request-param qname="gtn:action" name="portal:action" required="false"/> <request-param qname="gtn:objectid" name="objectId" required="false"/> +  +  - <route path="/public/{gtn:sitename}{gtn:path}"> + <route path="/{gtn:lang}public/{gtn:sitename}{gtn:path}"> + <path-param qname="gtn:lang" pattern="([A-Za-z]{2}/)?" encoding="preserve-path"/> <route-param qname="gtn:access" value="public"/> <route-param qname="gtn:sitetype" value="portal"/> <path-param qname="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  - <route path="/private/{gtn:sitename}{gtn:path}"> + <route path="/{gtn:lang}private/{gtn:sitename}{gtn:path}"> + <path-param qname="gtn:lang" pattern="([A-Za-z]{2}/)?" encoding="preserve-path"/> <route-param qname="gtn:access" value="private"/> <route-param qname="gtn:sitetype" value="portal"/> <path-param qname="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  - <route path="/groups/{gtn:sitename}{gtn:path}"> + <route path="/{gtn:lang}groups/{gtn:sitename}{gtn:path}"> + <path-param qname="gtn:lang" pattern="([A-Za-z]{2}/)?" encoding="preserve-path"/> <route-param qname="gtn:access" value="private"/> <route-param qname="gtn:sitetype" value="group"/> <path-param qname="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  - <route path="/users/{gtn:sitename}{gtn:path}"> + <route path="/{gtn:lang}users/{gtn:sitename}{gtn:path}"> + <path-param qname="gtn:lang" pattern="([A-Za-z]{2}/)?" encoding="preserve-path"/> <route-param qname="gtn:access" value="private"/> <route-param qname="gtn:sitetype" value="user"/> <path-param qname="gtn:path" pattern=".*" encoding="preserve-path"/> Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -118,6 +118,9 @@ /** The site name decoded from the request. */ private final String siteName; + /** The locale from the request. */ + private final Locale requestLocale; + /** . */ private final HttpServletRequest request_; @@ -171,7 +174,8 @@ String requestSiteType, String requestSiteName, String requestPath, - String access) throws Exception + String access, + Locale requestLocale) throws Exception { super(app); @@ -242,6 +246,7 @@ this.siteName = requestSiteName; this.nodePath_ = requestPath; this.access = access; + this.requestLocale = requestLocale; // portalURI = requestURI_.substring(0, requestURI_.lastIndexOf(nodePath_)) + "/"; Map<QualifiedName, String> tmp = new HashMap<QualifiedName, String>(); @@ -273,7 +278,7 @@ @Override public <R, L extends ResourceLocator<R>> ControllerURL<R, L> newURL(ResourceType<R, L> resourceType, L locator) { - return new PortalURL<R, L>(controllerContext, locator, false, siteType, siteName, access); + return new PortalURL<R, L>(controllerContext, locator, false, requestLocale, siteType, siteName, access); } public ControllerContext getControllerContext() @@ -332,6 +337,11 @@ return ((UIPortalApplication)uiApplication_).getOrientation(); } + public Locale getRequestLocale() + { + return requestLocale; + } + public void setLocale(Locale locale) { this.locale = locale; Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -34,6 +34,7 @@ import org.exoplatform.webui.core.UIApplication; import java.util.List; +import java.util.Locale; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -68,6 +69,9 @@ /** . */ public static final QualifiedName ACCESS = QualifiedName.create("gtn", "access"); + /** . */ + public static final QualifiedName LANG = QualifiedName.create("gtn", "lang"); + public String getHandlerName() { return "portal"; @@ -113,13 +117,25 @@ String requestSiteName = controllerContext.getParameter(REQUEST_SITE_NAME); String access = controllerContext.getParameter(ACCESS); + // + Locale requestLocale; + String lang = controllerContext.getParameter(LANG); + if (lang.length() == 0) + { + requestLocale = null; + } + else + { + requestLocale = new Locale(lang.substring(0, 2)); + } + if (requestSiteName == null) { res.sendRedirect(req.getContextPath()); return; } // PortalApplication app = controllerContext.getController().getApplication(PortalApplication.PORTAL_APPLICATION_ID); - PortalRequestContext context = new PortalRequestContext(app, controllerContext, requestSiteType, requestSiteName, requestPath, access); + PortalRequestContext context = new PortalRequestContext(app, controllerContext, requestSiteType, requestSiteName, requestPath, access, requestLocale); WebuiRequestContext.setCurrentInstance(context); UIApplication uiApp = app.getStateManager().restoreUIRootComponent(context); Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -45,6 +45,12 @@ */ public Locale determineLocale(LocaleContextInfo context) { + if (context.getRequestLocale() != null) + { + return context.getRequestLocale(); + } + + // Locale locale = null; if (context.getRemoteUser() == null) locale = getLocaleConfigForAnonymous(context); Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -144,6 +144,8 @@ Locale portalLocale = LocaleContextInfo.getLocale(portalLocaleName); localeCtx.setPortalLocale(portalLocale); + localeCtx.setRequestLocale(reqCtx.getRequestLocale()); + Locale locale = localePolicy.determineLocale(localeCtx); if (!supportedLocales.contains(locale)) { Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -27,6 +27,7 @@ import org.exoplatform.web.url.ResourceLocator; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -51,9 +52,16 @@ /** . */ private PortalURLRenderContext renderContext; - public PortalURL(ControllerContext requestContext, L locator, Boolean ajax, String siteType, String siteName, String access) + public PortalURL( + ControllerContext requestContext, + L locator, + Boolean ajax, + Locale locale, + String siteType, + String siteName, + String access) { - super(locator, ajax); + super(locator, ajax, locale); // if (requestContext == null) @@ -120,6 +128,19 @@ parameters.put(PortalRequestHandler.REQUEST_SITE_NAME, siteName); // + String lang; + Locale locale = getLocale(); + if (locale != null) + { + lang = locale.getLanguage() + "/"; + } + else + { + lang = ""; + } + parameters.put(PortalRequestHandler.LANG, lang); + + // for (QualifiedName parameterName : locator.getParameterNames()) { String parameterValue = locator.getParameterValue(parameterName); @@ -154,7 +175,6 @@ } // - String s = renderContext.toString(); - return s; + return renderContext.toString(); } } Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java 2010-11-30 18:14:32 UTC (rev 5388) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURLProvider.java 2010-11-30 20:49:57 UTC (rev 5389) @@ -57,8 +57,9 @@ PortalURLProvider portalURLProvider = currentProvider.get(); if (portalURLProvider != null) { - L newLocator = locatorProvider.newLocator(resourceType); - return new PortalURL<R, L>(controllerContext, newLocator, false, siteType, siteName, access); +// L newLocator = locatorProvider.newLocator(resourceType); +// return new PortalURL<R, L>(controllerContext, newLocator, false, siteType, siteName, access); + throw new UnsupportedOperationException("is it used ?"); } return null; }

13 years, 5 months

1
0
0 / 0

gatein SVN: r5388 - components/wsrp/trunk.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-30 13:14:32 -0500 (Tue, 30 Nov 2010) New Revision: 5388 Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh Log: - Use -DskipTests to skip tests but still build the needed artifacts instead of -Dmaven.test.skip=true which doesn't build the artifacts. Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh =================================================================== --- components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-11-30 16:14:14 UTC (rev 5387) +++ components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-11-30 18:14:32 UTC (rev 5388) @@ -64,7 +64,7 @@ echo \| =============== if [ $# -eq 1 ] then - mvn clean install '-Dmaven.test.skip=true' + mvn clean install -DskipTests else if [ $# -eq 2 ] then @@ -78,7 +78,7 @@ echo \| == to remove the GUI module echo -------------------------------------------------------------------------- cd admin-gui - mvn clean install -Dmaven.test.skip=true + mvn clean install -DskipTests war=wsrp-admin-gui echo Copying $war-$CURRENT_WSRP.war to $GATEIN_EAR_HOME/../$war.war cp $HOME/.m2/repository/org/gatein/wsrp/$war/$CURRENT_WSRP/$war-$CURRENT_WSRP.war $GATEIN_EAR_HOME/../$war.war

13 years, 5 months

1
0
0 / 0

gatein SVN: r5387 - in components/pc/branches/adf: portal and 3 other directories.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2010-11-30 11:14:14 -0500 (Tue, 30 Nov 2010) New Revision: 5387 Modified: components/pc/branches/adf/pom.xml components/pc/branches/adf/portal/pom.xml components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml components/pc/branches/adf/test/pom.xml components/pc/branches/adf/test/src/test/build.xml Log: Change wci & cargo version Modified: components/pc/branches/adf/pom.xml =================================================================== --- components/pc/branches/adf/pom.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/pom.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -46,14 +46,14 @@ <properties> <version.gatein.common>2.0.3-GA</version.gatein.common> - <version.gatein.wci>2.0.2-GA</version.gatein.wci> + <version.gatein.wci>2.1.0-Alpha01-SNAPSHOT</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>  <version.jboss.unit>1.2.3</version.jboss.unit> - <version.cargo>1.0.1-alpha-1</version.cargo> + <version.cargo>1.0.2</version.cargo> <preparationGoals>clean install</preparationGoals> </properties> @@ -130,7 +130,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> <version>${version.gatein.wci}</version> </dependency> Modified: components/pc/branches/adf/portal/pom.xml =================================================================== --- components/pc/branches/adf/portal/pom.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/portal/pom.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -28,7 +28,7 @@ <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> </dependency> <dependency> Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -19,7 +19,7 @@ <include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-log4j12</include> <include>org.gatein.wci:wci-wci</include> - <include>org.gatein.wci:wci-tomcat</include> + <include>org.gatein.wci:wci-tomcat6</include> <include>javax.portlet:portlet-api</include> <include>org.gatein.pc:pc-portlet</include> Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -19,7 +19,7 @@ <include>org.gatein.common:common-logging</include> <include>javax.portlet:portlet-api</include> <include>org.gatein.wci:wci-wci</include> - <include>org.gatein.wci:wci-tomcat</include> + <include>org.gatein.wci:wci-tomcat6</include> <include>org.gatein.pc:pc-portlet</include> <include>org.gatein.pc:pc-api</include> Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -17,7 +17,7 @@ <include>org.gatein.common:common-common</include> <include>org.gatein.common:common-logging</include> <include>org.gatein.wci:wci-wci</include> - <include>org.gatein.wci:wci-tomcat</include> + <include>org.gatein.wci:wci-tomcat6</include> <include>org.gatein.pc:pc-portlet</include> <include>org.gatein.pc:pc-api</include> Modified: components/pc/branches/adf/test/pom.xml =================================================================== --- components/pc/branches/adf/test/pom.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/test/pom.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -28,7 +28,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-tomcat6</artifactId> </dependency> <dependency> @@ -329,6 +329,21 @@ <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </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> <executions> @@ -360,7 +375,7 @@ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" /> + <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}" /> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}" /> Modified: components/pc/branches/adf/test/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/src/test/build.xml 2010-11-30 13:24:31 UTC (rev 5386) +++ components/pc/branches/adf/test/src/test/build.xml 2010-11-30 16:14:14 UTC (rev 5387) @@ -27,7 +27,7 @@ <antcall target="__evaluate_properties.all"/> <antcall target="tests.jboss"/> <antcall target="tests.tomcat"/> - +  </target> <target name="tests.call.single" if="tests"> @@ -612,6 +612,7 @@ <property name="cargo.logging" value="high"/> <property name="cargo.rmi.port" value="1099"/>  + <property name="cargo.jvmargs" value="-Duser.language=en"/> <deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/> </configuration> </cargo> @@ -734,7 +735,8 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.rmi.port" value="1099"/> - <property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/> +  + <property name="cargo.jvmargs" value="-Duser.language=en"/> <deployable type="war" file="${test.temp.lib}/jboss-5.1/portlet-test.war"/> <file file="${target}/test-classes/jboss-5.1/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/> </configuration> @@ -827,6 +829,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/>  + <property name="cargo.jvmargs" value="-Duser.language=en"/> <deployable type="war" file="${test.temp.lib}/manager.war"/> <file file="${test.temp.lib}/manager" todir="webapps/manager"/> <deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>

13 years, 5 months

1
0
0 / 0

gatein SVN: r5386 - in portal/branches/navcontroller/component/web/controller/src: test/java/org/exoplatform/web/controller/router and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-30 08:24:31 -0500 (Tue, 30 Nov 2010) New Revision: 5386 Added: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/ParamDescriptor.java Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/PathParamDescriptor.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RequestParamDescriptor.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPathParamEncoding.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortal.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java Log: a bit more DSLized Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -119,7 +119,7 @@ { String qualifiedName = reader.getAttributeValue(null, "qname"); String value = reader.getAttributeValue(null, "value"); - routeDesc.add(new RouteParamDescriptor(qualifiedName).withValue(value)); + routeDesc.with(new RouteParamDescriptor(qualifiedName).withValue(value)); } else if (requestParamQN.equals(reader.getName())) { @@ -127,7 +127,7 @@ String name = reader.getAttributeValue(null, "name"); String value = reader.getAttributeValue(null, "value"); String optional = reader.getAttributeValue(null, "required"); - routeDesc.add(new RequestParamDescriptor(qualifiedName).withName(name).withValue(value).required("true".equals(optional))); + routeDesc.with(new RequestParamDescriptor(qualifiedName).named(name).withValue(value).required("true".equals(optional))); } else if (pathParamQN.equals(reader.getName())) { @@ -135,7 +135,7 @@ String pattern = reader.getAttributeValue(null, "pattern"); String encoded = reader.getAttributeValue(null, "encoding"); EncodingMode encodingMode = "preserve-path".equals(encoded) ? EncodingMode.PRESERVE_PATH : EncodingMode.FORM; - routeDesc.add(new PathParamDescriptor(qualifiedName).withPattern(pattern).withEncodingMode(encodingMode)); + routeDesc.with(new PathParamDescriptor(qualifiedName).withPattern(pattern).withEncodingMode(encodingMode)); } else if (routeQN.equals(reader.getName())) { Added: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/ParamDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/ParamDescriptor.java (rev 0) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/ParamDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.controller.metadata; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ParamDescriptor +{ +} Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/PathParamDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/PathParamDescriptor.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/PathParamDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -26,7 +26,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class PathParamDescriptor +public class PathParamDescriptor extends ParamDescriptor { /** . */ Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RequestParamDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RequestParamDescriptor.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RequestParamDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -25,7 +25,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class RequestParamDescriptor +public class RequestParamDescriptor extends ParamDescriptor { /** . */ @@ -64,7 +64,7 @@ this.qualifiedName = QualifiedName.parse(qualifiedName); } - public RequestParamDescriptor withName(String name) + public RequestParamDescriptor named(String name) { this.name = name; return this; Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -20,7 +20,6 @@ package org.exoplatform.web.controller.metadata; import org.exoplatform.web.controller.QualifiedName; -import org.exoplatform.web.controller.router.EncodingMode; import java.util.ArrayList; import java.util.Collection; @@ -88,24 +87,37 @@ return routeParams.get(name); } - public RouteDescriptor add(RouteParamDescriptor routeParam) + public RouteDescriptor with(ParamDescriptor... params) { - routeParams.put(routeParam.getQualifiedName(), routeParam); + if (params == null) + { + throw new NullPointerException(); + } + for (ParamDescriptor param : params) + { + if (param == null) + { + throw new IllegalArgumentException(); + } + if (param instanceof RouteParamDescriptor) + { + RouteParamDescriptor routeParam = (RouteParamDescriptor)param; + routeParams.put(routeParam.getQualifiedName(), routeParam); + } + else if (param instanceof RequestParamDescriptor) + { + RequestParamDescriptor requestParam = (RequestParamDescriptor)param; + requestParams.put(requestParam.getName(), requestParam); + } + if (param instanceof PathParamDescriptor) + { + PathParamDescriptor pathParam = (PathParamDescriptor)param; + pathParams.put(pathParam.getQualifiedName(), pathParam); + } + } return this; } - public RouteDescriptor add(RequestParamDescriptor requestParam) - { - requestParams.put(requestParam.getName(), requestParam); - return this; - } - - public RouteDescriptor add(PathParamDescriptor pathParam) - { - pathParams.put(pathParam.getQualifiedName(), pathParam); - return this; - } - public Collection<RequestParamDescriptor> getRequestParams() { return requestParams.values(); @@ -126,7 +138,7 @@ return pathParams; } - public RouteDescriptor add(RouteDescriptor child) + public RouteDescriptor sub(RouteDescriptor child) { children.add(child); return this; Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -25,7 +25,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class RouteParamDescriptor +public class RouteParamDescriptor extends ParamDescriptor { /** . */ Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouterDescriptor.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -41,16 +41,25 @@ this.routes = new ArrayList<RouteDescriptor>(); } - public RouterDescriptor add(RouteDescriptor route) + public RouterDescriptor add(RouteDescriptor... routes) { - if (route == null) + if (routes == null) { throw new NullPointerException(); } // - routes.add(route); + for (RouteDescriptor route : routes) + { + if (route == null) + { + throw new IllegalArgumentException(); + } + // + this.routes.add(route); + } + // return this; } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -35,7 +35,7 @@ String[] paths = {"/",""}; for (String path : paths) { - Router router = new Router(router().add(route(path))); + Router router = router().add(route(path)).build(); Route expectedRoute = new Route(); assertEquals(expectedRoute, router.root); } @@ -46,7 +46,7 @@ String[] paths = {"/a","a"}; for (String path : paths) { - Router router = new Router(router().add(route(path))); + Router router = router().add(route(path)).build(); Route expectedRoute = new Route(); expectedRoute.add(new SegmentRoute("a")); assertEquals(expectedRoute, router.root); @@ -58,7 +58,7 @@ String[] paths = {"/{a}","{a}"}; for (String path : paths) { - Router router = new Router(router().add(route(path))); + Router router = router().add(route(path)).build(); // assertEquals(0, router.root.getSegmentNames().size()); @@ -80,7 +80,7 @@ String[] paths = {"/{q:a}","{q:a}"}; for (String path : paths) { - Router router = new Router(router().add(route(path))); + Router router = router().add(route(path)).build(); // assertEquals(0, router.root.getSegmentNames().size()); @@ -102,7 +102,7 @@ String[] paths = {"/{a}","{a}"}; for (String path : paths) { - Router router = new Router(router().add(route(path).add(pathParam("a").withPattern(".*")))); + Router router = router().add(route(path).with(pathParam("a").withPattern(".*"))).build(); // assertEquals(0, router.root.getSegmentNames().size()); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -36,8 +36,8 @@ public void testFoo() throws Exception { Router router = router(). - add(route("/a").add(routeParam("foo").withValue("bar")). - add(route("/b").add(routeParam("juu").withValue("daa")))). + add(route("/a").with(routeParam("foo").withValue("bar")). + sub(route("/b").with(routeParam("juu").withValue("daa")))). build(); // Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -42,16 +42,19 @@ { this.router = router(). add(route("/"). - add(routeParam("gtn:handler").withValue("portal")). - add(requestParam("gtn:componentid").withName("portal:componentId")). - add(requestParam("gtn:action").withName("portal:action")). - add(requestParam("gtn:objectid").withName("portal:objectId")). - add(route("/public/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:access").withValue("public")). - add(pathParam("gtn:path").withPattern(".*").preservingPath())). - add(route("/private/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:access").withValue("private")). - add(pathParam("gtn:path").withPattern(".*").preservingPath()))). + with( + routeParam("gtn:handler").withValue("portal"), + requestParam("gtn:componentid").named("portal:componentId"), + requestParam("gtn:action").named("portal:action"), + requestParam("gtn:objectid").named("portal:objectId")). + sub(route("/public/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:access").withValue("public"), + pathParam("gtn:path").withPattern(".*").preservingPath())). + sub(route("/private/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:access").withValue("private"), + pathParam("gtn:path").withPattern(".*").preservingPath()))). build(); } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -87,7 +87,7 @@ public void testParameterPropagationToDescendants() throws Exception { Router router = router(). - add(route("/").add(routeParam("p").withValue("a"))). + add(route("/").with(routeParam("p").withValue("a"))). add(route("/a")).build(); // @@ -96,7 +96,7 @@ public void testSimplePattern() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern("a"))).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern("a"))).build(); // assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a")); @@ -109,7 +109,7 @@ { Router router = router(). add(route("/a")). - add(route("/{p}/b").add(pathParam("p").withPattern("a"))). + add(route("/{p}/b").with(pathParam("p").withPattern("a"))). build(); // @@ -122,7 +122,7 @@ public void testTwoRules1() throws Exception { Router router = router(). - add(route("/a").add(routeParam("b").withValue("b"))). + add(route("/a").with(routeParam("b").withValue("b"))). add(route("/a/b")). build(); @@ -134,7 +134,7 @@ public void testTwoRules2() throws Exception { Router router = router(). - add(route("/{a}").add(routeParam("b").withValue("b"))). + add(route("/{a}").with(routeParam("b").withValue("b"))). add(route("/{a}/b")). build(); @@ -149,7 +149,7 @@ public void testLang() throws Exception { Router router = router(). - add(route("/{a}b").add(pathParam("a").withPattern("(([A-Za-z]{2})/)?").preservingPath())). + add(route("/{a}b").with(pathParam("a").withPattern("(([A-Za-z]{2})/)?").preservingPath())). build(); // Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPathParamEncoding.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPathParamEncoding.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPathParamEncoding.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -33,7 +33,7 @@ public void testDefaultForm() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern(".+"))).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern(".+"))).build(); // Route assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/_")); @@ -44,7 +44,7 @@ public void testPreservePath() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern("[^/]+").preservingPath())).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern("[^/]+").preservingPath())).build(); // Route assertEquals(Collections.singletonMap(QualifiedName.create("p"), "_"), router.route("/_")); @@ -58,7 +58,7 @@ { Router router = router(). add(route("/{p}"). - add(pathParam("p").withPattern("/[a-z]+/[a-z]+/?"))). + with(pathParam("p").withPattern("/[a-z]+/[a-z]+/?"))). build(); // Route @@ -75,7 +75,7 @@ public void testWildcardPathParamWithPreservePath() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern(".*").preservingPath())).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern(".*").preservingPath())).build(); // Render assertEquals("/", router.render(Collections.singletonMap(QualifiedName.create("p"), ""))); @@ -92,7 +92,7 @@ public void testWildcardParamPathWithDefaultForm() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern(".*"))).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern(".*"))).build(); // assertEquals("/_", router.render(Collections.singletonMap(QualifiedName.create("p"), "/"))); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortal.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortal.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortal.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -22,8 +22,6 @@ import org.exoplatform.web.controller.QualifiedName; import static org.exoplatform.web.controller.metadata.DescriptorBuilder.*; -import org.exoplatform.web.controller.metadata.RouterDescriptor; - import java.util.Collections; /** @@ -35,34 +33,37 @@ public void testLanguage1() throws Exception { - RouterDescriptor routerMD = router().add( - route("/public{gtn:lang}").add( - pathParam("gtn:lang").withPattern("(/[A-Za-z][A-Za-z])?").preservingPath()) - ); - Router router = new Router(routerMD); + Router router = router().add( + route("/public{gtn:lang}"). + with(pathParam("gtn:lang").withPattern("(/[A-Za-z][A-Za-z])?").preservingPath())). + build(); + + // assertEquals(Collections.singletonMap(QualifiedName.parse("gtn:lang"), ""), router.route("/public")); assertEquals(Collections.singletonMap(QualifiedName.parse("gtn:lang"), "/fr"), router.route("/public/fr")); } public void testLanguage2() throws Exception { - RouterDescriptor routerMD = router().add( - route("/{gtn:lang}public").add( - pathParam("gtn:lang").withPattern("([A-Za-z]{2}/)?").preservingPath()) - ); - Router router = new Router(routerMD); + Router router = router().add( + route("/{gtn:lang}public"). + with(pathParam("gtn:lang").withPattern("([A-Za-z]{2}/)?").preservingPath())). + build(); + + // assertEquals(Collections.singletonMap(QualifiedName.parse("gtn:lang"), ""), router.route("/public")); assertEquals(Collections.singletonMap(QualifiedName.parse("gtn:lang"), "fr/"), router.route("/fr/public")); } public void testLanguage3() throws Exception { - RouterDescriptor routerMD = router(). + Router router = router(). add(route("/public")). add(route("/{gtn:lang}/public"). - add(pathParam("gtn:lang").withPattern("([A-Za-z]{2})")) - ); - Router router = new Router(routerMD); + with(pathParam("gtn:lang").withPattern("([A-Za-z]{2})"))). + build(); + + // assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/public")); assertEquals(Collections.singletonMap(QualifiedName.parse("gtn:lang"), "fr"), router.route("/fr/public")); } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -40,20 +40,25 @@ protected void setUp() throws Exception { this.router = router(). - add(route("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:controller").withValue("site")). - add(routeParam("gtn:controller").withValue("site")). - add(requestParam("gtn:componentid").withName("portal:componentId")). - add(pathParam("gtn:path").withPattern(".*").preservingPath())). - add(route("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:controller").withValue("site")). - add(pathParam("gtn:path").withPattern(".*").preservingPath())). - add(route("/groups/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:controller").withValue("site")). - add(pathParam("gtn:path").withPattern(".*").preservingPath())). - add(route("/users/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). - add(routeParam("gtn:controller").withValue("site")). - add(pathParam("gtn:path").withPattern(".*").preservingPath())). + add( + route("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:controller").withValue("site"), + routeParam("gtn:controller").withValue("site"), + requestParam("gtn:componentid").named("portal:componentId"), + pathParam("gtn:path").withPattern(".*").preservingPath()), + route("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:controller").withValue("site"), + pathParam("gtn:path").withPattern(".*").preservingPath()), + route("/groups/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:controller").withValue("site"), + pathParam("gtn:path").withPattern(".*").preservingPath()), + route("/users/{gtn:sitetype}/{gtn:sitename}{gtn:path}"). + with( + routeParam("gtn:controller").withValue("site"), + pathParam("gtn:path").withPattern(".*").preservingPath())). build(); } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -66,7 +66,7 @@ public void testSimplePatternPathParam() throws Exception { - Router router = router().add(route("/{p}").add(pathParam("p").withPattern("a"))).build(); + Router router = router().add(route("/{p}").with(pathParam("p").withPattern("a"))).build(); // assertEquals("/a", router.render(Collections.singletonMap(QualifiedName.create("p"), "a"))); @@ -78,7 +78,7 @@ Router router = router(). add(route("/a")). add(route("/{p}/b"). - add(pathParam("p").withPattern("a"))). + with(pathParam("p").withPattern("a"))). build(); // @@ -92,7 +92,7 @@ { Router router = router(). add(route("/{a}b"). - add(pathParam("a").withPattern("(([A-Za-z]{2})/)?").preservingPath())). + with(pathParam("a").withPattern("(([A-Za-z]{2})/)?").preservingPath())). build(); // Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-11-30 11:01:50 UTC (rev 5385) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-11-30 13:24:31 UTC (rev 5386) @@ -35,7 +35,7 @@ public void testRoot() throws Exception { - Router router = router().add(route("/").add(requestParam("foo").withName("a").withValue("a").required())).build(); + Router router = router().add(route("/").with(requestParam("foo").named("a").withValue("a").required())).build(); // assertNull(router.route("/")); @@ -51,7 +51,7 @@ public void testSegment() throws Exception { - Router router = router().add(route("/a").add(requestParam("foo").withName("a").withValue("a").required())).build(); + Router router = router().add(route("/a").with(requestParam("foo").named("a").withValue("a").required())).build(); // assertNull(router.route("/a")); @@ -67,7 +67,7 @@ public void testValuePattern() throws Exception { - Router router = router().add(route("/a").add(requestParam("foo").withName("a").withValue("{[0-9]+}").required())).build(); + Router router = router().add(route("/a").with(requestParam("foo").named("a").withValue("{[0-9]+}").required())).build(); // assertNull(router.route("/a")); @@ -86,8 +86,8 @@ public void testPrecedence() throws Exception { Router router = router(). - add(route("/a").add(requestParam("foo").withName("a").withValue("a").required())). - add(route("/a").add(requestParam("bar").withName("b").withValue("b").required())). + add(route("/a").with(requestParam("foo").named("a").withValue("a").required())). + add(route("/a").with(requestParam("bar").named("b").withValue("b").required())). build(); // @@ -109,10 +109,9 @@ public void testInheritance() throws Exception { - Router router = router().add(route("/a"). - add(requestParam("foo").withName("a").withValue("a").required()). - add(route("/b"). - add(requestParam("bar").withName("b").withValue("b").required()))). + Router router = router(). + add(route("/a").with(requestParam("foo").named("a").withValue("a").required()). + sub(route("/b").with(requestParam("bar").named("b").withValue("b").required()))). build(); // @@ -145,7 +144,7 @@ public void testOptional() throws Exception { Router router = router().add(route("/"). - add(requestParam("foo").withName("a").withValue("a"))).build(); + with(requestParam("foo").named("a").withValue("a"))).build(); // assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/", Collections.<String, String[]>emptyMap())); @@ -165,11 +164,9 @@ public void testMatchDescendantOfRootParameters() throws Exception { Router router = router(). - add(route("/"). - add(requestParam("foo").withName("a").withValue("a")). - add(route("/a"). - add(requestParam("bar").withName("b").withValue("b"))) - ).build(); + add(route("/").with(requestParam("foo").named("a").withValue("a")). + sub(route("/a").with(requestParam("bar").named("b").withValue("b")))). + build(); // SimpleRenderContext renderContext = new SimpleRenderContext();

13 years, 5 months

1
0
0 / 0

gatein SVN: r5385 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-30 06:01:50 -0500 (Tue, 30 Nov 2010) New Revision: 5385 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html Log: TESTVN-2082 - Daily tests on GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2010-11-30 11:01:44 UTC (rev 5384) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2010-11-30 11:01:50 UTC (rev 5385) @@ -443,17 +443,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_25</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr>

13 years, 5 months

1
0
0 / 0

gatein SVN: r5384 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-11-30 06:01:44 -0500 (Tue, 30 Nov 2010) New Revision: 5384 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_002_AddNewGroupWithBlankRequireFields.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_003_AddNewGroupWhenNameStartWithNumber.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_004_AddNewGroupWhenGroupNameStartsWithDash.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_006_AddNewGroupWIthNameContainsSpace.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_007_AddNewGroupWhenNameContainsSpecialChars.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_012_AddNewGroupSameNameWithExisting.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html Log: TESTVN-2082 - Daily tests on GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div</td> + <td>//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div</td> + <td>//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -163,22 +163,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_002_AddNewGroupWithBlankRequireFields.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_002_AddNewGroupWithBlankRequireFields.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_002_AddNewGroupWithBlankRequireFields.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_003_AddNewGroupWhenNameStartWithNumber.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_003_AddNewGroupWhenNameStartWithNumber.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_003_AddNewGroupWhenNameStartWithNumber.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_004_AddNewGroupWhenGroupNameStartsWithDash.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_004_AddNewGroupWhenGroupNameStartsWithDash.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_004_AddNewGroupWhenGroupNameStartsWithDash.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_006_AddNewGroupWIthNameContainsSpace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_006_AddNewGroupWIthNameContainsSpace.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_006_AddNewGroupWIthNameContainsSpace.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_007_AddNewGroupWhenNameContainsSpecialChars.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_007_AddNewGroupWhenNameContainsSpecialChars.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_007_AddNewGroupWhenNameContainsSpecialChars.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -83,17 +83,17 @@ </tr> <tr> <td>echo</td> - <td>-- Click Add new group icon--</td> + <td>-- Click Add new group --</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> @@ -127,14 +127,14 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[2]/div[2]/div/div/div/div/div[2]</td> + <td>waitForTextPresent</td> + <td>Only alpha, digit, dash and underscore characters allowed for the field "Group Name".</td> <td></td> </tr> <tr> - <td>verifyText</td> - <td>//div[2]/div[2]/div/div/div/div/div[2]</td> + <td>verifyTextPresent</td> <td>Only alpha, digit, dash and underscore characters allowed for the field "Group Name".</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_012_AddNewGroupSameNameWithExisting.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_012_AddNewGroupSameNameWithExisting.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_02_012_AddNewGroupSameNameWithExisting.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[2]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[2]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> @@ -83,12 +83,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td>//a[@title='Add New Group']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]</td> + <td>//div[@class='GroupManagementIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html 2010-11-30 10:56:15 UTC (rev 5383) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html 2010-11-30 11:01:44 UTC (rev 5384) @@ -163,12 +163,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td>//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td>//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -212,6 +212,11 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Add more role for user --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>username</td> <td></td> @@ -224,7 +229,7 @@ <tr> <td>waitForElementPresent</td> <td>membership</td> - <td>label=manager</td> + <td></td> </tr> <tr> <td>select</td> @@ -247,14 +252,14 @@ <td></td> </tr> <tr> - <td>open</td> - <td>/portal/public/classic/</td> + <td>echo</td> + <td>-- Login with new user --</td> <td></td> </tr> <tr> - <td>windowMaximize</td> + <td>open</td> + <td>/portal/public/classic/</td> <td></td> - <td></td> </tr> <tr> <td>click</td> @@ -462,6 +467,11 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Delete user --</td> + <td></td> +</tr> +<tr> <td>open</td> <td>/portal/public/classic/</td> <td></td> @@ -907,6 +917,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_PLT_03_07_004']</td> + <td></td> +</tr> +<tr> <td>mouseDownRight</td> <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_PLT_03_07_004']</td> <td></td> @@ -927,6 +942,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_PLT_03_07_004_add']</td> + <td></td> +</tr> +<tr> <td>mouseDownRight</td> <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_PLT_03_07_004_add']</td> <td></td>

13 years, 5 months

1
0
0 / 0

gatein SVN: r5383 - portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/webapp/javascript/eXo/portal.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-11-30 05:56:15 -0500 (Tue, 30 Nov 2010) New Revision: 5383 Modified: portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js Log: GTNPORTAL-1690 Have problem when trying to move the page body outside a UITableColumnContainer Modified: portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-11-30 10:03:04 UTC (rev 5382) +++ portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-11-30 10:56:15 UTC (rev 5383) @@ -516,10 +516,10 @@ var parent; if (parent = DOMUtil.findAncestorByClass(element, "UIPortlet")) { return parent; + } else if (parent = DOMUtil.findAncestorByClass(element, "UIPageBody")) { + return parent; } else if (parent = DOMUtil.findAncestorByClass(element, "UIContainer")) { return parent; - } else if (parent = DOMUtil.findAncestorByClass(element, "UIPageBody")) { - return parent; } else if (parent = DOMUtil.findAncestorByClass(element, "UIPortal")) { return parent; }

13 years, 5 months

1
0
0 / 0

gatein SVN: r5382 - in exo/portal/branches/standalone: web/portal/src/main/webapp/groovy/portal/webui/application and 4 other directories.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-11-30 05:03:04 -0500 (Tue, 30 Nov 2010) New Revision: 5382 Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform/webui/application/WebuiApplication.java exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/configuration.xml exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java Log: Move the standalone webui configuration to its corresponding handler Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-30 10:03:04 UTC (rev 5382) @@ -186,10 +186,6 @@ <param-name>webui.configuration</param-name> <param-value>app:/WEB-INF/webui-configuration.xml</param-value> </init-param> - <init-param> - <param-name>standalone.webui.configuration</param-name> - <param-value>app:/WEB-INF/standalone-webui-configuration.xml</param-value> - </init-param> <load-on-startup>1</load-on-startup> </servlet> Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl 2010-11-30 10:03:04 UTC (rev 5382) @@ -1,4 +1,5 @@ <div class="UIStandaloneAppContainer" id="<%=uicomponent.getId()%>"> + <% if (uicomponent.isLossData()) { print("Can not render this gadget</div>"); @@ -8,7 +9,11 @@ uicomponent.renderChild(uicomponent.currApp); } else { %> - <div class="Icon">Not have permission</div> - <div class="Icon"><a href="<%=uicomponent.url("Logout")%>">Login with other UserName</a> </div> + <div style="text-align: center; padding: 25px 0px; background: #000; border-top: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF; margin-top: 30px;"> + <div class="Icon" style="color: red; font-size: 20px; margin-bottom: 5px;">You have no right to access this application</div> + <div class="Icon"><a href="<%=uicomponent.url("Logout")%>" style="color: #2C6FBD; font-size: 12px; text-decoration: underline;">Login with other UserName</a> </div> + </div> <% } %> </div> + + Modified: exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform/webui/application/WebuiApplication.java =================================================================== --- exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform/webui/application/WebuiApplication.java 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform/webui/application/WebuiApplication.java 2010-11-30 10:03:04 UTC (rev 5382) @@ -20,7 +20,6 @@ package org.exoplatform.webui.application; import org.exoplatform.web.application.Application; -import org.exoplatform.web.application.ApplicationLifecycle; import org.exoplatform.webui.Util; import org.exoplatform.webui.config.Component; import org.exoplatform.webui.core.UIComponent; @@ -68,11 +67,8 @@ String stateManagerClass = configManager_.getApplication().getStateManager(); StateManager stManager = (StateManager)Util.createObject(stateManagerClass, null); setStateManager(stManager); - List<ApplicationLifecycle> lifecycleListeners = - configManager_.getApplication().getApplicationLifecycleListeners(); - setApplicationLifecycle(lifecycleListeners); - for (ApplicationLifecycle lifecycle : lifecycleListeners) - lifecycle.onInit(this); + setApplicationLifecycle(configManager_.getApplication().getApplicationLifecycleListeners()); + super.onInit(); } public ConfigurationManager getConfigurationManager() Modified: exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/configuration.xml =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/configuration.xml 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/configuration.xml 2010-11-30 10:03:04 UTC (rev 5382) @@ -47,6 +47,12 @@ <name>StandaloneAppRequestHandler</name> <set-method>register</set-method> <type>org.exoplatform.portal.application.StandaloneAppRequestHandler</type> + <init-params> + <value-param> + <name>webui.configuration</name> + <value>app:/WEB-INF/standalone-webui-configuration.xml</value> + </value-param> + </init-params> </component-plugin> </external-component-plugins> </configuration> Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java 2010-11-30 10:03:04 UTC (rev 5382) @@ -23,12 +23,25 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; import org.exoplatform.web.WebAppController; public class StandaloneAppRequestHandler extends PortalRequestHandler { + + private String webuiConfigPath; + public StandaloneAppRequestHandler(InitParams params) + { + ValueParam valueParam = params.getValueParam("webui.configuration"); + if (valueParam != null) + { + webuiConfigPath = valueParam.getValue(); + } + } + private String[] PATHS = {"/standalone"}; public String[] getPath() @@ -40,6 +53,7 @@ public void onInit(WebAppController controller, ServletConfig sConfig) throws Exception { StandaloneApplication standaloneApplication = new StandaloneApplication(sConfig); + standaloneApplication.setWebUIConfigPath(webuiConfigPath); standaloneApplication.onInit(); controller.addApplication(standaloneApplication); } @@ -51,10 +65,7 @@ StandaloneApplication app = controller.getApplication(StandaloneApplication.STANDALONE_APPLICATION_ID); StandaloneAppRequestContext context = new StandaloneAppRequestContext(app, req, res); -// if (context.getPortalOwner().length() == 0) { -// res.sendRedirect(req.getContextPath()); -// return; -// } + processRequest(context, app); } } Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java 2010-11-30 10:03:04 UTC (rev 5382) @@ -23,6 +23,7 @@ public class StandaloneApplication extends PortalApplication { + private String webuiConfigPath; final static public String STANDALONE_APPLICATION_ID = "StandaloneApplication"; @@ -31,14 +32,22 @@ super(config); } + public void setWebUIConfigPath(String path) + { + webuiConfigPath = path; + } public String getApplicationId() { return STANDALONE_APPLICATION_ID; } - + public String getApplicationInitParam(String name) { + if ("webui.configuration".equals(name)) + { + return webuiConfigPath; + } return getServletConfig().getInitParameter("standalone." + name); } } Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java 2010-11-30 09:09:44 UTC (rev 5381) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java 2010-11-30 10:03:04 UTC (rev 5382) @@ -104,25 +104,8 @@ { PortalRequestContext pcontext = (PortalRequestContext)context; -// if (getUIPopupMessages().hasMessage()) -// { -// pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages()); -// } - Set<UIComponent> list = context.getUIComponentToUpdateByAjax(); -// List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>(3); -// List<UIComponent> uiDataComponents = new ArrayList<UIComponent>(5); -// if (list != null) -// { -// for (UIComponent uicomponent : list) -// { -// if (uicomponent instanceof UIPortlet) -// uiPortlets.add((UIPortlet)uicomponent); -// else -// uiDataComponents.add(uicomponent); -// } -// } w.write("<div class=\"PortalResponse\">"); w.write("<div class=\"PortalResponseData\">"); if (list != null) @@ -138,31 +121,6 @@ } w.write("</div>"); -// if (!context.getFullRender()) -// { -// for (UIPortlet uiPortlet : uiPortlets) -// { -// if (log.isDebugEnabled()) -// log.debug("AJAX call: Need to refresh the Portlet " + uiPortlet.getId()); -// -// w.write("<div class=\"PortletResponse\" style=\"display: none\">"); -// w.append("<div class=\"PortletResponsePortletId\">" + uiPortlet.getId() + "</div>"); -// w.append("<div class=\"PortletResponseData\">"); -// -// /* -// * If the portlet is using our UI framework or supports it then -// * it will return a set of block to updates. If there is not -// * block to update the javascript client will see that as a full -// * refresh of the content part -// */ -// uiPortlet.processRender(context); -// -// w.append("</div>"); -// w.append("<div class=\"PortletResponseScript\"></div>"); -// w.write("</div>"); -// } -// } - w.write("<div class=\"PortalResponseScript\">"); pcontext.getJavascriptManager().writeJavascript(w); w.write("eXo.core.Browser.onLoad();\n"); @@ -182,7 +140,6 @@ { SkinService skinService = getApplicationComponent(SkinService.class); Collection<Skin> skins = new ArrayList<Skin>(skinService.getPortalSkins(skin_)); -// Collection<Skin> skins = new ArrayList<Skin>(); return skins; }

13 years, 5 months

1
0
0 / 0

gatein SVN: r5381 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-30 04:09:44 -0500 (Tue, 30 Nov 2010) New Revision: 5381 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml Log: - GTNWSRP-177: Fixed formatting error in producer screen. Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-11-30 09:05:47 UTC (rev 5380) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-11-30 09:09:44 UTC (rev 5381) @@ -21,8 +21,6 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - - <ui:decorate template="producerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" @@ -35,12 +33,9 @@ <ui:define name="content"> <p id="producer-wsdl"> - #{i1 - 8n - .producer_config_wsdl_v1} <h:outputLink value="#{producer.v1WSDL}">#{producer.v1WSDL}</h:outputLink> + #{i18n.producer_config_wsdl_v1} <h:outputLink value="#{producer.v1WSDL}">#{producer.v1WSDL}</h:outputLink> <br/> - #{i18n.producer_config_wsdl_v2} <h:outputLink value="#{producer.v2WSDL}">#{ .v - 2WSDL}</h:outputLink> + #{i18n.producer_config_wsdl_v2} <h:outputLink value="#{producer.v2WSDL}">#{producer.v2WSDL}</h:outputLink> </p> <h:form id="producer-form"> @@ -111,28 +106,21 @@ rowClasses="EvenRow,OddRow" styleClass="UIGrid ConsumerGrid" width="100%"> <h:column> - <f:facet name="header">#{i18n.pro - e}</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> <h:inputText id="name" value="#{property.nameAsString}" size="21"/> </h:column> <h:column> - <f:facet name="header">#{i1 - _p - rop_type}</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> <h:selectOneListbox id="producer-list" disabled="true"> <f:selectItems value="#{producer.supportedPropertyTypes}"/> </h:selectOneListbox> </h:column> <h:column> - <f:facet name="header">#{i18 - p_ - label}</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> <h:inputText id="label" value="#{property.label}" size="21"/> </h:column> <h:column> - <f:facet name="header">#{i1 - op - _hint}</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> <h:inputText id="hint" value="#{property.hint}" size="21"/> </h:column> <h:column>

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010