August 2011 - gatein-commits - Jboss List Archives

gatein SVN: r7168 - in epp/portal/branches/EPP_5_2_Branch: portlet/dashboard/src/main/webapp/groovy/gadget/webui/component and 1 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-17 17:37:09 -0400 (Wed, 17 Aug 2011) New Revision: 7168 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java Log: JBEPP-927: TODO gadget not working besides the dashboard JBEPP-1081: NPE if portlet information cannot be retrieved Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-08-17 20:57:56 UTC (rev 7167) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-08-17 21:37:09 UTC (rev 7168) @@ -26,6 +26,7 @@ import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.webui.application.GadgetUtil; import org.exoplatform.web.application.ApplicationMessage; +import org.exoplatform.webui.application.WebuiApplication; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.application.portlet.PortletRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; @@ -38,6 +39,7 @@ import org.json.JSONObject; import javax.portlet.PortletPreferences; +import javax.portlet.PortletRequest; /** * Created by The eXo Platform SARL @@ -52,11 +54,48 @@ private static final Logger log = LoggerFactory.getLogger(LocalImporter.class); + /** User pref. */ + private String userPref; + public UIGadgetPortlet() throws Exception { addChild(UIGadgetViewMode.class, null, null); } + + public String getUserPref() + { + return userPref; + } + @Override + public void processAction(WebuiRequestContext context) throws Exception + { + super.processAction(context); + + // + PortletRequest req = context.getRequest(); + + // + userPref = req.getParameter("userPref"); + if (userPref != null && !userPref.isEmpty()) + { + PortletPreferences prefs = req.getPreferences(); + prefs.setValue("userPref", userPref); + prefs.store(); + } + } + + @Override + public void processRender(WebuiApplication app, WebuiRequestContext context) throws Exception + { + PortletRequest req = context.getRequest(); + PortletPreferences prefs = req.getPreferences(); + userPref = prefs.getValue("userPref", null); + + // + super.processRender(app, context); + } + public String getUrl() { PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance(); Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-08-17 20:57:56 UTC (rev 7167) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-08-17 21:37:09 UTC (rev 7168) @@ -13,7 +13,7 @@ if(url != null) { def metadata = uicomponent.getParent().getMetadata(url); - def userPref = null; + def userPref = uicomponent.getParent().getUserPref(); JavascriptManager jsmanager = rcontext.getJavascriptManager(); jsmanager.importJavascript("eXo.gadget.UIGadget") ; jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','$id', $metadata, $userPref, 'canvas', '$hostName');") ; Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-08-17 20:57:56 UTC (rev 7167) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-08-17 21:37:09 UTC (rev 7168) @@ -27,7 +27,6 @@ import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.pc.ExoPortletState; import org.exoplatform.portal.pc.ExoPortletStateType; -import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; @@ -40,6 +39,7 @@ import java.io.Serializable; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -204,6 +204,12 @@ String url = GadgetUtil.reproduceUrl(model.getUrl(), model.isLocal()); ExoPortletState prefs = new ExoPortletState(WRAPPER_ID); prefs.getState().put("url", Arrays.asList(url)); + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + Gadget gadget = dataStorage.load(applicationState, ApplicationType.GADGET); + if (gadget != null && gadget.getUserPref() != null) + { + prefs.getState().put("userPref", Collections.singletonList(gadget.getUserPref())); + } return StatefulPortletContext.create(LOCAL_STATE_ID, ExoPortletStateType.getInstance(), prefs); } @@ -211,7 +217,33 @@ public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState, ApplicationState<Gadget> gadgetApplicationState) throws Exception { - throw new UnsupportedOperationException("Cannot edit gadget preferences"); + // Compute new preferences + String userPref = null; + for (Map.Entry<String, List<String>> entry : updateState.getState().entrySet()) + { + if (entry.getKey().equals("userPref") && entry.getValue().size() > 0) + { + userPref = entry.getValue().get(0); + } + } + + if (gadgetApplicationState instanceof TransientApplicationState<?>) + { + throw new UnsupportedOperationException("todo"); + } + else + { + if (userPref != null) + { + Gadget gadget = new Gadget(); + gadget.addUserPref(userPref); + DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + dataStorage.save(gadgetApplicationState, gadget); + } + } + + // + return gadgetApplicationState; } @Override Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-08-17 20:57:56 UTC (rev 7167) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-08-17 21:37:09 UTC (rev 7168) @@ -52,7 +52,6 @@ import org.gatein.common.net.media.MediaType; import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.Mode; -import org.gatein.pc.api.NoSuchPortletException; import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.api.PortletInvokerException; @@ -935,10 +934,12 @@ { producedOfferedPortlet = portletInvoker.getPortlet(producerOfferedPortletContext); } - catch (NoSuchPortletException nspe) + catch (Exception exp) { + // Whenever couldn't invoke the portlet object, set the request portlet to null for the error tobe + // properly handled and displayed when the portlet is rendered producedOfferedPortlet = null; - nspe.printStackTrace(); + exp.printStackTrace(); } this.adapter = adapter; @@ -1001,7 +1002,8 @@ public void update(C updateState) throws Exception { WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - ExoContainer container = context.getApplication().getApplicationServiceContainer(); state.setApplicationState(adapter.update(container, updateState, state.getApplicationState())); + ExoContainer container = context.getApplication().getApplicationServiceContainer(); + state.setApplicationState(adapter.update(container, updateState, state.getApplicationState())); setState(state); }

12 years, 10 months

1
0
0 / 0

gatein SVN: r7167 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: mwringe Date: 2011-08-17 16:57:56 -0400 (Wed, 17 Aug 2011) New Revision: 7167 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-938: merge in Shindig 2 support. Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-17 20:57:48 UTC (rev 7166) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-17 20:57:56 UTC (rev 7167) @@ -42,7 +42,7 @@ <org.exoplatform.ws.version>2.2.0-CR4</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.14.0-CR4-CP01</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> + <org.shindig.version>2.0.2-Beta02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> @@ -96,7 +96,7 @@ <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta04</version> + <version>1.1.0-Beta06</version> <type>pom</type> <scope>import</scope> </dependency> @@ -691,7 +691,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -790,7 +790,7 @@ <dependency> <groupId>caja</groupId> <artifactId>caja</artifactId> - <version>r3375</version> + <version>r4251</version> </dependency> <dependency> <groupId>caja</groupId> @@ -876,17 +876,6 @@ </dependency> <dependency> <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${org.shindig.version}</version> </dependency>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7166 - in epp/portal/branches/EPP_5_2_Branch: gadgets/core/src/main/java/containers/default and 3 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2011-08-17 16:57:48 -0400 (Wed, 17 Aug 2011) New Revision: 7166 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml Log: JBEPP-938: merge in Shindig 2 support. Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-17 20:57:48 UTC (rev 7166) @@ -1143,36 +1143,6 @@ <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>htmlparser</artifactId> - <groupId>nu.validator.htmlparser</groupId> - </exclusion> - <exclusion> - <artifactId>oauth</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-consumer</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-httpclient3</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> - </exclusion> - <exclusion> - <artifactId>jdom</artifactId> - <groupId>org.jdom</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> @@ -1183,37 +1153,9 @@ <artifactId>shindig-common</artifactId> <exclusions> <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-jmx</artifactId> </exclusion> - <exclusion> - <artifactId>commons-beanutils-core</artifactId> - <groupId>commons-beanutils</groupId> - </exclusion> - <exclusion> - <artifactId>commons-betwixt</artifactId> - <groupId>commons-betwixt</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>ezmorph</artifactId> - <groupId>net.sf.ezmorph</groupId> - </exclusion> - <exclusion> - <artifactId>json-lib</artifactId> - <groupId>net.sf.json-lib</groupId> - </exclusion> - <exclusion> - <artifactId>oauth</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xpp3_min</artifactId> - <groupId>xpp3</groupId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1221,53 +1163,17 @@ <artifactId>shindig-social-api</artifactId> <exclusions> <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> + <artifactId>guice-jmx</artifactId> + <groupId>com.google.inject.extensions</groupId> </exclusion> <exclusion> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <groupId>org.apache.geronimo.specs</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>commons-betwixt</artifactId> - <groupId>commons-betwixt</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>ezmorph</artifactId> - <groupId>net.sf.ezmorph</groupId> - </exclusion> - <exclusion> - <artifactId>json-lib</artifactId> - <groupId>net.sf.json-lib</groupId> - </exclusion> - <exclusion> <artifactId>oauth</artifactId> <groupId>net.oauth.core</groupId> </exclusion> <exclusion> - <artifactId>oauth-consumer</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> <artifactId>oauth-provider</artifactId> <groupId>net.oauth.core</groupId> </exclusion> - <exclusion> - <artifactId>oauth-httpclient3</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xpp3_min</artifactId> - <groupId>xpp3</groupId> - </exclusion> </exclusions> </dependency> @@ -1283,6 +1189,22 @@ </exclusions> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> @@ -1309,6 +1231,29 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-jmx</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + </dependency> + +  <dependency> <groupId>net.jcip</groupId> @@ -1513,4 +1458,4 @@ </snapshots> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-08-17 20:57:48 UTC (rev 7166) @@ -44,7 +44,9 @@ // Container must be an array; this allows multiple containers // to share configuration. -{"gadgets.container" : ["default"], +// TODO: Move out accel container config into a separate accel.js file. +// TODO : remove "" container +{"gadgets.container" : ["default", "accel", ""], // Set of regular expressions to validate the parent parameter. This is // necessary to support situations where you want a single container to support @@ -59,39 +61,42 @@ // DNS domain on which gadgets should render. "gadgets.lockedDomainSuffix" : "-a.example.com:8080", +// Origins for CORS requests and/or Referer validation +// Indicate a set of origins or an entry with * to indicate that all origins are allowed +"gadgets.parentOrigins" : ["*"], // Various urls generated throughout the code base. // iframeBaseUri will automatically have the host inserted // if locked domain is enabled and the implementation supports it. // query parameters will be added. "gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr", +"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr", // jsUriTemplate will have %host% and %js% substituted. // No locked domain special cases, but jsUriTemplate must // never conflict with a lockedDomainSuffix. "gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%", +//New configuration for iframeUri generation: +"gadgets.uri.iframe.lockedDomainSuffix" : "-a.example.com:8080", +"gadgets.uri.iframe.unlockedDomain" : "http://%host%", +"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr", // Callback URL. Scheme relative URL for easy switch between https/http. -"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback", +"gadgets.uri.oauth.callbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback", // Use an insecure security token by default "gadgets.securityTokenType" : "secure", "gadgets.securityTokenKeyFile" : "key.txt", +// Config param to load Opensocial data for social +// preloads in data pipelining. %host% will be +// substituted with the current host. +"gadgets.osDataUri" : "http://%host%/rpc", "gadgets.signingKeyFile" : "oauthkey.pem", "gadgets.signingKeyName" : "mytestkey", "gadgets.signedFetchDomain" : "eXo", -// Config param to load Opensocial data for social -// preloads in data pipelining. %host% will be -// substituted with the current host. -"gadgets.osDataUri" : "http://%host%/social/rpc", -// Uncomment these to switch to a secure version -// -//"gadgets.securityTokenType" : "secure", -//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt", - "gadgets.content-rewrite" : { "include-urls": ".*", "exclude-urls": "", @@ -100,7 +105,19 @@ "proxy-url": "/eXoGadgetServer/gadgets/proxy?url=", "concat-url": "/eXoGadgetServer/gadgets/concat?" }, +// Default Js Uri config: also must be overridden. +"gadgets.uri.js.host" : "http://%host%/", +"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js", +// Default concat Uri config; used for testing. +"gadgets.uri.concat.host" : "%host%", +"gadgets.uri.concat.path" : "/eXoGadgetServer/gadgets/concat", +"gadgets.uri.concat.js.splitToken" : "false", + +// Default proxy Uri config; used for testing. +"gadgets.uri.proxy.host" : "%host%", +"gadgets.uri.proxy.path" : "/eXoGadgetServer/gadgets/proxy", + // This config data will be passed down to javascript. Please // configure your object using the feature name rather than // the javascript name. @@ -110,7 +127,7 @@ "gadgets.features" : { "core.io" : { // Note: /proxy is an open proxy. Be careful how you expose this! - "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%", + "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?container=default&refresh=%refresh%&url=%url%%rewriteMime%", "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest" }, "views" : { @@ -125,6 +142,74 @@ "aliases" : ["FULL_PAGE"] } }, + "tabs": { + "css" : [ + ".tablib_table {", + "width: 100%;", + "border-collapse: separate;", + "border-spacing: 0px;", + "empty-cells: show;", + "font-size: 11px;", + "text-align: center;", + "}", + ".tablib_emptyTab {", + "border-bottom: 1px solid #676767;", + "padding: 0px 1px;", + "}", + ".tablib_spacerTab {", + "border-bottom: 1px solid #676767;", + "padding: 0px 1px;", + "width: 1px;", + "}", + ".tablib_selected {", + "padding: 2px;", + "background-color: #ffffff;", + "border: 1px solid #676767;", + "border-bottom-width: 0px;", + "color: #3366cc;", + "font-weight: bold;", + "width: 80px;", + "cursor: default;", + "}", + ".tablib_unselected {", + "padding: 2px;", + "background-color: #dddddd;", + "border: 1px solid #aaaaaa;", + "border-bottom-color: #676767;", + "color: #000000;", + "width: 80px;", + "cursor: pointer;", + "}", + ".tablib_navContainer {", + "width: 10px;", + "vertical-align: middle;", + "}", + ".tablib_navContainer a:link, ", + ".tablib_navContainer a:visited, ", + ".tablib_navContainer a:hover {", + "color: #3366aa;", + "text-decoration: none;", + "}" + ] + }, + "minimessage": { + "css": [ + ".mmlib_table {", + "width: 100%;", + "font: bold 9px arial,sans-serif;", + "background-color: #fff4c2;", + "border-collapse: separate;", + "border-spacing: 0px;", + "padding: 1px 0px;", + "}", + ".mmlib_xlink {", + "font: normal 1.1em arial,sans-serif;", + "font-weight: bold;", + "color: #0000cc;", + "cursor: pointer;", + "}" + ] + }, "rpc" : { // Path to the relay file. Automatically appended to the parent /// parameter if it passes input validation and is not null. @@ -147,15 +232,25 @@ "ANCHOR_COLOR": "" } }, - "opensocial-0.8" : { + "opensocial" : { // Path to fetch opensocial data from // Must be on the same domain as the gadget rendering server - "path" : "http://%host%/social", + "path" : "http://%host%/rpc", + // Path to issue invalidate calls + "invalidatePath" : "http://%host%/rpc", "domain" : "shindig", "enableCaja" : false, "supportedFields" : { "person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"], - "activity" : ["id", "title"] + "activity" : ["appId", "body", "bodyId", "externalId", "id", "mediaItems", "postedTime", "priority", + "streamFaviconUrl", "streamSourceUrl", "streamTitle", "streamUrl", "templateParams", "title", + "url", "userId"], + "activityEntry" : ["icon", "postedTime", "actor", "verb", "object", "target", "generator", "provider", "title", + "body", "standardLinks", "to", "cc", "bcc"], + "album" : ["id", "thumbnailUrl", "title", "description", "location", "ownerId"], + "mediaItem" : ["album_id", "created", "description", "duration", "file_size", "id", "language", "last_updated", + "location", "mime_type", "num_comments", "num_views", "num_votes", "rating", "start_time", + "tagged_people", "tags", "thumbnail_url", "title", "type", "url"] } }, "osapi.services" : { @@ -168,13 +263,13 @@ // E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"] "gadgets.rpc" : ["container.listMethods"] }, -// "osapi" : { -// // The endpoints to query for available JSONRPC/REST services -// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ] -// }, + "osapi" : { + // The endpoints to query for available JSONRPC/REST services + "endPoints" : [ "http://%host%/rpc" ] + }, "osml": { // OSML library resource. Can be set to null or the empty string to disable OSML // for a container. - "library": "" + "library": "config/OSML_library.xml" } }} Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-17 20:57:48 UTC (rev 7166) @@ -25,7 +25,7 @@ import com.google.inject.name.Named; import sun.misc.BASE64Encoder; -import org.apache.shindig.auth.BlobCrypterSecurityTokenDecoder; +import org.apache.shindig.auth.BlobCrypterSecurityTokenCodec; import org.apache.shindig.config.ContainerConfigException; import org.apache.shindig.config.JsonContainerConfig; import org.apache.shindig.expressions.Expressions; @@ -165,7 +165,7 @@ @Override public Object getProperty(String container, String property) { - if (property.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE) && _keyPath != null) + if (property.equals(BlobCrypterSecurityTokenCodec.SECURITY_TOKEN_KEY_FILE) && _keyPath != null) { return _keyPath; } Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-08-17 20:57:48 UTC (rev 7166) @@ -41,6 +41,6 @@ @Inject public ExoHttpFetcher() { - super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS); + super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_CONNECT_TIMEOUT_MS, null); } } Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-08-17 20:57:48 UTC (rev 7166) @@ -19,9 +19,16 @@ package org.exoplatform.portal.gadget.core; +import com.google.inject.AbstractModule; +import com.google.inject.name.Names; + import org.apache.shindig.config.ContainerConfig; import org.apache.shindig.gadgets.DefaultGuiceModule; import org.apache.shindig.gadgets.http.HttpFetcher; +import org.apache.shindig.protocol.conversion.BeanAtomConverter; +import org.apache.shindig.protocol.conversion.BeanConverter; +import org.apache.shindig.protocol.conversion.BeanJsonConverter; +import org.apache.shindig.protocol.conversion.BeanXmlConverter; /** * The goal of the module is to bind the {@link org.apache.shindig.common.ContainerConfig} interface to the @@ -31,16 +38,17 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class ExoModule extends DefaultGuiceModule +public class ExoModule extends AbstractModule { @Override protected void configure() { - //super.configure(); - - // bind(ContainerConfig.class).to(ExoContainerConfig.class); bind(HttpFetcher.class).to(ExoHttpFetcher.class); + + bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(BeanXmlConverter.class); + bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(BeanJsonConverter.class); + bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.atom")).to(BeanAtomConverter.class); } } Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-17 20:57:48 UTC (rev 7166) @@ -49,34 +49,9 @@  <dependency> <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <type>war</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>net.oauth.core</groupId> - <artifactId>oauth-provider</artifactId> - </exclusion> - <exclusion> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-jmx</artifactId> - </exclusion> - </exclusions> - </dependency>  <dependency> @@ -94,24 +69,12 @@ <artifactId>json_simple</artifactId> <scope>provided</scope> </dependency> -  <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <scope>provided</scope> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-08-17 15:37:06 UTC (rev 7165) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-08-17 20:57:48 UTC (rev 7166) @@ -52,8 +52,23 @@ <filter-name>ProxyServletFilter</filter-name> <filter-class>org.exoplatform.portal.gadget.core.ProxyServletFilter</filter-class> </filter> + + <filter> + <filter-name>hostFilter</filter-name> + <filter-class>org.apache.shindig.common.servlet.HostFilter</filter-class> + </filter> <filter-mapping> + <filter-name>hostFilter</filter-name> + <url-pattern>/gadgets/ifr</url-pattern> + <url-pattern>/gadgets/js/*</url-pattern> + <url-pattern>/gadgets/proxy/*</url-pattern> + <url-pattern>/gadgets/concat</url-pattern> + <url-pattern>/rpc/*</url-pattern> + <url-pattern>/rest/*</url-pattern> + </filter-mapping> + + <filter-mapping> <filter-name>authFilter</filter-name> <url-pattern>/gadgets/ifr</url-pattern> </filter-mapping> @@ -138,7 +153,7 @@ </servlet-class> <init-param> <param-name>handlers</param-name> - <param-value>org.apache.shindig.gadgets.handlers</param-value> + <param-value>org.apache.shindig.handlers</param-value> </init-param> </servlet> @@ -149,7 +164,7 @@ </servlet-class> <init-param> <param-name>handlers</param-name> - <param-value>org.apache.shindig.gadgets.handlers</param-value> + <param-value>org.apache.shindig.handlers</param-value> </init-param> </servlet>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7165 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-17 11:37:06 -0400 (Wed, 17 Aug 2011) New Revision: 7165 Removed: epp/portal/branches/EPP_5_2_Branch/packaging/ Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: removing 'packaging' module, not needed for this branch Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-17 11:01:44 UTC (rev 7164) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-17 15:37:06 UTC (rev 7165) @@ -82,8 +82,7 @@ <module>server</module> <module>examples</module> <module>starter</module> - <module>packaging</module> - <module>wsrp-integration</module> + <module>wsrp-integration</module> <module>testsuite</module> <module>distribution</module> </modules>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7164 - portal/trunk/testsuite/testdefinitions.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-08-17 07:01:44 -0400 (Wed, 17 Aug 2011) New Revision: 7164 Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods Log: TESTVN-3709 - Update referential for modified GateIn functionalities Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_BasicPortlets_TestDefinition.ods =================================================================== (Binary files differ)

12 years, 10 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-08-17 07:01:12 -0400 (Wed, 17 Aug 2011) New Revision: 7163 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html Log: TESTVN-4028 - Daily tests on Portal Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -39,7 +39,7 @@ <tr> <td>waitForElementPresent</td> <td>username</td> - <td>root</td> + <td></td> </tr> <tr> <td>type</td> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -108,7 +108,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -128,7 +128,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -163,7 +163,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -183,7 +183,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -132,6 +132,11 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- https://jira.exoplatform.org/browse/SELEGEN-59 --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Tiếng Anh</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -63,7 +63,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>open</td> - <td>/portal/private/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -128,12 +128,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='User Profile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='User Profile']</td> <td></td> </tr> <tr> @@ -168,12 +168,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[@id="UIAccountPortlet"]//a[text()="OK"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[@id="UIAccountPortlet"]//a[text()="OK"]</td> <td></td> </tr> <tr> @@ -198,12 +198,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=exact:Forgot your Username/Password?</td> + <td>link=exact:Forgot your User Name/Password?</td> <td></td> </tr> <tr> <td>click</td> - <td>link=exact:Forgot your Username/Password?</td> + <td>link=exact:Forgot your User Name/Password?</td> <td></td> </tr> <tr> @@ -248,16 +248,36 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//a[contains(@onclick,'componentId=_')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>link=Back</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Back</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Back</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Back</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Discard</td> <td></td> </tr> @@ -393,7 +413,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -198,7 +198,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -243,7 +243,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -283,6 +283,11 @@ </tr> <tr> <td>echo</td> + <td>-- https://jira.exoplatform.org/browse/EXOGTN-570 --</td> + <td></td> +</tr> +<tr> + <td>echo</td> <td>-- Delete new user --</td> <td></td> </tr> @@ -302,6 +307,11 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Close popup message --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[contains(@onclick,"action=Close")]</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -153,7 +153,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -328,7 +328,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete Test_SNF_PRL_07 user?</td> + <td>Are you sure to delete user Test_SNF_PRL_07?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,12 +58,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Applications Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteMap']/div[2]/div/div[4]/div[1]/a</td> + <td>//div[@id='UISiteMap']//a[text()='Organization']</td> <td></td> </tr> <tr> @@ -83,12 +83,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//a[@href='/portal/groups/:organization:management:executive-board/organization/management']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//a[@href='/portal/groups/:organization:management:executive-board/organization/management']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-08-16 21:15:20 UTC (rev 7162) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-08-17 11:01:12 UTC (rev 7163) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -57,16 +57,31 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> <td>click</td> <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> <td>click</td> <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> <td>click</td> <td>css=div.ExpandIcon.ClearFix > a.NodeIcon.DefaultPageIcon</td> <td></td> @@ -78,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteMap']/div[1]/div[1]</td> + <td>//div[contains(text(),'Collapse All')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteMap']/div[1]/div[1]</td> + <td>//div[contains(text(),'Collapse All')]</td> <td></td> </tr> <tr>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7162 - in portal/branches/api: component/api-impl and 4 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-16 17:15:20 -0400 (Tue, 16 Aug 2011) New Revision: 7162 Modified: portal/branches/api/component/api-impl/pom.xml portal/branches/api/packaging/jboss-as5/pkg/pom.xml portal/branches/api/packaging/jboss-as6/pkg/pom.xml portal/branches/api/packaging/jetty/pkg/pom.xml portal/branches/api/packaging/tomcat/pkg/pom.xml portal/branches/api/pom.xml Log: more work Modified: portal/branches/api/component/api-impl/pom.xml =================================================================== --- portal/branches/api/component/api-impl/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/component/api-impl/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -18,10 +18,6 @@ <artifactId>gatein-java-api</artifactId> </dependency> <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> </dependency> Modified: portal/branches/api/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -304,10 +304,6 @@ <groupId>org.gatein.api</groupId> <artifactId>gatein-java-api</artifactId> </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency>  <dependency> Modified: portal/branches/api/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/branches/api/packaging/jboss-as6/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/packaging/jboss-as6/pkg/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -348,10 +348,6 @@ <groupId>org.gatein.api</groupId> <artifactId>gatein-java-api</artifactId> </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency>  <dependency> Modified: portal/branches/api/packaging/jetty/pkg/pom.xml =================================================================== --- portal/branches/api/packaging/jetty/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/packaging/jetty/pkg/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -334,19 +334,15 @@ <artifactId>pc-bridge</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> +  + <dependency> + <groupId>org.gatein.api</groupId> + <artifactId>java-api-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.api</groupId> + <artifactId>gatein-java-api</artifactId> + </dependency>  <dependency> Modified: portal/branches/api/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/branches/api/packaging/tomcat/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/packaging/tomcat/pkg/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -326,19 +326,15 @@ <artifactId>pc-bridge</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> +  + <dependency> + <groupId>org.gatein.api</groupId> + <artifactId>java-api-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.api</groupId> + <artifactId>gatein-java-api</artifactId> + </dependency>  <dependency> Modified: portal/branches/api/pom.xml =================================================================== --- portal/branches/api/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) +++ portal/branches/api/pom.xml 2011-08-16 21:15:20 UTC (rev 7162) @@ -50,7 +50,7 @@ <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> <org.gatein.mgmt.version>1.0.0-Beta01</org.gatein.mgmt.version> - <org.gatein.api.version>1.0.0-Beta02-SNAPSHOT</org.gatein.api.version> + <org.gatein.api.version>1.0.0-Beta02</org.gatein.api.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version> @@ -405,11 +405,6 @@ </dependency> <dependency> <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - <version>${org.gatein.api.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> <artifactId>java-api-impl</artifactId> <version>${project.version}</version> </dependency>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7161 - in portal/trunk: component/test/jcr/src/main/resources/conf and 6 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-16 14:47:41 -0400 (Tue, 16 Aug 2011) New Revision: 7161 Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/tc6/pom.xml portal/trunk/pom.xml portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java Log: GTNPORTAL-2027 Upgrade eXo JCR to 1.14.0-CR4-CP01 (and dependencies) Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -33,6 +33,11 @@ </component> <component> + <key>org.exoplatform.services.jdbc.DataSourceProvider</key> + <type>org.exoplatform.services.jdbc.impl.DataSourceProviderImpl</type> + </component> + + <component> <key>org.exoplatform.services.document.DocumentReaderService</key> <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type> <component-plugins> Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -836,6 +836,11 @@ <artifactId>closure-compiler</artifactId> <version>r706</version> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <dependency> <?context LIB?> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -827,6 +827,11 @@ <artifactId>closure-compiler</artifactId> <version>r706</version> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <dependency> <?context LIB?> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -757,6 +757,11 @@ <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency>  <dependency> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -755,6 +755,11 @@ <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency>  <dependency> Modified: portal/trunk/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -215,4 +215,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -37,10 +37,10 @@ <name>GateIn - Portal</name> <properties> - <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.3.0-CR4-CP01</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.4.0-CR4</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.0-CR4</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.0-CR4-CP01</org.exoplatform.jcr.version> <org.shindig.version>2.0.2-Beta02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> @@ -986,6 +986,14 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> + <repository> + <id>caja</id> + <url>http://google-caja.googlecode.com/svn/maven</url> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + </repository> </repositories> <pluginRepositories> <pluginRepository> Modified: portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java =================================================================== --- portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 18:47:41 UTC (rev 7161) @@ -26,7 +26,6 @@ import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; import javax.portlet.WindowState; -import javax.resource.spi.IllegalStateException; import org.apache.commons.collections.map.HashedMap; import org.exoplatform.commons.serialization.api.annotations.Serialized; @@ -160,4 +159,4 @@ throw new IllegalStateException("serveSource can only be called in portlet context"); } } -} \ No newline at end of file +}

12 years, 10 months

1
0
0 / 0

gatein SVN: r7160 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-16 12:15:19 -0400 (Tue, 16 Aug 2011) New Revision: 7160 Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml Log: JBEPP-1077 Use local-tx-datasource Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-08-16 14:52:03 UTC (rev 7159) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-08-16 16:15:19 UTC (rev 7160) @@ -89,6 +89,17 @@ </value-param> </init-params> </component> + + <component> + <key>org.exoplatform.services.jdbc.DataSourceProvider</key> + <type>org.exoplatform.services.jdbc.impl.DataSourceProviderImpl</type> + <init-params> + <value-param> + <name>always-managed</name> + <value>true</value> + </value-param> + </init-params> + </component> <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7159 - in portal/trunk: component and 14 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-16 10:52:03 -0400 (Tue, 16 Aug 2011) New Revision: 7159 Removed: portal/trunk/component/api-impl/ portal/trunk/examples/portlets/api/src/main/java/org/gatein/portal/samples/api/ContentRegistryPortlet.java portal/trunk/examples/portlets/api/src/main/java/org/gatein/portal/samples/api/NavigationPortlet.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/api/ Modified: portal/trunk/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationRegistryService.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java portal/trunk/component/pc/pom.xml portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java portal/trunk/component/pom.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java portal/trunk/examples/portlets/api/pom.xml portal/trunk/examples/portlets/api/src/main/webapp/WEB-INF/portlet.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/pom.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml Log: rollback API change Property changes on: portal/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_Branch:6841 /portal/branches/api:6849-7030 /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 /portal/branches/branch-GTNPORTAL-1832:5993-6105 /portal/branches/branch-GTNPORTAL-1872:6327-6594 /portal/branches/branch-GTNPORTAL-1921:6597-6803 /portal/branches/branch-GTNPORTAL-1963:6902-6986 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/wsrp-extraction:5828-6031 + /epp/portal/branches/EPP_5_1_Branch:6841 /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 /portal/branches/branch-GTNPORTAL-1832:5993-6105 /portal/branches/branch-GTNPORTAL-1872:6327-6594 /portal/branches/branch-GTNPORTAL-1921:6597-6803 /portal/branches/branch-GTNPORTAL-1963:6902-6986 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/wsrp-extraction:5828-6031 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationRegistryService.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationRegistryService.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationRegistryService.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -21,7 +21,6 @@ import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.portal.config.model.ApplicationType; -import org.gatein.mop.api.content.ContentType; import java.util.Comparator; import java.util.List; @@ -32,21 +31,21 @@ String REMOTE_DISPLAY_NAME_SUFFIX = " (remote)"; /** - * Return list of ApplicationCatgory (and applications in each category) - * + * Return list of ApplicationCatgory (and applications in each category) * @param accessUser - * @param appTypes - array of ApplicationType, used to filter applications in each application category - */ + * @param appTypes - array of ApplicationType, used to filter applications in each application category + */ public List<ApplicationCategory> getApplicationCategories(String accessUser, ApplicationType<?>... appTypes) throws Exception; public void initListener(ComponentPlugin com) throws Exception; - /** Return list of all current application categories (unsorted, all Application in all ApplicationType) */ + /** + * Return list of all current application categories (unsorted, all Application in all ApplicationType) + */ public List<ApplicationCategory> getApplicationCategories() throws Exception; /** * Return list of all current application categories (sorted, all applications in all types) - * * @param sortComparator - Comparator used to sort the returned list */ public List<ApplicationCategory> getApplicationCategories(Comparator<ApplicationCategory> sortComparator) @@ -55,7 +54,6 @@ /** * Return ApplicationCategory with name provided <br/> * if not found, return null - * * @param name - ApplicationCategory's name */ public ApplicationCategory getApplicationCategory(String name) throws Exception; @@ -63,7 +61,6 @@ /** * Save an ApplicationCategory to database <br/> * If it doesn't exist, a new one will be created, if not, it will be updated - * * @param category - ApplicationCategory object that will be saved */ public void save(ApplicationCategory category) throws Exception; @@ -71,14 +68,12 @@ /** * Remove application category (and all application in it) from database <br/> * If it doesn't exist, it will be ignored - * * @param category - ApplicationCategory object that will be removed */ public void remove(ApplicationCategory category) throws Exception; /** * Return list of applications (unsorted) in specific category and have specific type - * * @param category - ApplicationCategory that you want to list applications * @param appTypes - array of application type */ @@ -86,14 +81,12 @@ /** * Return list of applications (sorted) in specific category and have specific type - * - * @param category - ApplicationCategory that you want to list applications + * @param category - ApplicationCategory that you want to list applications * @param sortComparator - comparator used to sort application list - * @param appTypes - array of application type + * @param appTypes - array of application type */ public List<Application> getApplications(ApplicationCategory category, Comparator<Application> sortComparator, ApplicationType<?>... appTypes) throws Exception; - /** * Return list of all Application in database (unsorted) <br/> * If there are not any Application in database, return an empty list @@ -102,7 +95,6 @@ /** * Return Application with id provided - * * @param id - must be valid applicationId (catgoryname/applicationName), if not, this will throw exception */ public Application getApplication(String id) throws Exception; @@ -110,9 +102,8 @@ /** * Return Application in specific category and have name provided in param <br/> * If it can't be found, return null - * * @param category - name of application category - * @param name - name of application + * @param name - name of application */ public Application getApplication(String category, String name) throws Exception; @@ -120,16 +111,14 @@ * Save Application in an ApplicationCategory <br/> * If ApplicationCategory or Application don't exist, they'll be created <br/> * If Application has been already existed, it will be updated <br/> - * - * @param category - ApplicationCategory that your application'll be saved to - * @param application - Application that will be saved + * @param category - ApplicationCategory that your application'll be saved to + * @param application - Application that will be saved */ public void save(ApplicationCategory category, Application application) throws Exception; /** * Update an Application <br/> * It must be existed in database, if not, this will throw an IllegalStateException - * * @param application - Application that you want to update */ public void update(Application application) throws Exception; @@ -137,7 +126,6 @@ /** * Remove an Application from database <br/> * If it can't be found, it will be ignored (no exception) - * * @param app - Application that you want to remove, must not be null */ public void remove(Application app) throws Exception; @@ -145,21 +133,16 @@ /** * Get all deployed portlet, add to portlet's ApplicationCategory <br/> * If ApplicationCategory currently doesn't exist, it'll be created <br/> - * If Application've already existed, it'll be ignored + * If Application've already existed, it'll be ignored */ public void importAllPortlets() throws Exception; //TODO: dang.tung - /** * Get all Gadget, add to eXoGadgets application category <br/> * When first added, it's access permission will be Everyone <br/> * If ApplicationCategory currently doesn't exist, it'll be created <br/> - * Gadget that has been imported will be ignored + * Gadget that has been imported will be ignored */ public void importExoGadgets() throws Exception; - - Application createOrUpdateApplication(String categoryName, String definitionName, ContentType<?> contentType, String contentId, String displayName, String description, List<String> permissions); - - Application createApplicationFrom(org.gatein.pc.api.Portlet portlet); } \ No newline at end of file Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -259,7 +259,7 @@ // If the application name contained a beginning slash (which can happen with WSRP), we need to hack around the // hardcoding of portlet id expectations >_< - if (fragments.length == 3 && applicationName.length() == 0) + if(fragments.length == 3 && applicationName.length() == 0) { applicationName = "/" + fragments[2]; } @@ -371,6 +371,8 @@ public void importExoGadgets() throws Exception { + ContentRegistry registry = getContentRegistry(); + // ExoContainer container = ExoContainerContext.getCurrentContainer(); GadgetRegistryService gadgetService = (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class); @@ -384,16 +386,22 @@ String categoryName = "Gadgets"; // - CategoryDefinition category = getOrCreateCategoryDefinition(categoryName, permissions); + CategoryDefinition category = registry.getCategory(categoryName); + if (category == null) + { + category = registry.createCategory(categoryName); + category.setDisplayName(categoryName); + category.setDescription(categoryName); + category.setAccessPermissions(permissions); + } // for (Gadget ele : eXoGadgets) { - String name = ele.getName(); - ContentDefinition app = category.getContentMap().get(name); + ContentDefinition app = category.getContentMap().get(ele.getName()); if (app == null) { - app = category.createContent(name, org.exoplatform.portal.pom.spi.gadget.Gadget.CONTENT_TYPE, name); + app = category.createContent(ele.getName(), org.exoplatform.portal.pom.spi.gadget.Gadget.CONTENT_TYPE, ele.getName()); app.setDisplayName(ele.getTitle()); app.setDescription(ele.getDescription()); app.setAccessPermissions(permissions); @@ -402,53 +410,10 @@ } } - public Application createOrUpdateApplication(String categoryName, String definitionName, ContentType<?> contentType, String contentId, String displayName, String description, List<String> permissions) + public void importAllPortlets() throws Exception { - CategoryDefinition definition = getOrCreateCategoryDefinition(categoryName, permissions); - ContentDefinition content = definition.getContentMap().get(definitionName); - if (content == null) - { - content = createContent(definitionName, contentType, contentId, displayName, description, permissions, definition); - } - else - { - content.setAccessPermissions(permissions); - content.setDescription(description); - content.setDisplayName(displayName); - } - return load(content); - } - - private ContentDefinition createContent(String definitionName, ContentType<?> contentType, String contentId, String displayName, String description, List<String> permissions, CategoryDefinition category) - { - ContentDefinition content = category.createContent(definitionName, contentType, contentId); - content.setDisplayName(displayName); - content.setDescription(description); - content.setAccessPermissions(permissions); - return content; - } - - private ContentDefinition createContentFrom(Application application, CategoryDefinition category) - { - return createContent(application.getApplicationName(), application.getType().getContentType(), application.getContentId(), application.getDisplayName(), application.getDescription(), application.getAccessPermissions(), category); - } - - private CategoryDefinition getOrCreateCategoryDefinition(String categoryName, List<String> permissions) - { ContentRegistry registry = getContentRegistry(); - CategoryDefinition category = registry.getCategory(categoryName); - if (category == null) - { - category = registry.createCategory(categoryName); - category.setDisplayName(categoryName); - category.setDescription(categoryName); - category.setAccessPermissions(permissions); - } - return category; - } - public void importAllPortlets() throws Exception - { // log.info("About to import portlets in application registry"); @@ -462,17 +427,21 @@ for (org.gatein.pc.api.Portlet portlet : portlets) { PortletInfo info = portlet.getInfo(); - - final Application application = createApplicationFrom(portlet); - String portletApplicationName = info.getApplicationName(); - final String portletName = application.getApplicationName(); + String portletName = portlet.getContext().getId(); + // Need to sanitize portlet and application names in case they contain characters that would + // cause an improper Application name + portletApplicationName = portletApplicationName.replace('/', '_'); + portletName = portletName.replace('/', '_'); + MetaInfo metaInfo = portlet.getInfo().getMeta(); LocalizedString keywordsLS = metaInfo.getMetaValue(MetaInfo.KEYWORDS); - // Process keywords + // Set<String> categoryNames = new HashSet<String>(); + + // Process keywords if (keywordsLS != null) { String keywords = keywordsLS.getDefaultString(); @@ -523,89 +492,62 @@ // Process category names for (String categoryName : categoryNames) { - CategoryDefinition category = getOrCreateCategoryDefinition(categoryName, permissions); + CategoryDefinition category = registry.getCategory(categoryName); // + if (category == null) + { + category = registry.createCategory(categoryName); + category.setDisplayName(categoryName); + category.setAccessPermissions(permissions); + } + + // ContentDefinition app = category.getContentMap().get(portletName); if (app == null) { + LocalizedString descriptionLS = metaInfo.getMetaValue(MetaInfo.DESCRIPTION); + LocalizedString displayNameLS = metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME); + String displayName = getLocalizedStringValue(displayNameLS, portletName); + + ContentType<?> contentType; + String contentId; + if (remote) + { + contentType = WSRP.CONTENT_TYPE; + contentId = portlet.getContext().getId(); + displayName += REMOTE_DISPLAY_NAME_SUFFIX; // add remote to display name to make it more obvious that the portlet is remote + } + else + { + contentType = Portlet.CONTENT_TYPE; + contentId = info.getApplicationName() + "/" + info.getName(); + } + // Check if the portlet has already existed in this category List<Application> applications = load(category).getApplications(); boolean isExist = false; - for (Application categoryApp : applications) + for (Application application : applications) { - if (categoryApp.getContentId().equals(application.getContentId())) + if (application.getContentId().equals(contentId)) { isExist = true; break; } } - + if (!isExist) { - app = createContentFrom(application, category); + app = category.createContent(portletName, contentType, contentId); + app.setDisplayName(displayName); + app.setDescription(getLocalizedStringValue(descriptionLS, portletName)); + app.setAccessPermissions(permissions); } } } } } - public Application createApplicationFrom(org.gatein.pc.api.Portlet portlet) - { - PortletInfo info = portlet.getInfo(); - - String portletName = portlet.getContext().getId(); - - portletName = sanitize(portletName); - - MetaInfo metaInfo = portlet.getInfo().getMeta(); - - ArrayList<String> permissions = new ArrayList<String>(); - permissions.add(UserACL.EVERYONE); - - // Additionally categorise the portlet as remote - boolean remote = portlet.isRemote(); - - LocalizedString descriptionLS = metaInfo.getMetaValue(MetaInfo.DESCRIPTION); - LocalizedString displayNameLS = metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME); - String displayName = getLocalizedStringValue(displayNameLS, portletName); - - ApplicationType appType; - String contentId; - if (remote) - { - appType = ApplicationType.WSRP_PORTLET; - contentId = portlet.getContext().getId(); - displayName += REMOTE_DISPLAY_NAME_SUFFIX; // add remote to display name to make it more obvious that the portlet is remote - } - else - { - appType = ApplicationType.PORTLET; - contentId = info.getApplicationName() + "/" + info.getName(); - } - - Application app = new Application(); - app.setApplicationName(portletName); - app.setType(appType); - app.setDisplayName(displayName); - app.setDescription(getLocalizedStringValue(descriptionLS, portletName)); - app.setAccessPermissions(permissions); - app.setContentId(contentId); - - return app; - } - - /** - * Sanitizes the specified name in case it contains characters that would cause improper Application name. - * - * @param name - * @return - */ - private String sanitize(String name) - { - return name.replace('/', '_'); - } - private boolean isApplicationType(Application app, ApplicationType<?>... appTypes) { if (appTypes == null || appTypes.length == 0) Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/pc/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -19,62 +19,55 @@ --> -<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.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> - </parent> +<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.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.2.0-M02-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.pc</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component PC integration</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.pc</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component PC integration</name> - <dependencies> + <dependencies> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - - </dependencies> - - <build> - </build> + </dependencies> + + <build> + </build> </project> Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -22,7 +22,6 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.services.resources.ResourceBundleService; -import org.gatein.api.GateIn; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.bridge.BridgeInterceptor; import org.gatein.pc.federation.FederatingPortletInvoker; @@ -67,7 +66,7 @@ * We enforce the dependency with the ResourceBundleService since it must be stared before the * <code>portletApplicationRegistry</code> * - * @param context the exo container context + * @param context the exo container context * @param resourceBundleService the resource bundle service that is here for the sake of creating a dependency */ public ExoKernelIntegration(ExoContainerContext context, ResourceBundleService resourceBundleService) @@ -84,15 +83,13 @@ // The portlet application deployer portletApplicationRegistry = new ExoPortletApplicationDeployer(); portletApplicationRegistry.setContainerPortletInvoker(containerPortletInvoker); - GateIn gateIn = (GateIn)container.getComponentInstanceOfType(GateIn.class); - ((ExoPortletApplicationDeployer)portletApplicationRegistry).setAPIInstance(gateIn); //Container Stack ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher(); - + // Federating portlet invoker FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService(); - + EventPayloadInterceptor eventPayloadInterceptor = new EventPayloadInterceptor(); eventPayloadInterceptor.setNext(portletContainerDispatcher); RequestAttributeConversationInterceptor requestAttributeConversationInterceptor = Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -1,16 +1,16 @@ /** * 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 @@ -21,7 +21,6 @@ import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.commons.utils.Safe; -import org.gatein.api.GateIn; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer; @@ -47,9 +46,6 @@ /** . */ private final Logger log = LoggerFactory.getLogger(ExoPortletApplicationDeployer.class); - /** . */ - private GateIn gateIn; - @Override protected PortletApplication10MetaData buildPortletApplicationMetaData(WebApp webApp) { @@ -85,7 +81,6 @@ log.warn("The global portlet metadata is not configured"); } - webApp.getServletContext().setAttribute(GateIn.GATEIN_API, gateIn); } return md; } @@ -111,9 +106,4 @@ Safe.close(in); } } - - public void setAPIInstance(GateIn gateIn) - { - this.gateIn = gateIn; - } } Modified: portal/trunk/component/pom.xml =================================================================== --- portal/trunk/component/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -45,7 +45,6 @@ <module>scripting</module> <module>management</module> <module>identity</module> - <module>api-impl</module> </modules> </project> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -225,11 +225,6 @@ public boolean hasPermission(PortalConfig pconfig) { Identity identity = getIdentity(); - return hasPermission(identity, pconfig); - } - - public boolean hasPermission(Identity identity, PortalConfig pconfig) - { if (hasPermission(identity, pconfig.getEditPermission())) { pconfig.setModifiable(true); Modified: portal/trunk/examples/portlets/api/pom.xml =================================================================== --- portal/trunk/examples/portlets/api/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/examples/portlets/api/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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"> <modelVersion>4.0.0</modelVersion>  -<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - version="1.0"> + <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="1.0"> <portlet> - <description xml:lang="EN">Public Render Parameter API Portlet</description> - <portlet-name>PRPAPIPortlet</portlet-name> - <display-name xml:lang="EN">Public Render Parameter API Portlet</display-name> - <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class> + <description xml:lang="EN">Public Render Parameter API Portlet</description> + <portlet-name>PRPAPIPortlet</portlet-name> + <display-name xml:lang="EN">Public Render Parameter API Portlet</display-name> + <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - </supports> + <supports> + <mime-type>text/html</mime-type> + </supports> - <portlet-info> - <title>PRP Portlet</title> - <short-title>PRP Portlet</short-title> - <keywords>Sample</keywords> - </portlet-info> + <portlet-info> + <title>PRP Portlet</title> + <short-title>PRP Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> - <supported-public-render-parameter>navigation_uri</supported-public-render-parameter> - <supported-public-render-parameter>page_name</supported-public-render-parameter> - <supported-public-render-parameter>site_type</supported-public-render-parameter> - <supported-public-render-parameter>site_name</supported-public-render-parameter> - <supported-public-render-parameter>window_width</supported-public-render-parameter> - <supported-public-render-parameter>window_height</supported-public-render-parameter> - <supported-public-render-parameter>window_show_info_bar</supported-public-render-parameter> + <supported-public-render-parameter>navigation_uri</supported-public-render-parameter> + <supported-public-render-parameter>page_name</supported-public-render-parameter> + <supported-public-render-parameter>site_type</supported-public-render-parameter> + <supported-public-render-parameter>site_name</supported-public-render-parameter> + <supported-public-render-parameter>window_width</supported-public-render-parameter> + <supported-public-render-parameter>window_height</supported-public-render-parameter> + <supported-public-render-parameter>window_show_info_bar</supported-public-render-parameter> - </portlet> + </portlet> - <portlet> - <description xml:lang="EN">Navigation Portlet Example using GateIn's public API</description> - <portlet-name>NavigationAPIPortlet</portlet-name> - <display-name xml:lang="EN">API Navigation Portlet</display-name> - <portlet-class>org.gatein.portal.samples.api.NavigationPortlet</portlet-class> + <public-render-parameter> + <identifier>navigation_uri</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigation_uri</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>page_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:page_name</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>site_type</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_type</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>site_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_name</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_width</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_width</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_height</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_height</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_show_info_bar</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_show_info_bar</qname> + </public-render-parameter> - <supports> - <mime-type>text/html</mime-type> - </supports> - - <portlet-info> - <title>API Navigation Portlet</title> - <short-title>Navigation Portlet</short-title> - <keywords>Sample</keywords> - </portlet-info> - </portlet> - <portlet> - <description xml:lang="EN">Content Registry Portlet Example using GateIn's public API</description> - <portlet-name>ContentRegistryAPIPortlet</portlet-name> - <display-name xml:lang="EN">API Content Registry Portlet</display-name> - <portlet-class>org.gatein.portal.samples.api.ContentRegistryPortlet</portlet-class> - - <supports> - <mime-type>text/html</mime-type> - </supports> - - <portlet-info> - <title>API Content Registry Portlet</title> - <short-title>Content Registry Portlet</short-title> - <keywords>Sample</keywords> - </portlet-info> - </portlet> - - <portlet> <description xml:lang="EN">Locale URL Portlet</description> <portlet-name>LocaleURLPortlet</portlet-name> <display-name xml:lang="EN">A Portlet example demonstrating locale selection in URL</display-name> Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -1,6 +1,5 @@ <?xml version="1.0"?> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -19,7 +18,7 @@  <jbossas.version>5.1.0.GA</jbossas.version> <jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version> - + <servers.dir>${project.basedir}/../../servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> <jbossas.name>jboss-${jbossas.version}</jbossas.name> @@ -295,20 +294,6 @@ <artifactId>picketlink-idm-ldap</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> -  <dependency> <groupId>org.gatein.common</groupId> @@ -533,9 +518,9 @@  <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> </dependency> <dependency> <groupId>javax.activation</groupId> @@ -667,8 +652,8 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -837,19 +822,19 @@ <version>1.2.3</version> </dependency> <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.7</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>0.7</version> </dependency> <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - <version>0.7</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + <version>0.7</version> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>r706</version> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + <version>r706</version> </dependency> <dependency> @@ -966,17 +951,17 @@ <requireProperty> <property>jbossas.path</property> <message>" - You must define the property 'jbossas.path' - to give the path to the directory where you store your applications servers. - " +You must define the property 'jbossas.path' +to give the path to the directory where you store your applications servers. +" </message> </requireProperty> <requireProperty> <property>jbossas.name</property> <message>" - You must define the property 'jbossas.name' - to give the name of the directory where JBoss AS is stored. - " +You must define the property 'jbossas.name' +to give the name of the directory where JBoss AS is stored. +" </message> </requireProperty> <requireFilesExist> @@ -984,14 +969,13 @@ <file>${jbossas.path}/${jbossas.name}/</file> </files> <message>" - The following JBoss AS directory doesn't exist : +The following JBoss AS directory doesn't exist : ${jbossas.path}/${jbossas.name} - Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to - the correct location of servers directory - and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. - You can also use -Pdownload to automatically provide JBoss AS instance. - " +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory +and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules> @@ -1027,9 +1011,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1038,8 +1022,8 @@ </plugin> </plugins> </build> + - <profiles> <profile> <id>pkg-jbossas5</id> @@ -1066,9 +1050,9 @@ <requireProperty> <property>exo.projects.directory.dependencies</property> <message>" - You must define the property 'exo.projects.directory.dependencies' - to specify the path to the directory where you store your application servers. - " +You must define the property 'exo.projects.directory.dependencies' +to specify the path to the directory where you store your application servers. +" </message> </requireProperty> </rules> @@ -1085,9 +1069,9 @@ <requireProperty> <property>exo.projects.app.jboss5.version</property> <message>" - You must define the property 'exo.projects.app.jboss5.version' - to specify the name of the directory where JBoss AS is stored. - " +You must define the property 'exo.projects.app.jboss5.version' +to specify the name of the directory where JBoss AS is stored. +" </message> </requireProperty> </rules> @@ -1108,15 +1092,13 @@ </file> </files> <message>" - The following JBoss AS directory doesn't exist : +The following JBoss AS directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.jboss5.version} - Make JBoss AS instance available at that location, or use - -Dexo.projects.directory.dependencies=PATH to point to the correct location - of servers directory and/or -Dexo.projects.app.jboss5.version=NAME to point to the - correct directory under the servers directory. - You can also use -Pdownload to automatically provide JBoss AS instance. - " +Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location +of servers directory and/or -Dexo.projects.app.jboss5.version=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules> @@ -1126,10 +1108,10 @@ <execution> <id>check-jboss-environment-ready</id> <phase>none</phase> - </execution> + </execution> </executions> </plugin> - + </plugins> </build> </profile> @@ -1169,36 +1151,35 @@ </goals> <configuration> <target> - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}" /> <fail if="jbossas.dir.exists">" - Destination JBossAS directory exists already: +Destination JBossAS directory exists already: ${jbossas.dir} - Either rename it, delete it, or deactivate -Pdownload profile. - " +Either rename it, delete it, or deactivate -Pdownload profile. +" </fail> - <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/> + <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip" />  - <mkdir dir="${jbossas.path}"/> + <mkdir dir="${jbossas.path}" />  <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> - <property name="dest" value="${jbossas.zip}"/> + <target name="download-jboss" /> + <property name="url" value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..." /> + <property name="dest" value="${jbossas.zip}" /> </ant>  - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1208,7 +1189,7 @@ </plugins> </build> </profile> - + <profile> <id>bundle</id> <build> @@ -1226,10 +1207,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip" - basedir="${jbossas.target.dir}"/> - <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip" - classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip" basedir="${jbossas.target.dir}" /> + <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> @@ -1238,5 +1217,5 @@ </plugins> </build> </profile> - </profiles> + </profiles> </project> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -1,6 +1,5 @@ <?xml version="1.0"?> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -339,20 +338,6 @@ <artifactId>pc-bridge</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> -  <dependency> <groupId>org.gatein.mop</groupId> @@ -531,9 +516,9 @@  <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> </dependency> <dependency> <groupId>javax.activation</groupId> @@ -658,8 +643,8 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -828,19 +813,19 @@ <version>1.2.3</version> </dependency> <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.7</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>0.7</version> </dependency> <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - <version>0.7</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + <version>0.7</version> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>r706</version> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + <version>r706</version> </dependency> <dependency> @@ -957,17 +942,17 @@ <requireProperty> <property>jbossas.path</property> <message>" - You must define the property 'jbossas.path' - to give the path to the directory where you store your applications servers. - " +You must define the property 'jbossas.path' +to give the path to the directory where you store your applications servers. +" </message> </requireProperty> <requireProperty> <property>jbossas.name</property> <message>" - You must define the property 'jbossas.name' - to give the name of the directory where JBoss AS is stored. - " +You must define the property 'jbossas.name' +to give the name of the directory where JBoss AS is stored. +" </message> </requireProperty> <requireFilesExist> @@ -975,14 +960,13 @@ <file>${jbossas.path}/${jbossas.name}/</file> </files> <message>" - The following JBoss AS directory doesn't exist : +The following JBoss AS directory doesn't exist : ${jbossas.path}/${jbossas.name} - Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to - the correct location of servers directory - and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. - You can also use -Pdownload to automatically provide JBoss AS instance. - " +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory +and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules> @@ -1018,9 +1002,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1057,9 +1041,9 @@ <requireProperty> <property>exo.projects.directory.dependencies</property> <message>" - You must define the property 'exo.projects.directory.dependencies' - to specify the path to the directory where you store your application servers. - " +You must define the property 'exo.projects.directory.dependencies' +to specify the path to the directory where you store your application servers. +" </message> </requireProperty> </rules> @@ -1076,9 +1060,9 @@ <requireProperty> <property>exo.projects.app.jboss6.version</property> <message>" - You must define the property 'exo.projects.app.jboss6.version' - to specify the name of the directory where JBoss AS is stored. - " +You must define the property 'exo.projects.app.jboss6.version' +to specify the name of the directory where JBoss AS is stored. +" </message> </requireProperty> </rules> @@ -1099,15 +1083,13 @@ </file> </files> <message>" - The following JBoss AS directory doesn't exist : +The following JBoss AS directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.jboss6.version} - Make JBoss AS instance available at that location, or use - -Dexo.projects.directory.dependencies=PATH to point to the correct location - of servers directory and/or -Dexo.projects.app.jboss6.version=NAME to point to the - correct directory under the servers directory. - You can also use -Pdownload to automatically provide JBoss AS instance. - " +Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location +of servers directory and/or -Dexo.projects.app.jboss6.version=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" </message> </requireFilesExist> </rules> @@ -1160,37 +1142,35 @@ </goals> <configuration> <target> - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}" /> <fail if="jbossas.dir.exists">" - Destination JBossAS directory exists already: +Destination JBossAS directory exists already: ${jbossas.dir} - Either rename it, delete it, or deactivate -Pdownload profile. - " +Either rename it, delete it, or deactivate -Pdownload profile. +" </fail> - <property name="jbossas.zip" - value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip"/> + <property name="jbossas.zip" value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip" />  - <mkdir dir="${jbossas.path}"/> + <mkdir dir="${jbossas.path}" />  <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> - <property name="dest" value="${jbossas.zip}"/> + <target name="download-jboss" /> + <property name="url" value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..." /> + <property name="dest" value="${jbossas.zip}" /> </ant>  - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1218,10 +1198,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" - basedir="${jbossas.target.dir}"/> - <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" - classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" basedir="${jbossas.target.dir}" /> + <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> @@ -1277,7 +1255,7 @@  <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true"> <fileset dir="${project.basedir}/src/main/resources/cdi/jboss"> - <include name="**/*.xml"/> + <include name="**/*.xml" /> </fileset> </copy> </target> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -334,20 +334,6 @@ <artifactId>pc-bridge</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> -  <dependency> <groupId>org.gatein.mop</groupId> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -326,20 +326,6 @@ <artifactId>pc-bridge</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - </dependency> -  <dependency> <groupId>org.gatein.mop</groupId> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/pom.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -50,7 +50,6 @@ <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> <org.gatein.mgmt.version>1.0.0-Beta01</org.gatein.mgmt.version> - <org.gatein.api.version>1.0.0-Beta01</org.gatein.api.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version> @@ -397,23 +396,6 @@ <version>${org.gatein.wsrp.version}</version> </dependency> -  - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>gatein-java-api</artifactId> - <version>${org.gatein.api.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>generic-id-impl</artifactId> - <version>${org.gatein.api.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.api</groupId> - <artifactId>java-api-impl</artifactId> - <version>${project.version}</version> - </dependency> -  <dependency> <groupId>org.exoplatform.portal</groupId> @@ -873,11 +855,11 @@ <maxmem>1024m</maxmem> </configuration> </plugin> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>1.2.2</version> - </plugin> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>1.2.2</version> + </plugin> </plugins> </pluginManagement> <plugins> Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2011-08-16 14:52:03 UTC (rev 7159) @@ -185,17 +185,41 @@ { ExoContainer manager = ExoContainerContext.getCurrentContainer(); - ApplicationRegistryService appRegistry = - (ApplicationRegistryService)manager.getComponentInstance(ApplicationRegistryService.class); - FederatingPortletInvoker portletInvoker = (FederatingPortletInvoker)manager.getComponentInstance(FederatingPortletInvoker.class); Set<Portlet> portlets = remote ? portletInvoker.getRemotePortlets() : portletInvoker.getLocalPortlets(); - List<Application> applications = new ArrayList<Application>(portlets.size()); for (Portlet portlet : portlets) { - applications.add(appRegistry.createApplicationFrom(portlet)); + PortletInfo info = portlet.getInfo(); + + LocalizedString descriptionLS = info.getMeta().getMetaValue(MetaInfo.DESCRIPTION); + LocalizedString displayNameLS = info.getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); + + String portletName = info.getName(); + Application app = new Application(); + app.setApplicationName(portletName); + // app.setApplicationGroup(info.getApplicationName()); + ApplicationType appType; + String contentId; + String displayName = Util.getLocalizedStringValue(displayNameLS, portletName); + if (remote) + { + appType = ApplicationType.WSRP_PORTLET; + contentId = portlet.getContext().getId(); + displayName += ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX; // add remote to display name to make it more obvious that the portlet is remote + } + else + { + appType = ApplicationType.PORTLET; + contentId = info.getApplicationName() + "/" + info.getName(); + } + app.setType(appType); + app.setDisplayName(displayName); + app.setDescription(Util.getLocalizedStringValue(descriptionLS, portletName)); + app.setAccessPermissions(new ArrayList<String>()); + app.setContentId(contentId); + applications.add(app); } return applications; Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-16 14:20:00 UTC (rev 7158) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-16 14:52:03 UTC (rev 7159) @@ -31,7 +31,6 @@ <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> <import>war:/conf/jcr/jcr-configuration.xml</import> - <import>war:/conf/api/api-configuration.xml</import>

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2011