tag:old.nabble.com,2006:forum-196
Nabble - Apache Portals
2009-12-18T12:06:04Z
Apache Portals is a collaborative software development project dedicated to providing robust, full-featured, commercial-quality, and freely available Portal related software on a wide variety of platforms and programming languages. Apache Portals home is <a href="http://portals.apache.org/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26848977
svn commit: r892363 - in /portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site: site.xml xdoc/guide-rest-api.xml
2009-12-18T12:06:04Z
2009-12-18T12:06:04Z
woonsan
Author: woonsan
<br>Date: Fri Dec 18 20:06:02 2009
<br>New Revision: 892363
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=892363&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=892363&view=rev</a><br>Log:
<br>JS2-1087: Adding initial documentation for Jetspeed REST API.
<br>To-dos: complete all apis
<br><br>Added:
<br> portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml (with props)
<br>Modified:
<br> portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml
<br><br>Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml?rev=892363&r1=892362&r2=892363&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml?rev=892363&r1=892362&r2=892363&view=diff</a><br>==============================================================================
<br>--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml (original)
<br>+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml Fri Dec 18 20:06:02 2009
<br>@@ -95,6 +95,7 @@
<br> <menu name="APIs" >
<br> <item name="Jetspeed Java API" href="../apidocs/jetspeed-api/index.html" />
<br> <item name="Jetspeed AJAX API" href="guide-ajax-api.html" />
<br>+ <item name="Jetspeed REST API" href="guide-rest-api.html" />
<br> <item name="Full Javadocs" href="../apidocs/index.html" />
<br> </menu>
<br>
<br><br>Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml?rev=892363&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml?rev=892363&view=auto</a><br>==============================================================================
<br>--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml (added)
<br>+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml Fri Dec 18 20:06:02 2009
<br>@@ -0,0 +1,321 @@
<br>+<?xml version="1.0"?>
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+<document>
<br>+ <properties>
<br>+ <title>REST API</title>
<br>+ <subtitle>Documentation for Jetspeed REST API</subtitle>
<br>+ <authors>
<br>+ <person name="Woonsan Ko" email="<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26848977&i=0" target="_top" rel="nofollow">woonsan@...</a>"/>
<br>+ </authors>
<br>+ </properties>
<br>+ <body>
<br>+<section name="Jetspeed REST API Overview">
<br>+<p>
<br>+The Jetspeed REST API is an RESTful web services for clients (including AJAX clients) for making HTTP requests to Jetspeed services.
<br>+</p>
<br>+<p>
<br>+The URLs for the Jetspeed REST API starts with the following:
<br>+<source><![CDATA[
<br>+<a href="http://hostname/contextname/services/" target="_top" rel="nofollow">http://hostname/contextname/services/</a><br>+]]></source>
<br>+</p>
<br>+<p>
<br>+Typical use cases:
<br>+</p>
<br>+<ul>
<br>+ <li><b>Page Customization and Portlet Placement</b> - To move, copy, add, or remove portlets on a page</li>
<br>+ <li><b>Layout Selection</b> - change the layout (number of rows and columns, size of columns) on a page</li>
<br>+ <li><b>Theme and Decorator Selection</b> - change the page theme and portlet decorators on a page.</li>
<br>+ <li><b>Portlet Selectors</b> - provide a select-list of portlets to the end user</li>
<br>+ <li><b>Security Configuration</b> - configure the security constraints or policy on a resource (page, portlet, folder, link, fragment), or portal wide</li>
<br>+ <li><b>Menu Configuration</b> - create and edit menus for the Jetspeed Site</li>
<br>+ <li><b>General Administration</b> - all use cases for general administration have not yet been explored.</li>
<br>+</ul>
<br>+<subsection name='Secured Access'>
<br>+<p>
<br>+All Jetspeed REST API requests run through
<br>+a standard Jetspeed <a href='guide-pipeline.html'>Pipeline</a> request. This means that you can configure your web
<br>+request with the usual array of Jetspeed components. The default REST services pipeline secures
<br>+access to all requests. Each service may have its own security constraints. All
<br>+requests made to a page will use the declarative security constraints configured for that page.
<br>+REST request actions are enforced under edit or view mode, depending on the nature of the action.
<br>+</p>
<br>+</subsection>
<br>+<subsection name='Flexible Message Media Types for Message Producers and Consumers'>
<br>+<p>
<br>+All Jetspeed REST API support dual Message Media Types for Message producers and consumers: 'application/json' and 'application/xml'
<br>+with help of the underlying <a href="<a href="http://cxf.apache.org" target="_top" rel="nofollow">http://cxf.apache.org</a>">Apache CXF</a> JAX-RS Server.
<br>+Typically, web client applications can use JSON marshaling/unmarshaling by adding '_type=json' parameter in the request URLs.
<br>+If the parameter is '_type=xml', then the messages are XML messages.
<br>+If the '_type' parameter is not set by the client, the Jetspeed REST API read the 'Accept' HTTP request header to decide
<br>+which is proper for the web client. Please see the documents of Apache CXF for details.
<br>+</p>
<br>+</subsection>
<br>+<subsection name='XML Schema Support'>
<br>+<p>
<br>+You can also retrieve XML Schema document for each service simply by adding '?_wadl' query string.
<br>+Apache CXF JAX-RS server, on which Jetspeed REST API depends, generates the XML Schema document for the service automatically.
<br>+For example, you can request the following URL to retrieve the XML Schema document for 'Get Portlet Application' service of 'Portlet Registry Service'.
<br>+<source><![CDATA[
<br>+<a href="http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_wadl" target="_top" rel="nofollow">http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_wadl</a><br>+]]></source>
<br>+</p>
<br>+</subsection>
<br>+</section>
<br>+<section name='Portlet Registry Service'>
<br>+<p>
<br>+The Portlet Registry Service is a HTTP request-based API, communicating over a simple REST (Representational State Transfer) protocol,
<br>+providing information and management functionality on portlet applications and portlet definitions.
<br>+This service is accessed over HTTP via the "/services/portletregistry" path on the portal URL:
<br>+<source><![CDATA[
<br>+<a href="http://hostname/contextname/services/portletregistry/" target="_top" rel="nofollow">http://hostname/contextname/services/portletregistry/</a><br>+]]></source>
<br>+</p>
<br>+
<br>+<subsection name='Get Portlet Applications'>
<br>+<table>
<br>+ <tr>
<br>+ <td>Entry path</td>
<br>+ <td>/application/</td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>Description:</td>
<br>+ <td>Get portlet applications based on the path parameter for application name.</td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>Parameters</td>
<br>+ <td>
<br>+ <table>
<br>+ <tr>
<br>+ <th>Type</th>
<br>+ <th>Name</th>
<br>+ <th>Example value</th>
<br>+ <th>Description</th>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>PATH</td>
<br>+ <td>name</td>
<br>+ <td>/demo/</td>
<br>+ <td>
<br>+ Portlet application name.
<br>+ If the portlet application name path parameter is not provided, then
<br>+ all portlet applications are retrieved.
<br>+ </td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>QUERY</td>
<br>+ <td>query</td>
<br>+ <td>tool</td>
<br>+ <td>Search query string to filter the results.</td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>QUERY</td>
<br>+ <td>begin</td>
<br>+ <td>0</td>
<br>+ <td>The begin index of the page to be selected from the result.</td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>QUERY</td>
<br>+ <td>max</td>
<br>+ <td>10</td>
<br>+ <td>The maximum page size to be selected from the result.</td>
<br>+ </tr>
<br>+ </table>
<br>+ </td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>REST API examples:</td>
<br>+ <td>
<br>+<source><![CDATA[
<br>+<a href="http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json" target="_top" rel="nofollow">http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json</a><br>+
<br>+<a href="http://localhost:8080/jetspeed/services/portletregistry/application/?_type=json&query=demo&begin=0&max=10" target="_top" rel="nofollow">http://localhost:8080/jetspeed/services/portletregistry/application/?_type=json&query=demo&begin=0&max=10</a><br>+]]></source>
<br>+ </td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>JSON Response Example:</td>
<br>+ <td>
<br>+<source><![CDATA[
<br>+{
<br>+ "beginIndex":-1,
<br>+ "totalSize":1,
<br>+ "applications":[
<br>+ {
<br>+ "name":"demo",
<br>+ "contextPath":"/demo",
<br>+ "applicationType":0,
<br>+ "defaultNamespace":"",
<br>+ "revision":2,
<br>+ "checksum":2832348922,
<br>+ "displayNames":[
<br>+ {
<br>+ "value":"Demoportlets",
<br>+ "lang":"en",
<br>+ "localeString":"en"
<br>+ }
<br>+ ],
<br>+ "descriptions":[
<br>+ {
<br>+ "value":"Demo Portlets Applications",
<br>+ "lang":"en",
<br>+ "localeString":"en"
<br>+ }
<br>+ ],
<br>+ "metadata":
<br>+ {
<br>+ "fields":[
<br>+ {
<br>+ "name":"title",
<br>+ "value":"Title 1",
<br>+ "localeString":"en"
<br>+ },
<br>+ {
<br>+ "name":"title",
<br>+ "value":"Eng Title",
<br>+ "localeString":"en"
<br>+ }
<br>+ ]
<br>+ },
<br>+ "containerRuntimeOptions":[]
<br>+ }
<br>+ ]
<br>+}
<br>+]]></source>
<br>+
<br>+ </td>
<br>+ </tr>
<br>+ <tr>
<br>+ <td>XML Response Example:</td>
<br>+ <td>
<br>+<source><![CDATA[
<br>+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<br>+<data>
<br>+ <beginIndex>-1</beginIndex>
<br>+ <totalSize>1</totalSize>
<br>+ <applications>
<br>+ <application>
<br>+ <applicationType>0</applicationType>
<br>+ <checksum>2832348922</checksum>
<br>+ <containerRuntimeOptions/>
<br>+ <contextPath>/demo</contextPath>
<br>+ <defaultNamespace/>
<br>+ <descriptions>
<br>+ <description>
<br>+ <lang>en</lang>
<br>+ <localeString>en</localeString>
<br>+ <value>Demo Portlets Applications</value>
<br>+ </description>
<br>+ </descriptions>
<br>+ <displayNames>
<br>+ <displayName>
<br>+ <lang>en</lang>
<br>+ <localeString>en</localeString>
<br>+ <value>Demoportlets</value>
<br>+ </displayName>
<br>+ </displayNames>
<br>+ <metadata>
<br>+ <fields>
<br>+ <field>
<br>+ <localeString>en</localeString>
<br>+ <name>title</name>
<br>+ <value>Title 1</value>
<br>+ </field>
<br>+ <field>
<br>+ <localeString>en</localeString>
<br>+ <name>title</name>
<br>+ <value>Eng Title</value>
<br>+ </field>
<br>+ </fields>
<br>+ </metadata>
<br>+ <name>demo</name>
<br>+ <revision>2</revision>
<br>+ </application>
<br>+ </applications>
<br>+</data>
<br>+]]></source>
<br>+
<br>+ </td>
<br>+ </tr>
<br>+</table>
<br>+</subsection>
<br>+
<br>+
<br>+
<br>+</section>
<br>+
<br>+<section name='Spring Assembly'>
<br>+<p>
<br>+The Jetspeed REST Services are configured in the Spring Assembly.
<br>+Here is the core part of the Spring Assembly. Each service component is configured in the Ajax Service.
<br>+</p>
<br>+<source><![CDATA[
<br>+ <!--
<br>+ The internal server factory.
<br>+ Each JAX-RS service component is registered by "resourceProvider" property.
<br>+ -->
<br>+
<br>+ <bean id="cxfJaxrsServerFactoryBean" class="org.apache.cxf.jaxrs.JAXRSServerFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="address" value="/" />
<br>+ <property name="destinationFactory" ref="cxfDestinationFactory" />
<br>+ <property name="providers">
<br>+ <list>
<br>+ <ref bean="jaxrsJsonProvider" />
<br>+ </list>
<br>+ </property>
<br>+ <property name="resourceProviders">
<br>+ <list>
<br>+
<br>+ <!-- PortletRegistryService component reference -->
<br>+ <bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="jaxrsPortletRegistryService" />
<br>+ </bean>
<br>+
<br>+ <!-- PageLayoutService component reference -->
<br>+ <bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="jaxrsPageLayoutService" />
<br>+ </bean>
<br>+
<br>+ </list>
<br>+ </property>
<br>+ </bean>
<br>+
<br>+ <!-- Portlet Registry JAX-RS Service -->
<br>+ <bean id="jaxrsPortletRegistryService" class="org.apache.jetspeed.services.rest.PortletRegistryService">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="org.apache.jetspeed.security.SecurityAccessController" />
<br>+ <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<br>+ <constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
<br>+ </bean>
<br>+
<br>+ <!-- Portal Page Management JAX-RS Service -->
<br>+ <bean id="jaxrsPageLayoutService" class="org.apache.jetspeed.services.rest.PageLayoutService">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="org.apache.jetspeed.layout.PageLayoutComponent" />
<br>+ <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<br>+ <constructor-arg ref="PortletActionSecurityBehavior" />
<br>+ </bean>
<br>+]]></source>
<br>+
<br>+</section>
<br>+</body>
<br>+</document>
<br>+
<br><br>Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/guide-rest-api.xml
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-Portals---General-f197.html" embed="fixTarget[197]" target="_top" >Apache Portals - General</a></p>
tag:old.nabble.com,2006:post-26845554
svn commit: r892288 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp: WEB-INF/view/toolbox/toolbox.jsp images/preview/preview-na.png
2009-12-18T08:00:35Z
2009-12-18T08:00:35Z
woonsan
Author: woonsan
<br>Date: Fri Dec 18 16:00:33 2009
<br>New Revision: 892288
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=892288&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=892288&view=rev</a><br>Log:
<br>JS2-1057: Fixing preview window title
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/images/preview/preview-na.png
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=892288&r1=892287&r2=892288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=892288&r1=892287&r2=892288&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Fri Dec 18 16:00:33 2009
<br>@@ -408,7 +408,8 @@
<br> }
<br>
<br> var nameNode = clone.one('div');
<br>- nameNode.setContent(def.displayNames[0].value);
<br>+ var portletDisplayName = def.displayNames[0].value;
<br>+ nameNode.setContent(portletDisplayName);
<br>
<br> <c:choose>
<br> <c:when test="${editAccess}">
<br>@@ -422,7 +423,9 @@
<br> </c:choose>
<br>
<br> var previewLink = clone.one("[name='preview']");
<br>- Y.Node.getDOMNode(previewLink).setAttribute("portletUniqueName", def.uniqueName);
<br>+ var previewLinkNode = Y.Node.getDOMNode(previewLink);
<br>+ previewLinkNode.setAttribute("portletUniqueName", def.uniqueName);
<br>+ previewLinkNode.setAttribute("portletDisplayName", portletDisplayName);
<br> previewLink.on("click", previewPortlet);
<br>
<br> clone.set("id", "<portlet:namespace/>portletItem-" + def.uniqueName);
<br>@@ -557,7 +560,8 @@
<br> };
<br>
<br> var onPreviewPortletComplete = function(id, o, args) {
<br>- var point = args.complete;
<br>+ var point = args.complete[0];
<br>+ var portletDisplayName = args.complete[1];
<br> var previewNode = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>previewOverlay"));
<br> var windowWidth = window.innerWidth;
<br> var windowHeight = window.innerHeight;
<br>@@ -578,7 +582,7 @@
<br> "<div class='PContentBorder'><div class='PContent'></div></div>" +
<br> "</div>"
<br> );
<br>- previewPortletWindow.one(".PTitleContent").setContent("PickANumber");
<br>+ previewPortletWindow.one(".PTitleContent").setContent(portletDisplayName);
<br> previewPortletWindow.one(".PContent").setContent(o.responseText);
<br> previewOverlay.set("bodyContent", previewPortletWindow);
<br> previewOverlay.render();
<br>@@ -599,13 +603,14 @@
<br> var previewPortlet = function(e) {
<br> var a = Y.Node.getDOMNode(e.target);
<br> var portletUniqueName = a.getAttribute("portletUniqueName");
<br>+ var portletDisplayName = a.getAttribute("portletDisplayName");
<br> if (portletUniqueName) {
<br> if (previewOverlay) {
<br> previewOverlay.hide();
<br> }
<br> var point = [ e.pageX, e.pageY ];
<br> var uri = "${portalContextPath}/portlet/?mode=preview&portlet=" + portletUniqueName + "&entity=" + portletUniqueName;
<br>- var request = Y.io(uri, { on: { complete: onPreviewPortletComplete }, arguments: { complete: point } });
<br>+ var request = Y.io(uri, { on: { complete: onPreviewPortletComplete }, arguments: { complete: [ point, portletDisplayName ] } });
<br> }
<br>
<br> e.halt();
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/images/preview/preview-na.png
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/images/preview/preview-na.png?rev=892288&r1=892287&r2=892288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/images/preview/preview-na.png?rev=892288&r1=892287&r2=892288&view=diff</a><br>==============================================================================
<br>Binary files - no diff available.
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26845554&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26845554&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26844768
svn commit: r892269 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-18T07:06:21Z
2009-12-18T07:06:21Z
woonsan
Author: woonsan
<br>Date: Fri Dec 18 15:06:19 2009
<br>New Revision: 892269
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=892269&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=892269&view=rev</a><br>Log:
<br>JS2-1057: Adding animation effect to preview window
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=892269&r1=892268&r2=892269&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=892269&r1=892268&r2=892269&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Fri Dec 18 15:06:19 2009
<br>@@ -186,14 +186,105 @@
<br> </tr>
<br> </table>
<br>
<br>-<div id="<portlet:namespace/>previewPanel" style="BACKGROUND: #eee; BORDER: lightgrey solid 1px; POSITION: absolute; Z-INDEX: 1000; VISIBILITY: hidden">
<br>- <div></div>
<br>- <div align="right"><a href="#"><fmt:message key="toolbox.label.close"/></a></div>
<br>+<div id="<portlet:namespace/>previewOverlay" style="BACKGROUND-COLOR: #eee; BORDER-LEFT: #fff solid 2px; BORDER-TOP: #fff solid 2px; BORDER-RIGHT: #aaa solid 2px; BORDER-BOTTOM: #aaa solid 2px; DISPLAY: none; PADDING: 5px">
<br>+ <div class="yui-widget-hd"><h2><fmt:message key="toolbox.label.preview"/></h2></div>
<br>+ <div class="yui-widget-bd"></div>
<br>+ <div class="yui-widget-ft" align="right"><a id="<portlet:namespace/>previewOverlayClose" href="#"><fmt:message key="toolbox.label.close"/></a></div>
<br> </div>
<br>
<br> <script language="javascript">
<br>-YUI().use('jetui-portal', 'io', 'json', 'node', 'cookie', function(Y) {
<br>-
<br>+YUI().use('jetui-portal', 'io', 'json', 'node', 'cookie', 'overlay', 'anim', 'plugin', function(Y) {
<br>+
<br>+ var previewOverlay = null;
<br>+
<br>+ function AnimPlugin(config) {
<br>+ AnimPlugin.superclass.constructor.apply(this, arguments);
<br>+ }
<br>+
<br>+ AnimPlugin.NS = "fx";
<br>+ AnimPlugin.NAME = "animPlugin";
<br>+ AnimPlugin.ATTRS = {
<br>+ duration : { value: 0.1 },
<br>+ animVisible : {
<br>+ valueFn : function() {
<br>+ var host = this.get("host");
<br>+ var boundingBox = host.get("boundingBox");
<br>+ var anim = new Y.Anim({
<br>+ node: boundingBox,
<br>+ to: { opacity: 1 },
<br>+ duration: this.get("duration")
<br>+ });
<br>+ if (!host.get("visible")) {
<br>+ boundingBox.setStyle("opacity", 0);
<br>+ }
<br>+ anim.on("destroy", function() {
<br>+ if (Y.UA.ie) {
<br>+ this.get("node").setStyle("opacity", 1);
<br>+ } else {
<br>+ this.get("node").setStyle("opacity", "");
<br>+ }
<br>+ });
<br>+ return anim;
<br>+ }
<br>+ },
<br>+ animHidden : {
<br>+ valueFn : function() {
<br>+ return new Y.Anim({
<br>+ node: this.get("host").get("boundingBox"),
<br>+ to: { opacity: 0 },
<br>+ duration: this.get("duration")
<br>+ });
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ Y.extend(AnimPlugin, Y.Plugin.Base, {
<br>+ initializer : function(config) {
<br>+ this._bindAnimVisible();
<br>+ this._bindAnimHidden();
<br>+ this.after("animVisibleChange", this._bindAnimVisible);
<br>+ this.after("animHiddenChange", this._bindAnimHidden);
<br>+ this.doBefore("_uiSetVisible", this._uiAnimSetVisible);
<br>+ },
<br>+ destructor : function() {
<br>+ this.get("animVisible").destroy();
<br>+ this.get("animHidden").destroy();
<br>+ },
<br>+ _uiAnimSetVisible : function(val) {
<br>+ if (this.get("host").get("rendered")) {
<br>+ if (val) {
<br>+ this.get("animHidden").stop();
<br>+ this.get("animVisible").run();
<br>+ } else {
<br>+ this.get("animVisible").stop();
<br>+ this.get("animHidden").run();
<br>+ }
<br>+ return new Y.Do.Prevent("AnimPlugin prevented default show/hide");
<br>+ }
<br>+ },
<br>+ _uiSetVisible : function(val) {
<br>+ var host = this.get("host");
<br>+ var hiddenClass = host.getClassName("hidden");
<br>+ if (!val) {
<br>+ host.get("boundingBox").addClass(hiddenClass);
<br>+ } else {
<br>+ host.get("boundingBox").removeClass(hiddenClass);
<br>+ }
<br>+ },
<br>+ _bindAnimVisible : function() {
<br>+ var animVisible = this.get("animVisible");
<br>+ animVisible.on("start", Y.bind(function() {
<br>+ this._uiSetVisible(true);
<br>+ }, this));
<br>+ },
<br>+ _bindAnimHidden : function() {
<br>+ var animHidden = this.get("animHidden");
<br>+ animHidden.after("end", Y.bind(function() {
<br>+ this._uiSetVisible(false);
<br>+ }, this));
<br>+ }
<br>+ });
<br>+
<br> var pagination = {
<br> portlet : { uri : null, totalSize : 0, pageSize : ${portletPageSize}, beginIndex : 0 },
<br>
<br>@@ -467,37 +558,61 @@
<br>
<br> var onPreviewPortletComplete = function(id, o, args) {
<br> var point = args.complete;
<br>- var panel = Y.Node.one("#<portlet:namespace/>previewPanel");
<br>- var subPanels = panel.all("DIV");
<br>- subPanels.item(0).setContent(o.responseText);
<br>- var panelDOMNode = Y.Node.getDOMNode(panel);
<br>+ var previewNode = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>previewOverlay"));
<br>+ var windowWidth = window.innerWidth;
<br>+ var windowHeight = window.innerHeight;
<br>+
<br>+ if (!previewOverlay) {
<br>+ Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>previewOverlay")).style.display = "";
<br>+ previewOverlay = new Y.Overlay({
<br>+ contentBox: "#<portlet:namespace/>previewOverlay",
<br>+ xy: [windowWidth, windowHeight],
<br>+ visible: false,
<br>+ plugins : [{fn:AnimPlugin, cfg:{duration:0.5}}]
<br>+ });
<br>+ }
<br>+
<br>+ var previewPortletWindow = Y.Node.create(
<br>+ "<div class='portlet'>" +
<br>+ "<div class='PTitle'><div class='PTitleContent'></div></div>" +
<br>+ "<div class='PContentBorder'><div class='PContent'></div></div>" +
<br>+ "</div>"
<br>+ );
<br>+ previewPortletWindow.one(".PTitleContent").setContent("PickANumber");
<br>+ previewPortletWindow.one(".PContent").setContent(o.responseText);
<br>+ previewOverlay.set("bodyContent", previewPortletWindow);
<br>+ previewOverlay.render();
<br>
<br>- var panelWidth = Math.max(panelDOMNode.offsetWidth, 200);
<br>- var panelHeight = Math.max(panelDOMNode.offsetHeight, 150);
<br> var windowWidth = window.innerWidth;
<br> var windowHeight = window.innerHeight;
<br>- if (point[0] > windowWidth - panelWidth) point[0] = windowWidth - panelWidth;
<br>- if (point[1] > windowHeight - panelHeight) point[1] = windowHeight - panelHeight;
<br>+ var offsetWidth = Math.max(200, previewNode.offsetWidth);
<br>+ var offsetHeight = Math.max(150, previewNode.offsetHeight);
<br>+ point[0] += 10;
<br>+ point[1] -= 10;
<br>+ if (point[0] > windowWidth - offsetWidth) point[0] = windowWidth - offsetWidth;
<br>+ if (point[1] > windowHeight - offsetHeight) point[1] = windowHeight - offsetHeight;
<br>
<br>- panel.setXY(point);
<br>- panelDOMNode.style.visibility = "visible";
<br>+ previewOverlay.move(point[0], point[1]);
<br>+ previewOverlay.show();
<br> };
<br>
<br> var previewPortlet = function(e) {
<br> var a = Y.Node.getDOMNode(e.target);
<br> var portletUniqueName = a.getAttribute("portletUniqueName");
<br> if (portletUniqueName) {
<br>+ if (previewOverlay) {
<br>+ previewOverlay.hide();
<br>+ }
<br>+ var point = [ e.pageX, e.pageY ];
<br> var uri = "${portalContextPath}/portlet/?mode=preview&portlet=" + portletUniqueName + "&entity=" + portletUniqueName;
<br>- var request = Y.io(uri, { on: { complete: onPreviewPortletComplete }, arguments: { complete: [ e.pageX, e.pageY ] } });
<br>+ var request = Y.io(uri, { on: { complete: onPreviewPortletComplete }, arguments: { complete: point } });
<br> }
<br>
<br> e.halt();
<br> };
<br>
<br>- var closePreviewPanel = function(e) {
<br>- var panel = Y.Node.one("#<portlet:namespace/>previewPanel");
<br>- Y.Node.getDOMNode(panel).style.visibility = "hidden";
<br>-
<br>+ var closePreviewOverlay = function(e) {
<br>+ previewOverlay.hide();
<br> e.halt();
<br> };
<br>
<br>@@ -522,6 +637,6 @@
<br>
<br> switchTab(tabId);
<br>
<br>- Y.Node.one("#<portlet:namespace/>previewPanel").one("A").on("click", closePreviewPanel);
<br>+ Y.Node.one("#<portlet:namespace/>previewOverlayClose").on("click", closePreviewOverlay);
<br> });
<br> </script>
<br>\ No newline at end of file
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26844768&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26844768&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26841026
Re: Building js2 with tests?
2009-12-18T01:28:19Z
2009-12-18T01:28:19Z
Ate Douma
Woonsan Ko wrote:
<br>> Hi David,
<br>>
<br>> Can you try `mvn install -P init' before doing `mvn clean install'?
<br>> This is documented here. [1]
<br>>
<br>> [1] <a href="http://portals.apache.org/jetspeed-2/buildguide/maven-2-build.html" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/buildguide/maven-2-build.html</a>, "Building and installing Jetspeed Portal".
<br><br>In addition to that, and what is causing your problem here is that you'll also need to add org.apache.portals.jetspeed-2 as a Maven
<br>pluginGroup in your maven settings.xml which is described here:
<br><br> <a href="http://portals.apache.org/jetspeed-2/buildguide/index.html#PREREQUISITE:_configuration_of_the_Maven_Settings_pluginGroups" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/buildguide/index.html#PREREQUISITE:_configuration_of_the_Maven_Settings_pluginGroups</a><br><br>Ate
<br><div class='shrinkable-quote'><br>>
<br>> Kind regards,
<br>>
<br>> Woonsan
<br>>
<br>>
<br>> ----- Original Message ----
<br>>> From: David Jencks <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=0" target="_top" rel="nofollow">david_jencks@...</a>>
<br>>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=1" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>>> Sent: Fri, December 18, 2009 5:51:15 AM
<br>>> Subject: Re: Building js2 with tests?
<br>>>
<br>>>
<br>>> On Dec 16, 2009, at 11:32 AM, Randy Watler wrote:
<br>>>
<br>>>> David,
<br>>>>
<br>>>> Here is the sequence I use:
<br>>>>
<br>>>>> mvn clean install
<br>>>>> mvn jetspeed:mvn -Dtarget=testdb
<br>>> I'm mystified. When I try this step the build fails trying to find a
<br>>> non-existent plugin: (running with -X, tail end of build):
<br>>>
<br>>> [INFO] Searching repository for plugin with prefix: 'jetspeed'.
<br>>> [DEBUG] Loading plugin prefixes from group: org.apache.maven.plugins
<br>>> [DEBUG] Loading plugin prefixes from group: org.codehaus.mojo
<br>>> [DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>>> [DEBUG] Artifact not found - using stub model: Unable to determine the latest
<br>>> version
<br>>>
<br>>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:LATEST
<br>>>
<br>>>
<br>>>
<br>>> [DEBUG] Using defaults for missing POM
<br>>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:LATEST
<br>>> [DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>>> [DEBUG] Artifact not found - using stub model: Unable to determine the release
<br>>> version
<br>>>
<br>>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:RELEASE
<br>>>
<br>>>
<br>>>
<br>>> [DEBUG] Using defaults for missing POM
<br>>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:RELEASE
<br>>> [INFO] ------------------------------------------------------------------------
<br>>> [ERROR] BUILD ERROR
<br>>> [INFO] ------------------------------------------------------------------------
<br>>> [INFO] The plugin 'org.apache.maven.plugins:maven-jetspeed-plugin' does not
<br>>> exist or no valid version could be found
<br>>> [INFO] ------------------------------------------------------------------------
<br>>> [DEBUG] Trace
<br>>> org.apache.maven.lifecycle.LifecycleExecutionException: The plugin
<br>>> 'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist or no valid
<br>>> version could be found
<br>>> at
<br>>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:1569)
<br>>> at
<br>>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.getMojoDescriptor(DefaultLifecycleExecutor.java:1851)
<br>>> at
<br>>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.segmentTaskListByAggregationNeeds(DefaultLifecycleExecutor.java:462)
<br>>> at
<br>>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:175)
<br>>> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
<br>>> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
<br>>> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
<br>>> at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60)
<br>>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br>>> at
<br>>> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
<br>>> at
<br>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
<br>>> at java.lang.reflect.Method.invoke(Method.java:597)
<br>>> at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
<br>>> at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
<br>>> at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
<br>>> at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
<br>>> Caused by: org.apache.maven.plugin.version.PluginVersionNotFoundException: The
<br>>> plugin 'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist or no
<br>>> valid version could be found
<br>>> at
<br>>> org.apache.maven.plugin.version.DefaultPluginVersionManager.resolvePluginVersion(DefaultPluginVersionManager.java:229)
<br>>> at
<br>>> org.apache.maven.plugin.version.DefaultPluginVersionManager.resolvePluginVersion(DefaultPluginVersionManager.java:91)
<br>>> at
<br>>> org.apache.maven.plugin.DefaultPluginManager.verifyPlugin(DefaultPluginManager.java:179)
<br>>> at
<br>>> org.apache.maven.plugin.DefaultPluginManager.loadPluginDescriptor(DefaultPluginManager.java:1642)
<br>>> at
<br>>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:1540)
<br>>> ... 15 more
<br>>> [INFO] ------------------------------------------------------------------------
<br>>> [INFO] Total time: 4 seconds
<br>>> [INFO] Finished at: Thu Dec 17 20:46:38 PST 2009
<br>>> [INFO] Final Memory: 17M/527M
<br>>> [INFO] ------------------------------------------------------------------------
<br>>>
<br>>>
<br>>> I normally use maven 2.2.1 but tried also with 2.0.9.
<br>>>
<br>>> Has anyone else seen anything like this? Any clues?
<br>>>
<br>>> thanks
<br>>> david jencks
<br>>>
<br>>>>> mvn -P test test
<br>>>> There is also a target to combine the last two steps in the jetspeed plugin,
<br>>> but I don't use that, (due to general pluginphobia).
<br>>>> HTH,
<br>>>>
<br>>>> Randy
<br>>>>
<br>>>> David Jencks wrote:
<br>>>>> I'm trying to figure out just how much the pluto DI changes I'm working on
<br>>> will break js2... so far
<br>>>>> mvn clean install
<br>>>>>
<br>>>>> seems to work, much to my surprise, but if I enable tests I get stuck on some
<br>>> db tests. I looked around briefly but didn't find any instructions.
<br>>>>> What's the secret?
<br>>>>>
<br>>>>> So far I've added this to the root pom properties:
<br>>>>>
<br>>>>>
<br>>> org.apache.derby.jdbc.EmbeddedDriver
<br>>>>>
<br>>> jdbc:derby:${pom.basedir}/target/testdb;create=true
<br>>>>>
<br>>>>>
<br>>>>>
<br>>>>> and get errors like this:
<br>>>>>
<br>>>>> ...
<br>>>>> Caused by: ERROR 42X05: Table/View 'CAPABILITY' does not exist.
<br>>>>> at org.apache.derby.iapi.error.StandardException.newException(Unknown
<br>>> Source)
<br>>>>> at
<br>>> org.apache.derby.impl.sql.compile.FromBaseTable.bindTableDescriptor(Unknown
<br>>> Source)
<br>>>>> at
<br>>> org.apache.derby.impl.sql.compile.FromBaseTable.bindNonVTITables(Unknown Source)
<br>>>>> at org.apache.derby.impl.sql.compile.FromList.bindTables(Unknown
<br>>> Source)
<br>>>>> at
<br>>> org.apache.derby.impl.sql.compile.SelectNode.bindNonVTITables(Unknown Source)
<br>>>>> at
<br>>> org.apache.derby.impl.sql.compile.DMLStatementNode.bindTables(Unknown Source)
<br>>>>> at org.apache.derby.impl.sql.compile.DMLStatementNode.bind(Unknown
<br>>> Source)
<br>>>>> at org.apache.derby.impl.sql.compile.CursorNode.bindStatement(Unknown
<br>>> Source)
<br>>>>> at org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown
<br>>> Source)
<br>>>>> at org.apache.derby.impl.sql.GenericStatement.prepare(Unknown Source)
<br>>>>> at
<br>>> org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext.prepareInternalStatement(Unknown
<br>>> Source)
<br>>>>> ... 98 more
<br>>>>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0, Time elapsed: 8.81 sec <<<
<br>>> FAILURE!
<br>>>>> Results :
<br>>>>>
<br>>>>> Tests in error:
<br>>>>> firstTestSetup(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testNewMimeType(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testNewCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testNewMediaType(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testNewClient(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> testCapabilityRepeat(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>> lastTestTeardown(org.apache.jetspeed.capabilities.TestCapability)
<br>>>>>
<br>>>>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0
<br>>>>>
<br>>>>> thanks
<br>>>>> david jencks
<br>>>>>
<br>>>>>
<br>>>>> ---------------------------------------------------------------------
<br>>>>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>>>>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>>>>
<br>>>>>
<br>>>>
<br>>>> ---------------------------------------------------------------------
<br>>>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=4" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>>>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=5" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=6" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=7" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
<br>>
<br>>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=8" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=9" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=10" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26841026&i=11" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26840879
Re: Building js2 with tests?
2009-12-18T01:14:52Z
2009-12-18T01:14:52Z
Woonsan Ko
Hi David,
<br><br>Can you try `mvn install -P init' before doing `mvn clean install'?
<br>This is documented here. [1]
<br><br>[1] <a href="http://portals.apache.org/jetspeed-2/buildguide/maven-2-build.html" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/buildguide/maven-2-build.html</a>, "Building and installing Jetspeed Portal".
<br><br>Kind regards,
<br><br>Woonsan
<br><br><br>----- Original Message ----
<div class='shrinkable-quote'><br>> From: David Jencks <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=0" target="_top" rel="nofollow">david_jencks@...</a>>
<br>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=1" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>> Sent: Fri, December 18, 2009 5:51:15 AM
<br>> Subject: Re: Building js2 with tests?
<br>>
<br>>
<br>> On Dec 16, 2009, at 11:32 AM, Randy Watler wrote:
<br>>
<br>> > David,
<br>> >
<br>> > Here is the sequence I use:
<br>> >
<br>> > > mvn clean install
<br>> > > mvn jetspeed:mvn -Dtarget=testdb
<br>>
<br>> I'm mystified. When I try this step the build fails trying to find a
<br>> non-existent plugin: (running with -X, tail end of build):
<br>>
<br>> [INFO] Searching repository for plugin with prefix: 'jetspeed'.
<br>> [DEBUG] Loading plugin prefixes from group: org.apache.maven.plugins
<br>> [DEBUG] Loading plugin prefixes from group: org.codehaus.mojo
<br>> [DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>> [DEBUG] Artifact not found - using stub model: Unable to determine the latest
<br>> version
<br>>
<br>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:LATEST
<br>>
<br>>
<br>>
<br>> [DEBUG] Using defaults for missing POM
<br>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:LATEST
<br>> [DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>> [DEBUG] Artifact not found - using stub model: Unable to determine the release
<br>> version
<br>>
<br>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:RELEASE
<br>>
<br>>
<br>>
<br>> [DEBUG] Using defaults for missing POM
<br>> org.apache.maven.plugins:maven-jetspeed-plugin:pom:RELEASE
<br>> [INFO] ------------------------------------------------------------------------
<br>> [ERROR] BUILD ERROR
<br>> [INFO] ------------------------------------------------------------------------
<br>> [INFO] The plugin 'org.apache.maven.plugins:maven-jetspeed-plugin' does not
<br>> exist or no valid version could be found
<br>> [INFO] ------------------------------------------------------------------------
<br>> [DEBUG] Trace
<br>> org.apache.maven.lifecycle.LifecycleExecutionException: The plugin
<br>> 'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist or no valid
<br>> version could be found
<br>> at
<br>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:1569)
<br>> at
<br>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.getMojoDescriptor(DefaultLifecycleExecutor.java:1851)
<br>> at
<br>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.segmentTaskListByAggregationNeeds(DefaultLifecycleExecutor.java:462)
<br>> at
<br>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:175)
<br>> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
<br>> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
<br>> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
<br>> at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60)
<br>> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br>> at
<br>> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
<br>> at
<br>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
<br>> at java.lang.reflect.Method.invoke(Method.java:597)
<br>> at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
<br>> at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
<br>> at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
<br>> at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
<br>> Caused by: org.apache.maven.plugin.version.PluginVersionNotFoundException: The
<br>> plugin 'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist or no
<br>> valid version could be found
<br>> at
<br>> org.apache.maven.plugin.version.DefaultPluginVersionManager.resolvePluginVersion(DefaultPluginVersionManager.java:229)
<br>> at
<br>> org.apache.maven.plugin.version.DefaultPluginVersionManager.resolvePluginVersion(DefaultPluginVersionManager.java:91)
<br>> at
<br>> org.apache.maven.plugin.DefaultPluginManager.verifyPlugin(DefaultPluginManager.java:179)
<br>> at
<br>> org.apache.maven.plugin.DefaultPluginManager.loadPluginDescriptor(DefaultPluginManager.java:1642)
<br>> at
<br>> org.apache.maven.lifecycle.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:1540)
<br>> ... 15 more
<br>> [INFO] ------------------------------------------------------------------------
<br>> [INFO] Total time: 4 seconds
<br>> [INFO] Finished at: Thu Dec 17 20:46:38 PST 2009
<br>> [INFO] Final Memory: 17M/527M
<br>> [INFO] ------------------------------------------------------------------------
<br>>
<br>>
<br>> I normally use maven 2.2.1 but tried also with 2.0.9.
<br>>
<br>> Has anyone else seen anything like this? Any clues?
<br>>
<br>> thanks
<br>> david jencks
<br>>
<br>> > > mvn -P test test
<br>> >
<br>> > There is also a target to combine the last two steps in the jetspeed plugin,
<br>> but I don't use that, (due to general pluginphobia).
<br>> >
<br>> > HTH,
<br>> >
<br>> > Randy
<br>> >
<br>> > David Jencks wrote:
<br>> >> I'm trying to figure out just how much the pluto DI changes I'm working on
<br>> will break js2... so far
<br>> >>
<br>> >> mvn clean install
<br>> >>
<br>> >> seems to work, much to my surprise, but if I enable tests I get stuck on some
<br>> db tests. I looked around briefly but didn't find any instructions.
<br>> >>
<br>> >> What's the secret?
<br>> >>
<br>> >> So far I've added this to the root pom properties:
<br>> >>
<br>> >>
<br>> org.apache.derby.jdbc.EmbeddedDriver
<br>> >>
<br>> jdbc:derby:${pom.basedir}/target/testdb;create=true
<br>> >>
<br>>
<br>> >>
<br>>
<br>> >>
<br>> >>
<br>> >> and get errors like this:
<br>> >>
<br>> >> ...
<br>> >> Caused by: ERROR 42X05: Table/View 'CAPABILITY' does not exist.
<br>> >> at org.apache.derby.iapi.error.StandardException.newException(Unknown
<br>> Source)
<br>> >> at
<br>> org.apache.derby.impl.sql.compile.FromBaseTable.bindTableDescriptor(Unknown
<br>> Source)
<br>> >> at
<br>> org.apache.derby.impl.sql.compile.FromBaseTable.bindNonVTITables(Unknown Source)
<br>> >> at org.apache.derby.impl.sql.compile.FromList.bindTables(Unknown
<br>> Source)
<br>> >> at
<br>> org.apache.derby.impl.sql.compile.SelectNode.bindNonVTITables(Unknown Source)
<br>> >> at
<br>> org.apache.derby.impl.sql.compile.DMLStatementNode.bindTables(Unknown Source)
<br>> >> at org.apache.derby.impl.sql.compile.DMLStatementNode.bind(Unknown
<br>> Source)
<br>> >> at org.apache.derby.impl.sql.compile.CursorNode.bindStatement(Unknown
<br>> Source)
<br>> >> at org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown
<br>> Source)
<br>> >> at org.apache.derby.impl.sql.GenericStatement.prepare(Unknown Source)
<br>> >> at
<br>> org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext.prepareInternalStatement(Unknown
<br>> Source)
<br>> >> ... 98 more
<br>> >> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0, Time elapsed: 8.81 sec <<<
<br>> FAILURE!
<br>> >>
<br>> >> Results :
<br>> >>
<br>> >> Tests in error:
<br>> >> firstTestSetup(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testNewMimeType(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testNewCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testNewMediaType(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testNewClient(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> testCapabilityRepeat(org.apache.jetspeed.capabilities.TestCapability)
<br>> >> lastTestTeardown(org.apache.jetspeed.capabilities.TestCapability)
<br>> >>
<br>> >> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0
<br>> >>
<br>> >> thanks
<br>> >> david jencks
<br>> >>
<br>> >>
<br>> >> ---------------------------------------------------------------------
<br>> >> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> >> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>> >>
<br>> >>
<br>> >
<br>> >
<br>> > ---------------------------------------------------------------------
<br>> > To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=4" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> > For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=5" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>> >
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=6" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=7" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
</div><br><br><br>
<br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=8" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26840879&i=9" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26839179
Re: Building js2 with tests?
2009-12-17T20:51:15Z
2009-12-17T20:51:15Z
djencks
<br>On Dec 16, 2009, at 11:32 AM, Randy Watler wrote:
<br><br>> David,
<br>>
<br>> Here is the sequence I use:
<br>>
<br>> > mvn clean install
<br>> > mvn jetspeed:mvn -Dtarget=testdb
<br><br>I'm mystified. When I try this step the build fails trying to find a
<br>non-existent plugin: (running with -X, tail end of build):
<br><br>[INFO] Searching repository for plugin with prefix: 'jetspeed'.
<br>[DEBUG] Loading plugin prefixes from group: org.apache.maven.plugins
<br>[DEBUG] Loading plugin prefixes from group: org.codehaus.mojo
<br>[DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>[DEBUG] Artifact not found - using stub model: Unable to determine the
<br>latest version
<br><br> org.apache.maven.plugins:maven-jetspeed-plugin:pom:LATEST
<br><br><br><br>[DEBUG] Using defaults for missing POM org.apache.maven.plugins:maven-
<br>jetspeed-plugin:pom:LATEST
<br>[DEBUG] maven-jetspeed-plugin: using locally installed snapshot
<br>[DEBUG] Artifact not found - using stub model: Unable to determine the
<br>release version
<br><br> org.apache.maven.plugins:maven-jetspeed-plugin:pom:RELEASE
<br><br><br><br>[DEBUG] Using defaults for missing POM org.apache.maven.plugins:maven-
<br>jetspeed-plugin:pom:RELEASE
<br>[INFO]
<br>------------------------------------------------------------------------
<br>[ERROR] BUILD ERROR
<br>[INFO]
<br>------------------------------------------------------------------------
<br>[INFO] The plugin 'org.apache.maven.plugins:maven-jetspeed-plugin'
<br>does not exist or no valid version could be found
<br>[INFO]
<br>------------------------------------------------------------------------
<br>[DEBUG] Trace
<br>org.apache.maven.lifecycle.LifecycleExecutionException: The plugin
<br>'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist or no
<br>valid version could be found
<br> at
<br>org
<br>.apache
<br>.maven
<br>.lifecycle
<br>.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:
<br>1569)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.lifecycle
<br>.DefaultLifecycleExecutor
<br>.getMojoDescriptor(DefaultLifecycleExecutor.java:1851)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.lifecycle
<br>.DefaultLifecycleExecutor
<br>.segmentTaskListByAggregationNeeds(DefaultLifecycleExecutor.java:462)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.lifecycle
<br>.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:175)
<br> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
<br> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
<br> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
<br> at
<br>org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60)
<br> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br> at
<br>sun
<br>.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:
<br>39)
<br> at
<br>sun
<br>.reflect
<br>.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:
<br>25)
<br> at java.lang.reflect.Method.invoke(Method.java:597)
<br> at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
<br> at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
<br> at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:
<br>430)
<br> at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
<br>Caused by:
<br>org.apache.maven.plugin.version.PluginVersionNotFoundException: The
<br>plugin 'org.apache.maven.plugins:maven-jetspeed-plugin' does not exist
<br>or no valid version could be found
<br> at
<br>org
<br>.apache
<br>.maven
<br>.plugin
<br>.version
<br>.DefaultPluginVersionManager
<br>.resolvePluginVersion(DefaultPluginVersionManager.java:229)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.plugin
<br>.version
<br>.DefaultPluginVersionManager
<br>.resolvePluginVersion(DefaultPluginVersionManager.java:91)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.plugin.DefaultPluginManager.verifyPlugin(DefaultPluginManager.java:179)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.plugin
<br>.DefaultPluginManager.loadPluginDescriptor(DefaultPluginManager.java:
<br>1642)
<br> at
<br>org
<br>.apache
<br>.maven
<br>.lifecycle
<br>.DefaultLifecycleExecutor.verifyPlugin(DefaultLifecycleExecutor.java:
<br>1540)
<br> ... 15 more
<br>[INFO]
<br>------------------------------------------------------------------------
<br>[INFO] Total time: 4 seconds
<br>[INFO] Finished at: Thu Dec 17 20:46:38 PST 2009
<br>[INFO] Final Memory: 17M/527M
<br>[INFO]
<br>------------------------------------------------------------------------
<br><br><br>I normally use maven 2.2.1 but tried also with 2.0.9.
<br><br>Has anyone else seen anything like this? Any clues?
<br><br>thanks
<br>david jencks
<br><div class='shrinkable-quote'><br>> > mvn -P test test
<br>>
<br>> There is also a target to combine the last two steps in the jetspeed
<br>> plugin, but I don't use that, (due to general pluginphobia).
<br>>
<br>> HTH,
<br>>
<br>> Randy
<br>>
<br>> David Jencks wrote:
<br>>> I'm trying to figure out just how much the pluto DI changes I'm
<br>>> working on will break js2... so far
<br>>>
<br>>> mvn clean install
<br>>>
<br>>> seems to work, much to my surprise, but if I enable tests I get
<br>>> stuck on some db tests. I looked around briefly but didn't find
<br>>> any instructions.
<br>>>
<br>>> What's the secret?
<br>>>
<br>>> So far I've added this to the root pom properties:
<br>>>
<br>>>
<br>>> <
<br>>> org
<br>>> .apache
<br>>> .jetspeed
<br>>> .test.database.driver>org.apache.derby.jdbc.EmbeddedDriver</
<br>>> org.apache.jetspeed.test.database.driver>
<br>>> <org.apache.jetspeed.test.database.url>jdbc:derby:${pom.basedir}/
<br>>> target/testdb;create=true</org.apache.jetspeed.test.database.url>
<br>>> <org.apache.jetspeed.test.database.user></
<br>>> org.apache.jetspeed.test.database.user>
<br>>> <org.apache.jetspeed.test.database.password></
<br>>> org.apache.jetspeed.test.database.password>
<br>>>
<br>>>
<br>>> and get errors like this:
<br>>>
<br>>> ...
<br>>> Caused by: ERROR 42X05: Table/View 'CAPABILITY' does not exist.
<br>>> at
<br>>> org.apache.derby.iapi.error.StandardException.newException(Unknown
<br>>> Source)
<br>>> at
<br>>> org
<br>>> .apache
<br>>> .derby.impl.sql.compile.FromBaseTable.bindTableDescriptor(Unknown
<br>>> Source)
<br>>> at
<br>>> org
<br>>> .apache
<br>>> .derby.impl.sql.compile.FromBaseTable.bindNonVTITables(Unknown
<br>>> Source)
<br>>> at
<br>>> org.apache.derby.impl.sql.compile.FromList.bindTables(Unknown Source)
<br>>> at
<br>>> org
<br>>> .apache.derby.impl.sql.compile.SelectNode.bindNonVTITables(Unknown
<br>>> Source)
<br>>> at
<br>>> org
<br>>> .apache.derby.impl.sql.compile.DMLStatementNode.bindTables(Unknown
<br>>> Source)
<br>>> at
<br>>> org.apache.derby.impl.sql.compile.DMLStatementNode.bind(Unknown
<br>>> Source)
<br>>> at
<br>>> org.apache.derby.impl.sql.compile.CursorNode.bindStatement(Unknown
<br>>> Source)
<br>>> at
<br>>> org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown Source)
<br>>> at
<br>>> org.apache.derby.impl.sql.GenericStatement.prepare(Unknown Source)
<br>>> at
<br>>> org
<br>>> .apache
<br>>> .derby
<br>>> .impl
<br>>> .sql
<br>>> .conn
<br>>> .GenericLanguageConnectionContext.prepareInternalStatement(Unknown
<br>>> Source)
<br>>> ... 98 more
<br>>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0, Time elapsed:
<br>>> 8.81 sec <<< FAILURE!
<br>>>
<br>>> Results :
<br>>>
<br>>> Tests in error:
<br>>> firstTestSetup(org.apache.jetspeed.capabilities.TestCapability)
<br>>> testCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>>> testNewMimeType(org.apache.jetspeed.capabilities.TestCapability)
<br>>> testNewCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>>> testNewMediaType(org.apache.jetspeed.capabilities.TestCapability)
<br>>> testNewClient(org.apache.jetspeed.capabilities.TestCapability)
<br>>>
<br>>> testCapabilityRepeat(org.apache.jetspeed.capabilities.TestCapability)
<br>>> lastTestTeardown(org.apache.jetspeed.capabilities.TestCapability)
<br>>>
<br>>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0
<br>>>
<br>>> thanks
<br>>> david jencks
<br>>>
<br>>>
<br>>> ---------------------------------------------------------------------
<br>>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>>
<br>>>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=4" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26839179&i=5" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26836335
svn commit: r891959 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: WEB-INF/jetui/yui/jetui-portlet.jsp decorations/images/detach.gif javascript/jetspeed/jetui/jetui-portal.js jetui/engine/portal.js
2009-12-17T14:42:09Z
2009-12-17T14:42:09Z
taylor-8
Author: taylor
<br>Date: Thu Dec 17 22:42:08 2009
<br>New Revision: 891959
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891959&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891959&view=rev</a><br>Log:
<br><a href="https://issues.apache.org/jira/browse/JS2-1084" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1084</a><br>refactoring of movePortlet logic, moving down persistMove to portal.movePortlet with handlers, renaming portal.movePortlet to portal.moveToGrid
<br>start hooking in detach
<br><br>Added:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/images/detach.gif (with props)
<br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp?rev=891959&r1=891958&r2=891959&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp?rev=891959&r1=891958&r2=891959&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp Thu Dec 17 22:42:08 2009
<br>@@ -60,7 +60,9 @@
<br> if (request.getUserPrincipal() != null && fragment.getDecoration().getActions().size() > 0)
<br> {
<br> %>
<br>- <span style='cursor: pointer; z-index: 1000;' id='jetspeed-close-<%=fragment.getId()%>' title="close" class="portlet-action-close"><img src="<%=request.getContextPath()%>/decorations/portlet/jetspeed/images/close.gif" alt="Close" border="0" /></span>
<br>+ <span style='cursor: pointer; z-index: 1000;' id='jetspeed-close-<%=fragment.getId()%>' title="close" class="portlet-action-close"><img src="<%=request.getContextPath()%>/decorations/images/close.gif" alt="Close" border="0" /></span>
<br>+ <span style='cursor: pointer; z-index: 1000;' id='jetspeed-detach-<%=fragment.getId()%>' title="detach" class="portlet-action-detach"><img src="<%=request.getContextPath()%>/decorations/images/detach.gif" alt="Detach" border="0" /></span>
<br>+
<br> <% } } %>
<br> </div>
<br> </div>
<br><br>Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/images/detach.gif
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/images/detach.gif?rev=891959&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/images/detach.gif?rev=891959&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/images/detach.gif
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891959&r1=891958&r2=891959&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891959&r1=891958&r2=891959&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Thu Dec 17 22:42:08 2009
<br>@@ -179,7 +179,8 @@
<br> },
<br>
<br> /**
<br>- * @method moveToLayout
<br>+ * @method moveToLayout moves a portlet window to layout column grid position in the browser
<br>+ * this is a client side only operation. Operates in grid (non-detached) mode.
<br> */
<br> moveToLayout : function(e) {
<br> var drop = e.drop.get('node'),
<br>@@ -206,11 +207,12 @@
<br> // I don't think this is working
<br> e.drop.unplug(Y.Plugin.Drop);
<br> },
<br>-
<br>+
<br> /**
<br>- * @method movePortlet
<br>+ * @method moveToGrid moves a portlet window to another grid position in the browser
<br>+ * this is a client side only operation. Operates in grid (non-detached) mode.
<br> */
<br>- movePortlet : function(e) {
<br>+ moveToGrid : function(e) {
<br> var portal = JETUI_YUI.getPortalInstance();
<br> var drop = e.drop.get('node'),
<br> drag = e.drag.get('node');
<br>@@ -250,10 +252,93 @@
<br> node: dragParent,
<br> groups: ['portlets']
<br> });
<br>- }
<br>+ }
<br> },
<br>+
<br>+ /**
<br>+ * @method detachPortlet detaches a portlet from a grid position and moves it to a z-order top detached window
<br>+ */
<br>+ detachPortlet : function(e) {
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br>+ var windowId = null;
<br>+ if (e instanceof String) {
<br>+ windowId = e;
<br>+ } else {
<br>+ var windowId = e.currentTarget.getAttribute("id");
<br>+ windowId = windowId.replace(/^jetspeed-detach-/, "");
<br>+ }
<br>+ var window = Y.one("[id='" + windowId + "']");
<br>+ if (window) {
<br>+ Y.log("data = " + window.data.get("name"));
<br>+ }
<br>+ // TODO: left off here
<br>+ },
<br>+
<br>+ onMoveComplete : function(id, o, args) {
<br>+ var id = id; // Transaction ID.
<br>+ var data = o.responseText; // Response data.
<br>+ Y.log("move result = " + data);
<br>+ var windowId = args.complete[0];
<br>+ },
<br>
<br> /**
<br>+ * @method movePortlet persist the move operation to the persistent store over restful put request
<br>+ */
<br>+ movePortlet : function(drag, e) {
<br>+ var windowId = drag.getAttribute('id');
<br>+ if (drag.data.get("toolbar") == false) {
<br>+ var oldColumn = drag.data.get('column');
<br>+ var oldRow = drag.data.get('row');
<br>+ var dragParent = drag.get('parentNode');
<br>+ var parentColumn = dragParent.data.get('column');
<br>+ if (parentColumn != oldColumn)
<br>+ {
<br>+ this.reallocateColumn(oldColumn); // moved from different column
<br>+ drag.data.set('column', parentColumn);
<br>+ }
<br>+ this.reallocateColumn(parentColumn);
<br>+ var uri = this.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>+ uri += "&col=" + drag.data.get('column') + "&row=" + drag.data.get('row');
<br>+ var config = {
<br>+ on: { complete: this.onMoveComplete },
<br>+ method: "PUT",
<br>+ headers: { "X-Portal-Path" : this.portalPagePath },
<br>+ arguments: { complete: [ windowId ] }
<br>+ };
<br>+ var request = Y.io(uri, config);
<br>+ }
<br>+ else
<br>+ {
<br>+ var uri = this.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>+ uri += "&x=" + e.target.region.top + "&y=" + e.target.region.left;
<br>+ var config = {
<br>+ on: { complete: this.onMoveComplete },
<br>+ method: "PUT",
<br>+ headers: { "X-Portal-Path" : this.portalPagePath },
<br>+ arguments: { complete: [ windowId ] }
<br>+ };
<br>+ var request = Y.io(uri, config);
<br>+ }
<br>+ },
<br>+
<br>+ reallocateColumn : function(column) {
<br>+ var columns = Y.Node.all(JetuiConfiguration.layoutStyle);
<br>+ columns.each(function(v, k) {
<br>+ if (v.data.get('locked') == false)
<br>+ {
<br>+ if (v.data.get('column') == column)
<br>+ {
<br>+ var row = 0;
<br>+ v.get('children').each(function(v,k) {
<br>+ v.data.set('row', row);
<br>+ row++;
<br>+ }, row);
<br>+ }
<br>+ }
<br>+ });
<br>+ },
<br>+
<br>+ /**
<br> * @method onPortletRemoveComplete
<br> */
<br> onPortletRemoveComplete : function(id, o, args) {
<br>@@ -275,7 +360,7 @@
<br> },
<br>
<br> /**
<br>- * @method removePortlet
<br>+ * @method removePortlet removes a portlet from the persistent store over restful delete request
<br> */
<br> removePortlet : function(e) {
<br> var portal = JETUI_YUI.getPortalInstance();
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891959&r1=891958&r2=891959&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891959&r1=891958&r2=891959&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Thu Dec 17 22:42:08 2009
<br>@@ -138,21 +138,19 @@
<br> dragGroups = ['toolbars'],
<br> dragMode = 'point';
<br> dropGroups = [];
<br>- }
<br>-
<br>- var ddNav = new Y.DD.Drag({
<br>- node: v,
<br>- groups: dragGroups,
<br>- dragMode: dragMode
<br>- }).plug(Y.Plugin.DDProxy, {
<br>- moveOnEnd: false
<br>- });
<br>- ddNav.addHandle(config.dragHandleStyle);
<br>- var drop = new Y.DD.Drop({
<br>- node: v,
<br>- groups: dropGroups
<br>- });
<br>-
<br>+ }
<br>+ var ddNav = new Y.DD.Drag({
<br>+ node: v,
<br>+ groups: dragGroups,
<br>+ dragMode: dragMode
<br>+ }).plug(Y.Plugin.DDProxy, {
<br>+ moveOnEnd: false
<br>+ });
<br>+ ddNav.addHandle(config.dragHandleStyle);
<br>+ var drop = new Y.DD.Drop({
<br>+ node: v,
<br>+ groups: dropGroups
<br>+ });
<br> //portlet.info();
<br> });
<br>
<br>@@ -174,7 +172,12 @@
<br> closeWindows.each(function(v, k) {
<br> v.on('click', portal.removePortlet);
<br> });
<br>-
<br>+
<br>+ var detachWindows = Y.Node.all('.portlet-action-detach');
<br>+ detachWindows.each(function(v, k) {
<br>+ v.on('click', portal.detachPortlet);
<br>+ });
<br>+
<br> Y.DD.DDM.on('drag:drophit', function(e) {
<br> var portal = JETUI_YUI.getPortalInstance();
<br> var drop = e.drop.get('node'),
<br>@@ -228,70 +231,8 @@
<br> drag.get('node').removeClass('moving');
<br> drag.get('dragNode').set('innerHTML', '');
<br>
<br>- persistMove(drag.get('node'), e);
<br>- });
<br>-
<br>- var onMoveComplete = function(id, o, args) {
<br>- var id = id; // Transaction ID.
<br>- var data = o.responseText; // Response data.
<br>- Y.log("move result = " + data);
<br>- var windowId = args.complete[0];
<br>- };
<br>-
<br>- var persistMove = function(drag, e) {
<br>- var portal = JETUI_YUI.getPortalInstance();
<br>- var windowId = drag.getAttribute('id');
<br>- if (drag.data.get("toolbar") == false) {
<br>- var oldColumn = drag.data.get('column');
<br>- var oldRow = drag.data.get('row');
<br>- var dragParent = drag.get('parentNode');
<br>- var parentColumn = dragParent.data.get('column');
<br>- if (parentColumn != oldColumn)
<br>- {
<br>- reallocateColumn(oldColumn); // moved from different column
<br>- drag.data.set('column', parentColumn);
<br>- }
<br>- reallocateColumn(parentColumn);
<br>- var uri = portal.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>- uri += "&col=" + drag.data.get('column') + "&row=" + drag.data.get('row');
<br>- var config = {
<br>- on: { complete: onMoveComplete },
<br>- method: "PUT",
<br>- headers: { "X-Portal-Path" : portal.portalPagePath },
<br>- arguments: { complete: [ windowId ] }
<br>- };
<br>- var request = Y.io(uri, config);
<br>- }
<br>- else
<br>- {
<br>- var uri = portal.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>- uri += "&x=" + e.target.region.top + "&y=" + e.target.region.left;
<br>- var config = {
<br>- on: { complete: onMoveComplete },
<br>- method: "PUT",
<br>- headers: { "X-Portal-Path" : portal.portalPagePath },
<br>- arguments: { complete: [ windowId ] }
<br>- };
<br>- var request = Y.io(uri, config);
<br>- }
<br>- };
<br>-
<br>- var reallocateColumn = function(column) {
<br>- var columns = Y.Node.all(config.layoutStyle);
<br>- columns.each(function(v, k) {
<br>- if (v.data.get('locked') == false)
<br>- {
<br>- if (v.data.get('column') == column)
<br>- {
<br>- var row = 0;
<br>- v.get('children').each(function(v,k) {
<br>- v.data.set('row', row);
<br>- row++;
<br>- }, row);
<br>- }
<br>- }
<br>- });
<br>- };
<br>+ portal.movePortlet(drag.get('node'), e);
<br>+ });
<br>
<br> Y.DD.DDM.on('drag:start', function(e) {
<br> var drag = e.target;
<br>@@ -379,7 +320,7 @@
<br> {
<br> // Y.log("**** HIT");
<br> portal.isMoving = true;
<br>- portal.movePortlet(e);
<br>+ portal.moveToGrid(e);
<br> portal.isMoving = false;
<br> }
<br> }
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26836335&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26836335&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26834665
svn commit: r891885 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/jetui/engine/portal.js components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java
2009-12-17T12:44:20Z
2009-12-17T12:44:20Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 20:44:20 2009
<br>New Revision: 891885
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891885&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891885&view=rev</a><br>Log:
<br>JS2-1084: Replacing old ajax api during portlet window moving by new rest api.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891885&r1=891884&r2=891885&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891885&r1=891884&r2=891885&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Thu Dec 17 20:44:20 2009
<br>@@ -211,16 +211,6 @@
<br> }
<br> });
<br>
<br>- var onMoveComplete = function(id, o, args) {
<br>- var id = id; // Transaction ID.
<br>- var data = o.responseText; // Response data.
<br>- //Y.log("move result = " + data);
<br>- var dataIn = Y.DataType.XML.parse(data),
<br>- schema = { resultListLocator: "status", resultFields: [{key:"status"}] },
<br>- dataOut = Y.DataSchema.XML.apply(schema, dataIn);
<br>- var widgetId = args[0];
<br>- };
<br>-
<br> Y.DD.DDM.on('drag:end', function(e) {
<br> var drag = e.target;
<br> if (drag.target) {
<br>@@ -241,16 +231,16 @@
<br> persistMove(drag.get('node'), e);
<br> });
<br>
<br>-
<br>-
<br>-
<br>+ var onMoveComplete = function(id, o, args) {
<br>+ var id = id; // Transaction ID.
<br>+ var data = o.responseText; // Response data.
<br>+ Y.log("move result = " + data);
<br>+ var windowId = args.complete[0];
<br>+ };
<br>+
<br> var persistMove = function(drag, e) {
<br>- var uri = document.location.href;
<br>- if (uri.indexOf("/portal") > -1)
<br>- uri = uri.replace("/portal", "/ajaxapi");
<br>- else
<br>- uri = uri.replace("/ui", "/ajaxapi");
<br>- var windowId = drag.getAttribute('id');
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br>+ var windowId = drag.getAttribute('id');
<br> if (drag.data.get("toolbar") == false) {
<br> var oldColumn = drag.data.get('column');
<br> var oldRow = drag.data.get('row');
<br>@@ -262,15 +252,27 @@
<br> drag.data.set('column', parentColumn);
<br> }
<br> reallocateColumn(parentColumn);
<br>- var uri = uri + "?action=moveabs&id=" + windowId + "&col=" + drag.data.get('column') + "&row=" + drag.data.get('row');
<br>- Y.on('io:complete', onMoveComplete, this, [windowId]);
<br>- var request = Y.io(uri);
<br>+ var uri = portal.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>+ uri += "&col=" + drag.data.get('column') + "&row=" + drag.data.get('row');
<br>+ var config = {
<br>+ on: { complete: onMoveComplete },
<br>+ method: "PUT",
<br>+ headers: { "X-Portal-Path" : portal.portalPagePath },
<br>+ arguments: { complete: [ windowId ] }
<br>+ };
<br>+ var request = Y.io(uri, config);
<br> }
<br> else
<br> {
<br>- var uri = uri + "?action=move&id=" + windowId + "&x=" + e.target.region.top + "&y=" + e.target.region.left;
<br>- Y.on('io:complete', onMoveComplete, this, [windowId]);
<br>- var request = Y.io(uri);
<br>+ var uri = portal.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json";
<br>+ uri += "&x=" + e.target.region.top + "&y=" + e.target.region.left;
<br>+ var config = {
<br>+ on: { complete: onMoveComplete },
<br>+ method: "PUT",
<br>+ headers: { "X-Portal-Path" : portal.portalPagePath },
<br>+ arguments: { complete: [ windowId ] }
<br>+ };
<br>+ var request = Y.io(uri, config);
<br> }
<br> };
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java?rev=891885&r1=891884&r2=891885&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java?rev=891885&r1=891884&r2=891885&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java Thu Dec 17 20:44:20 2009
<br>@@ -17,6 +17,7 @@
<br> package org.apache.jetspeed.services.rest;
<br>
<br> import java.util.Comparator;
<br>+import java.util.Iterator;
<br> import java.util.List;
<br> import java.util.SortedSet;
<br> import java.util.TreeSet;
<br>@@ -346,9 +347,9 @@
<br> pageLayoutComponent.updateRowColumn(contentFragment, destRow, destColumn);
<br> pageLayoutComponent.updateRowColumn(destFragment, row, column);
<br> }
<br>+
<br>+ break;
<br> }
<br>-
<br>- break;
<br> }
<br> }
<br> else if ("down".equals(direction))
<br>@@ -361,9 +362,17 @@
<br> {
<br> SortedSet<ContentFragment> tailSet = set.tailSet(contentFragment);
<br>
<br>- if (!tailSet.isEmpty())
<br>+ if (tailSet.size() > 1)
<br> {
<br>- ContentFragment destFragment = tailSet.first();
<br>+ Iterator<ContentFragment> it = tailSet.iterator();
<br>+ ContentFragment tempFragment = it.next();
<br>+
<br>+ if (!tempFragment.getId().equals(contentFragment.getId()))
<br>+ {
<br>+ throw new IllegalStateException("Tail set of the column fragment set must start with the content fragment itself.");
<br>+ }
<br>+
<br>+ ContentFragment destFragment = it.next();
<br> int row = contentFragment.getLayoutRow();
<br> int column = contentFragment.getLayoutColumn();
<br> int destRow = destFragment.getLayoutRow();
<br>@@ -371,9 +380,9 @@
<br> pageLayoutComponent.updateRowColumn(contentFragment, destRow, destColumn);
<br> pageLayoutComponent.updateRowColumn(destFragment, row, column);
<br> }
<br>+
<br>+ break;
<br> }
<br>-
<br>- break;
<br> }
<br> }
<br> else
<br>@@ -385,14 +394,67 @@
<br> {
<br> int row = NumberUtils.toInt(rowParam, -1);
<br> int col = NumberUtils.toInt(colParam, -1);
<br>-
<br>- try
<br>- {
<br>- pageLayoutComponent.updateRowColumn(contentFragment, row, col);
<br>- }
<br>- catch (Exception e)
<br>+
<br>+ if (row != -1 && col != -1 && (contentFragment.getLayoutRow() != row || contentFragment.getLayoutColumn() != col))
<br> {
<br>- throw new WebApplicationException(e);
<br>+ try
<br>+ {
<br>+ ContentFragment layoutFragment = null;
<br>+
<br>+ if (!StringUtils.isBlank(layoutFragmentId))
<br>+ {
<br>+ layoutFragment = contentPage.getFragmentByFragmentId(layoutFragmentId);
<br>+
<br>+ if (layoutFragment == null)
<br>+ {
<br>+ throw new WebApplicationException(new IllegalArgumentException("Layout fragment not found with the specified id: " + layoutFragmentId));
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ layoutFragment = getParentFragment(pageLayoutComponent.getUnlockedRootFragment(contentPage), fragmentId);
<br>+
<br>+ if (layoutFragment == null)
<br>+ {
<br>+ throw new WebApplicationException(new IllegalArgumentException("Layout fragment not found for the fragment: " + fragmentId));
<br>+ }
<br>+ }
<br>+
<br>+ int layoutColumnCount = getColumnCountOfLayoutFragment(layoutFragment);
<br>+
<br>+ SortedSet<ContentFragment> [] fragmentSetArray = getSortedChildFragmentSetArray(layoutFragment, layoutColumnCount);
<br>+
<br>+ if (fragmentSetArray.length > col)
<br>+ {
<br>+ SortedSet<ContentFragment> set = fragmentSetArray[col];
<br>+
<br>+ if (row >= set.size())
<br>+ {
<br>+ row = set.size();
<br>+ }
<br>+
<br>+ pageLayoutComponent.updateRowColumn(contentFragment, row, col);
<br>+
<br>+ SortedSet<ContentFragment> tailSet = set.tailSet(contentFragment);
<br>+
<br>+ for (ContentFragment f : tailSet)
<br>+ {
<br>+ if (!f.getId().equals(contentFragment.getId()))
<br>+ {
<br>+ ++row;
<br>+
<br>+ if (row != f.getLayoutRow())
<br>+ {
<br>+ pageLayoutComponent.updateRowColumn(f, row, col);
<br>+ }
<br>+ }
<br>+ }
<br>+ }
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ throw new WebApplicationException(e);
<br>+ }
<br> }
<br> }
<br> else
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26834665&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26834665&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26832962
svn commit: r891831 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: resources/org/apache/jetspeed/portlets/toolbox/ resources/org/apache/jetspeed/portlets/toolbox/resources/ webapp/WEB-INF/ webapp/WEB-INF/view/toolbox/
2009-12-17T10:41:17Z
2009-12-17T10:41:17Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 18:41:17 2009
<br>New Revision: 891831
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891831&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891831&view=rev</a><br>Log:
<br>JS2-1057: Adding i18n
<br><br>Added:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties (with props)
<br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties?rev=891831&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties?rev=891831&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties (added)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties Thu Dec 17 18:41:17 2009
<br>@@ -0,0 +1,34 @@
<br>+# Licensed to the Apache Software Foundation (ASF) under one or more
<br>+# contributor license agreements. See the NOTICE file distributed with
<br>+# this work for additional information regarding copyright ownership.
<br>+# The ASF licenses this file to You under the Apache License, Version 2.0
<br>+# (the "License"); you may not use this file except in compliance with
<br>+# the License. You may obtain a copy of the License at
<br>+#
<br>+# <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+#
<br>+# Unless required by applicable law or agreed to in writing, software
<br>+# distributed under the License is distributed on an "AS IS" BASIS,
<br>+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+# See the License for the specific language governing permissions and
<br>+# limitations under the License.
<br>+#
<br>+# $Id$
<br>+#
<br>+
<br>+# DO NOT TRANSLATE & DO NOT INCLUDE IN L10N PROPERTIES FILE
<br>+toolbox.label.portlets = Portlets
<br>+toolbox.label.layout = Layout
<br>+toolbox.label.theme = Theme
<br>+toolbox.label.widget = Widgets
<br>+toolbox.label.search = Search
<br>+toolbox.label.page = Page
<br>+toolbox.label.moveFirst = <<
<br>+toolbox.label.movePrev = <
<br>+toolbox.label.moveNext = >
<br>+toolbox.label.moveLast = >>
<br>+toolbox.label.preview = Preview
<br>+toolbox.label.add = Add
<br>+toolbox.label.close = Close
<br>+
<br>+toolbox.message.chooseOne = Choose one
<br><br>Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891831&r1=891830&r2=891831&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891831&r1=891830&r2=891831&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Thu Dec 17 18:41:17 2009
<br>@@ -2158,6 +2158,7 @@
<br> <portlet-mode>EDIT</portlet-mode>
<br> </supports>
<br> <supported-locale>en</supported-locale>
<br>+ <resource-bundle>org.apache.jetspeed.portlets.toolbox.resources.JetspeedToolboxResources</resource-bundle>
<br> <portlet-info>
<br> <title>Jetspeed Toolbox</title>
<br> <short-title>Toolbox</short-title>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891831&r1=891830&r2=891831&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891831&r1=891830&r2=891831&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Thu Dec 17 18:41:17 2009
<br>@@ -30,6 +30,8 @@
<br> <%@ taglib uri="<a href="http://java.sun.com/portlet_2_0" target="_top" rel="nofollow">http://java.sun.com/portlet_2_0</a>" prefix="portlet"%>
<br>
<br> <portlet:defineObjects/>
<br>+<fmt:setBundle basename="org.apache.jetspeed.portlets.toolbox.resources.JetspeedToolboxResources" />
<br>+
<br> <c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<br> <c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
<br> <c:set var="portalPagePath" value="${requestContext.portalURL.path}"/>
<br>@@ -42,13 +44,13 @@
<br> <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br> <td class="portlet-section-subheader">
<br>- <a href="#" id="<portlet:namespace/>portletsTabAction">Portlets</a>
<br>+ <a href="#" id="<portlet:namespace/>portletsTabAction"><fmt:message key="toolbox.label.portlets"/></a>
<br> |
<br>- <a href="#" id="<portlet:namespace/>layoutTabAction">Layout</a>
<br>+ <a href="#" id="<portlet:namespace/>layoutTabAction"><fmt:message key="toolbox.label.layout"/></a>
<br> |
<br>- <a href="#" id="<portlet:namespace/>themeTabAction">Theme</a>
<br>+ <a href="#" id="<portlet:namespace/>themeTabAction"><fmt:message key="toolbox.label.theme"/></a>
<br> |
<br>- <a href="#" id="<portlet:namespace/>widgetsTabAction">Widgets</a>
<br>+ <a href="#" id="<portlet:namespace/>widgetsTabAction"><fmt:message key="toolbox.label.widget"/></a>
<br> </td>
<br> </tr>
<br> </table>
<br>@@ -56,19 +58,19 @@
<br> <form id="<portlet:namespace/>form">
<br> <table id="<portlet:namespace/>portletsTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <th class="portlet-section-header">Portlets</th>
<br>+ <th class="portlet-section-header"><fmt:message key="toolbox.label.portlets"/></th>
<br> </tr>
<br> <tr>
<br> <td class="portlet-section-subheader">
<br> <input type="text" name="query" size="15" value="" >
<br>- <input type="submit" value="Search" />
<br>+ <input type="submit" value="<fmt:message key="toolbox.label.search"/>" />
<br> </td>
<br> </tr>
<br>
<br> <tr>
<br> <td class="portlet-section-subheader">
<br> <select id="<portlet:namespace/>categories">
<br>- <option value="">Choose a category</option>
<br>+ <option value=""><fmt:message key="toolbox.message.chooseOne"/></option>
<br> <c:forEach var="category" items="${categories}">
<br> <option value="${category}" keywords="${categoryKeywords[category]}">${category}</option>
<br> </c:forEach>
<br>@@ -85,14 +87,13 @@
<br> <tr>
<br> <td class="portlet-section-subheader">
<br> <div id="<portlet:namespace/>pageNavBar" class="jstbPageNavBar">
<br>- <a href="#" class="jstbPageNav" pageIndex="first"><<</a>
<br>- <a href="#" class="jstbPageNav" pageIndex="prev"><</a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="first"><fmt:message key="toolbox.label.moveFirst"/></a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="prev"><fmt:message key="toolbox.label.movePrev"/></a>
<br> <select id="<portlet:namespace/>pageNavIndex">
<br>- <option value="">Page</option>
<br>- </select>
<br>+ <option value=""><fmt:message key="toolbox.label.page"/></option>
<br> </select>
<br>- <a href="#" class="jstbPageNav" pageIndex="next">></a>
<br>- <a href="#" class="jstbPageNav" pageIndex="last">>></a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="next"><fmt:message key="toolbox.label.moveNext"/></a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="last"><fmt:message key="toolbox.label.moveLast"/></a>
<br> </div>
<br> </td>
<br> </tr>
<br>@@ -115,8 +116,8 @@
<br> </tr>
<br> <tr>
<br> <td class="portlet-section-body">
<br>- <a href="#" name="preview">Preview</a>
<br>- <a href="#" name="add">Add</a>
<br>+ <a href="#" name="preview"><fmt:message key="toolbox.label.preview"/></a>
<br>+ <a href="#" name="add"><fmt:message key="toolbox.label.add"/></a>
<br> </td>
<br> </tr>
<br> </table>
<br>@@ -124,7 +125,7 @@
<br>
<br> <table id="<portlet:namespace/>layoutTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <th class="portlet-section-header" colspan="2">Layouts</th>
<br>+ <th class="portlet-section-header" colspan="2"><fmt:message key="toolbox.label.layout"/></th>
<br> </tr>
<br> <c:forEach var="layout" items="${layouts}">
<br> <tr>
<br>@@ -156,7 +157,7 @@
<br>
<br> <table id="<portlet:namespace/>themeTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <th class="portlet-section-header" colspan="2">Themes</th>
<br>+ <th class="portlet-section-header" colspan="2"><fmt:message key="toolbox.label.theme"/></th>
<br> </tr>
<br> <c:forEach var="theme" items="${themes}">
<br> <tr>
<br>@@ -178,7 +179,7 @@
<br>
<br> <table id="<portlet:namespace/>widgetsTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <th class="portlet-section-header" colspan="1">Widgets</th>
<br>+ <th class="portlet-section-header" colspan="1"><fmt:message key="toolbox.label.widget"/></th>
<br> </tr>
<br> <tr>
<br> <th class="portlet-section-header" colspan="1"></th>
<br>@@ -187,7 +188,7 @@
<br>
<br> <div id="<portlet:namespace/>previewPanel" style="BACKGROUND: #eee; BORDER: lightgrey solid 1px; POSITION: absolute; Z-INDEX: 1000; VISIBILITY: hidden">
<br> <div></div>
<br>- <div align="right"><a href="#">Close</a></div>
<br>+ <div align="right"><a href="#"><fmt:message key="toolbox.label.close"/></a></div>
<br> </div>
<br>
<br> <script language="javascript">
<br>@@ -496,6 +497,8 @@
<br> var closePreviewPanel = function(e) {
<br> var panel = Y.Node.one("#<portlet:namespace/>previewPanel");
<br> Y.Node.getDOMNode(panel).style.visibility = "hidden";
<br>+
<br>+ e.halt();
<br> };
<br>
<br> Y.on("click", switchTab, "#<portlet:namespace/>portletsTabAction");
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832962&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832962&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26832061
svn commit: r891812 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-17T09:44:40Z
2009-12-17T09:44:40Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 17:44:40 2009
<br>New Revision: 891812
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891812&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891812&view=rev</a><br>Log:
<br>JS2-1057: Adding preview for portlets
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891812&r1=891811&r2=891812&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891812&r1=891811&r2=891812&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Thu Dec 17 17:44:40 2009
<br>@@ -115,8 +115,8 @@
<br> </tr>
<br> <tr>
<br> <td class="portlet-section-body">
<br>- <a href="#">Preview</a>
<br>- <a href="#">Add</a>
<br>+ <a href="#" name="preview">Preview</a>
<br>+ <a href="#" name="add">Add</a>
<br> </td>
<br> </tr>
<br> </table>
<br>@@ -185,8 +185,13 @@
<br> </tr>
<br> </table>
<br>
<br>+<div id="<portlet:namespace/>previewPanel" style="BACKGROUND: #eee; BORDER: lightgrey solid 1px; POSITION: absolute; Z-INDEX: 1000; VISIBILITY: hidden">
<br>+ <div></div>
<br>+ <div align="right"><a href="#">Close</a></div>
<br>+</div>
<br>+
<br> <script language="javascript">
<br>-YUI().use('jetui-portal', 'io', 'json', 'node-base', 'cookie', function(Y) {
<br>+YUI().use('jetui-portal', 'io', 'json', 'node', 'cookie', function(Y) {
<br>
<br> var pagination = {
<br> portlet : { uri : null, totalSize : 0, pageSize : ${portletPageSize}, beginIndex : 0 },
<br>@@ -315,15 +320,18 @@
<br>
<br> <c:choose>
<br> <c:when test="${editAccess}">
<br>- Y.Node.getDOMNode(clone.all("a").item(1)).setAttribute("portletUniqueName", def.uniqueName);
<br>- clone.all("a").item(1).on("click", addPortlet);
<br>+ var addLink = clone.one("[name='add']");
<br>+ Y.Node.getDOMNode(addLink).setAttribute("portletUniqueName", def.uniqueName);
<br>+ addLink.on("click", addPortlet);
<br> </c:when>
<br> <c:otherwise>
<br> clone.all("a").item(1).remove();
<br> </c:otherwise>
<br> </c:choose>
<br>
<br>- // TODO: add handlers for preview
<br>+ var previewLink = clone.one("[name='preview']");
<br>+ Y.Node.getDOMNode(previewLink).setAttribute("portletUniqueName", def.uniqueName);
<br>+ previewLink.on("click", previewPortlet);
<br>
<br> clone.set("id", "<portlet:namespace/>portletItem-" + def.uniqueName);
<br>
<br>@@ -456,6 +464,40 @@
<br> e.halt();
<br> };
<br>
<br>+ var onPreviewPortletComplete = function(id, o, args) {
<br>+ var point = args.complete;
<br>+ var panel = Y.Node.one("#<portlet:namespace/>previewPanel");
<br>+ var subPanels = panel.all("DIV");
<br>+ subPanels.item(0).setContent(o.responseText);
<br>+ var panelDOMNode = Y.Node.getDOMNode(panel);
<br>+
<br>+ var panelWidth = Math.max(panelDOMNode.offsetWidth, 200);
<br>+ var panelHeight = Math.max(panelDOMNode.offsetHeight, 150);
<br>+ var windowWidth = window.innerWidth;
<br>+ var windowHeight = window.innerHeight;
<br>+ if (point[0] > windowWidth - panelWidth) point[0] = windowWidth - panelWidth;
<br>+ if (point[1] > windowHeight - panelHeight) point[1] = windowHeight - panelHeight;
<br>+
<br>+ panel.setXY(point);
<br>+ panelDOMNode.style.visibility = "visible";
<br>+ };
<br>+
<br>+ var previewPortlet = function(e) {
<br>+ var a = Y.Node.getDOMNode(e.target);
<br>+ var portletUniqueName = a.getAttribute("portletUniqueName");
<br>+ if (portletUniqueName) {
<br>+ var uri = "${portalContextPath}/portlet/?mode=preview&portlet=" + portletUniqueName + "&entity=" + portletUniqueName;
<br>+ var request = Y.io(uri, { on: { complete: onPreviewPortletComplete }, arguments: { complete: [ e.pageX, e.pageY ] } });
<br>+ }
<br>+
<br>+ e.halt();
<br>+ };
<br>+
<br>+ var closePreviewPanel = function(e) {
<br>+ var panel = Y.Node.one("#<portlet:namespace/>previewPanel");
<br>+ Y.Node.getDOMNode(panel).style.visibility = "hidden";
<br>+ };
<br>+
<br> Y.on("click", switchTab, "#<portlet:namespace/>portletsTabAction");
<br> Y.on("click", switchTab, "#<portlet:namespace/>layoutTabAction");
<br> Y.on("click", switchTab, "#<portlet:namespace/>themeTabAction");
<br>@@ -476,5 +518,7 @@
<br> }
<br>
<br> switchTab(tabId);
<br>+
<br>+ Y.Node.one("#<portlet:namespace/>previewPanel").one("A").on("click", closePreviewPanel);
<br> });
<br> </script>
<br>\ No newline at end of file
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832061&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832061&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26832043
svn commit: r891811 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: javascript/jetspeed/jetui/jetui-portal.js jetui/engine/portal.js
2009-12-17T09:43:35Z
2009-12-17T09:43:35Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 17:43:34 2009
<br>New Revision: 891811
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891811&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891811&view=rev</a><br>Log:
<br>JS2-1084: Replacing the import of "node-base" by "node". Without "node", we cannot make use of many node apis such as "setX()" or "setY()".
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891811&r1=891810&r2=891811&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891811&r1=891810&r2=891811&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Thu Dec 17 17:43:34 2009
<br>@@ -626,4 +626,4 @@
<br> return layout;
<br> };
<br>
<br>-}, '3.0.0', {requires:['dd', 'io', 'dataschema-json', 'node-base', 'node-menunav']});
<br>+}, '3.0.0', {requires:['dd', 'io', 'dataschema-json', 'node', 'node-menunav']});
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891811&r1=891810&r2=891811&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891811&r1=891810&r2=891811&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Thu Dec 17 17:43:34 2009
<br>@@ -1,5 +1,5 @@
<br> //Use loader to grab the modules needed
<br>-YUI(JETUI_YUI).use('jetui-portal', 'console', 'dd', 'anim', 'io', 'datatype-xml', 'dataschema-xml', 'dataschema-json', 'node-base', 'node-menunav', function(Y) {
<br>+YUI(JETUI_YUI).use('jetui-portal', 'console', 'dd', 'anim', 'io', 'datatype-xml', 'dataschema-xml', 'dataschema-json', 'node', 'node-menunav', function(Y) {
<br>
<br> var config = JETUI_YUI.config;
<br> Y.log("Starting up JETUI " + config.engine + " engine...");
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832043&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26832043&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26828417
[jira] Updated: (JS2-1091) Admin to set some portlets to out-of-service state at runtime.
2009-12-17T06:01:19Z
2009-12-17T06:01:19Z
Jetspeed - Dev mailing list
<br> [ <a href="https://issues.apache.org/jira/browse/JS2-1091?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1091?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel</a> ]
<br><br>Woonsan Ko updated JS2-1091:
<br>----------------------------
<br><br> Fix Version/s: 2.1.4
<br> 2.1.3
<br><div class='shrinkable-quote'><br>> Admin to set some portlets to out-of-service state at runtime.
<br>> --------------------------------------------------------------
<br>>
<br>> Key: JS2-1091
<br>> URL: <a href="https://issues.apache.org/jira/browse/JS2-1091" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1091</a><br>> Project: Jetspeed 2
<br>> Issue Type: Improvement
<br>> Components: Admin Portlets
<br>> Reporter: Woonsan Ko
<br>> Assignee: Woonsan Ko
<br>> Fix For: 2.1.3, 2.1.4, 2.2.1
<br>>
<br>>
<br>> The PortletTrackingManager renders "Portlet is not responding and has been taken out of service." when a portlet window is timed-out.
<br>> I think we can imporove this with the following features:
<br>> - Administrator can mark a portlet or a portlet application as "out-of-service" in a UI.
<br>> - PortletTrackingManager read the above information as well to decide if the portlet window is out-of-service.
<br>> - The message for the out-of-service portlets can be configured.
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828417&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828417&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26828347
[jira] Updated: (JS2-1082) What are the layout or contextual path for user, guest, admin, jsp (wml, html, and xhtml) on Jetspeed 2.2.0
2009-12-17T05:57:18Z
2009-12-17T05:57:18Z
Jetspeed - Dev mailing list
<br> [ <a href="https://issues.apache.org/jira/browse/JS2-1082?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1082?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel</a> ]
<br><br>Woonsan Ko updated JS2-1082:
<br>----------------------------
<br><br> Fix Version/s: (was: 2.2.0)
<br> 2.2.1
<br><div class='shrinkable-quote'><br>> What are the layout or contextual path for user, guest, admin, jsp (wml, html, and xhtml) on Jetspeed 2.2.0
<br>> -----------------------------------------------------------------------------------------------------------
<br>>
<br>> Key: JS2-1082
<br>> URL: <a href="https://issues.apache.org/jira/browse/JS2-1082" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1082</a><br>> Project: Jetspeed 2
<br>> Issue Type: Bug
<br>> Components: PSML
<br>> Environment: Windows Vista (OS), Lenovo T500 (HW) & Tomcat 6.0.16, Maven 2.2.0
<br>> Reporter: Musa
<br>> Priority: Critical
<br>> Fix For: 2.2.1
<br>>
<br>> Original Estimate: 48h
<br>> Remaining Estimate: 48h
<br>>
<br>> I need help with default paths for user, guest, admin to store their default pages, so that the different user can have the different default psml.
<br>> Another help I need is based on WML, HTML, XHTML using JSP's; where do I store those files for different device?
<br>> I am currently using Jetspeed-2.2.0 which is much different than Jetspeed 2.1.3 that I have used before. Where can I get the documentation on Jetspeed 2.2.0 besides <a href="http://portals.apache.org/jetspeed-2" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2</a> ?
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828347&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828347&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26828323
[jira] Created: (JS2-1091) Admin to set some portlets to out-of-service state at runtime.
2009-12-17T05:55:18Z
2009-12-17T05:55:18Z
Jetspeed - Dev mailing list
Admin to set some portlets to out-of-service state at runtime.
<br>--------------------------------------------------------------
<br><br> Key: JS2-1091
<br> URL: <a href="https://issues.apache.org/jira/browse/JS2-1091" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1091</a><br> Project: Jetspeed 2
<br> Issue Type: Improvement
<br> Components: Admin Portlets
<br> Reporter: Woonsan Ko
<br> Assignee: Woonsan Ko
<br> Fix For: 2.2.1
<br><br><br>The PortletTrackingManager renders "Portlet is not responding and has been taken out of service." when a portlet window is timed-out.
<br>I think we can imporove this with the following features:
<br> - Administrator can mark a portlet or a portlet application as "out-of-service" in a UI.
<br> - PortletTrackingManager read the above information as well to decide if the portlet window is out-of-service.
<br> - The message for the out-of-service portlets can be configured.
<br><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828323&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828323&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26828164
svn commit: r891699 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
2009-12-17T05:43:05Z
2009-12-17T05:43:05Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 13:43:05 2009
<br>New Revision: 891699
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891699&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891699&view=rev</a><br>Log:
<br>JS2-1057: Adding custom portlet modes
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891699&r1=891698&r2=891699&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891699&r1=891698&r2=891699&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Thu Dec 17 13:43:05 2009
<br>@@ -2358,20 +2358,26 @@
<br> </preference>
<br> </portlet-preferences>
<br> </portlet>
<br>-
<br>+
<br>+ <custom-portlet-mode>
<br>+ <description>Custom About Mode</description>
<br>+ <portlet-mode>about</portlet-mode>
<br>+ </custom-portlet-mode>
<br> <custom-portlet-mode>
<br>- <description>a Custom Config Mode</description>
<br>+ <description>Custom Config Mode</description>
<br> <portlet-mode>config</portlet-mode>
<br> </custom-portlet-mode>
<br>-
<br> <custom-portlet-mode>
<br>- <description>a Custom Edit_defaults Mode</description>
<br>+ <description>Custom Edit_defaults Mode</description>
<br> <portlet-mode>edit_defaults</portlet-mode>
<br> </custom-portlet-mode>
<br>-
<br> <custom-portlet-mode>
<br>- <description>a Custom Preview Mode</description>
<br>+ <description>Custom Preview Mode</description>
<br> <portlet-mode>preview</portlet-mode>
<br> </custom-portlet-mode>
<br>+ <custom-portlet-mode>
<br>+ <description>Custom Print Mode</description>
<br>+ <portlet-mode>print</portlet-mode>
<br>+ </custom-portlet-mode>
<br>
<br> </portlet-app>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828164&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26828164&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26827053
svn commit: r891663 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-17T04:03:26Z
2009-12-17T04:03:26Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 12:03:20 2009
<br>New Revision: 891663
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891663&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891663&view=rev</a><br>Log:
<br>JS2-1057: Fixing keywords search
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891663&r1=891662&r2=891663&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891663&r1=891662&r2=891663&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Thu Dec 17 12:03:20 2009
<br>@@ -347,6 +347,7 @@
<br>
<br> var loadPortletsInCategory = function(e) {
<br> var category = ('string' == typeof(e) ? e : null);
<br>+ var keywords = null;
<br> if (!category) {
<br> var categories = Y.Node.getDOMNode(e.target);
<br> category = categories.options[categories.selectedIndex].value;
<br>@@ -354,10 +355,17 @@
<br> if (!category) {
<br> return;
<br> }
<br>+ var option = Y.Node.one("#<portlet:namespace/>categories").one("[value='" + category + "']");
<br>+ if (option) {
<br>+ keywords = option.getAttribute("keywords").replace(/\s*,\s*/g, " | ");
<br>+ }
<br>+ if (!keywords) {
<br>+ keywords = category;
<br>+ }
<br> Y.Cookie.set("toolboxcat", category);
<br> var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
<br> uri += "&max=" + pagination.portlet.pageSize + "&begin=0";
<br>- uri += "&query=" + category;
<br>+ uri += "&query=" + encodeURIComponent(keywords);
<br> pagination.portlet.uri = uri;
<br> var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
<br> Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>form")).query.value = "";
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827053&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827053&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26827040
svn commit: r891662 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
2009-12-17T04:02:09Z
2009-12-17T04:02:09Z
woonsan
Author: woonsan
<br>Date: Thu Dec 17 12:02:08 2009
<br>New Revision: 891662
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891662&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891662&view=rev</a><br>Log:
<br>JS2-1057: Fixing keywords search
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=891662&r1=891661&r2=891662&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=891662&r1=891661&r2=891662&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Thu Dec 17 12:02:08 2009
<br>@@ -85,12 +85,12 @@
<br>
<br> @GET
<br> @Path("/application/{path:.*}")
<br>- public PortletApplicationBeanCollection getPortletApplication(@Context HttpServletRequest servletRequest,
<br>- @Context UriInfo uriInfo,
<br>- @PathParam("path") List<PathSegment> pathSegments,
<br>- @QueryParam("query") String queryParam,
<br>- @QueryParam("begin") String beginIndexParam,
<br>- @QueryParam("max") String maxResultsParam)
<br>+ public PortletApplicationBeanCollection getPortletApplications(@Context HttpServletRequest servletRequest,
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments,
<br>+ @QueryParam("query") String queryParam,
<br>+ @QueryParam("begin") String beginIndexParam,
<br>+ @QueryParam("max") String maxResultsParam)
<br> {
<br> String applicationName = null;
<br>
<br>@@ -109,7 +109,8 @@
<br>
<br> if (!StringUtils.isBlank(queryParam))
<br> {
<br>- String queryText = ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" AND " + queryParam;
<br>+ String queryText =
<br>+ ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" AND ( " + queryParam + " )";
<br> SearchResults searchResults = searchEngine.search(queryText);
<br> List<ParsedObject> searchResultList = searchResults.getResults();
<br> paBeans.setTotalSize(searchResultList.size());
<br>@@ -162,12 +163,12 @@
<br>
<br> @GET
<br> @Path("/definition/{path:.*}")
<br>- public PortletDefinitionBeanCollection getPortletDefinition(@Context HttpServletRequest servletRequest,
<br>- @Context UriInfo uriInfo,
<br>- @PathParam("path") List<PathSegment> pathSegments,
<br>- @QueryParam("query") String queryParam,
<br>- @QueryParam("begin") String beginIndexParam,
<br>- @QueryParam("max") String maxResultsParam)
<br>+ public PortletDefinitionBeanCollection getPortletDefinitions(@Context HttpServletRequest servletRequest,
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments,
<br>+ @QueryParam("query") String queryParam,
<br>+ @QueryParam("begin") String beginIndexParam,
<br>+ @QueryParam("max") String maxResultsParam)
<br> {
<br> String applicationName = null;
<br> String definitionName = null;
<br>@@ -198,7 +199,7 @@
<br> String queryText =
<br> ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET + "\" " +
<br> "AND NOT " + ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" " +
<br>- "AND " + queryParam;
<br>+ "AND ( " + queryParam + " )";
<br> SearchResults searchResults = searchEngine.search(queryText);
<br> List<ParsedObject> searchResultList = searchResults.getResults();
<br> ArrayList<PortletDefinition> searchedPortletDefinitions = new ArrayList<PortletDefinition>();
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827040&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827040&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26824737
[jira] Commented: (JS2-1090) Jetspeed 2.1 derby database becoming huge.
2009-12-17T00:28:18Z
2009-12-17T00:28:18Z
Jetspeed - Dev mailing list
<br> [ <a href="https://issues.apache.org/jira/browse/JS2-1090?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12791845#action_12791845" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1090?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12791845#action_12791845</a> ]
<br><br>Nishant Malviya commented on JS2-1090:
<br>--------------------------------------
<br><br>Hi David,
<br>
<br>Here is some more detail from our customer:
<br><br>They have 85 users (3 built-in), 40 pages, 6 roles (5 built-in), 1 group (all users are members of this group and they don't really use this group anywhere). The built-in admin security constraint is assigned to 5 pages, so that only admin users can see those pages. All the other users see the same pages with the default security.
<br>regards
<br><br>Nishant
<br><br><div class='shrinkable-quote'><br>> Jetspeed 2.1 derby database becoming huge.
<br>> ------------------------------------------
<br>>
<br>> Key: JS2-1090
<br>> URL: <a href="https://issues.apache.org/jira/browse/JS2-1090" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1090</a><br>> Project: Jetspeed 2
<br>> Issue Type: Task
<br>> Affects Versions: 2.1.1-RC
<br>> Environment: Windows 2003 SP2
<br>> Reporter: Nishant Malviya
<br>> Fix For: 2.1.1-RC
<br>>
<br>>
<br>> The customer has 2 portlet applications. one with 36 portlets and the second one with only 1 portlet. The customer is complaining that there are a couple .dat files that are taking up a large amount of space:
<br>> ...jetspeed\2.1\database\derby\productiondb\seg0:
<br>> c3c0.dat (12.5 GB)
<br>> c3d0.dat (8.78 GB)
<br>> There are 283 other *.dat files in the same folder of much smaller size. Does this amount of space seem reasonable for the amount of deployed portlets? Is there any way to reduce this size?
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824737&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824737&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26824123
svn commit: r891568 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages: apache_portals.link content.link
2009-12-16T23:12:53Z
2009-12-16T23:12:53Z
taylor-8
Author: taylor
<br>Date: Thu Dec 17 07:12:53 2009
<br>New Revision: 891568
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891568&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891568&view=rev</a><br>Log:
<br><a href="http://issues.apache.org/jira/browse/JS2-1057" target="_top" rel="nofollow">http://issues.apache.org/jira/browse/JS2-1057</a><br>example of new .dpsml menu -- click on Apache Portals link from Page Navigator
<br><br>Added:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link
<br>Removed:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/apache_portals.link
<br><br>Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link?rev=891568&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link?rev=891568&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link (added)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/content.link Thu Dec 17 07:12:53 2009
<br>@@ -0,0 +1,24 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+<link target="parent"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/link.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/link.xsd</a>">
<br>+ <title>Apache Portals</title>
<br>+ <url>/content/</url>
<br>+</link>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824123&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824123&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26824113
svn commit: r891567 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java java/org/apache/jetspeed/portlets/spaces/PageNavigator.java webapp/WEB-INF/view/spaces/page-navigator.jsp
2009-12-16T23:11:44Z
2009-12-16T23:11:44Z
taylor-8
Author: taylor
<br>Date: Thu Dec 17 07:11:44 2009
<br>New Revision: 891567
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891567&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891567&view=rev</a><br>Log:
<br><a href="http://issues.apache.org/jira/browse/JS2-1057" target="_top" rel="nofollow">http://issues.apache.org/jira/browse/JS2-1057</a><br>Start of new Page Navigator: Replacing demo PSML-Union implementation with a real meat-eating programmer's Site Menu implementation
<br>Still TODO:
<br>* remove Space Services, doesn't seem needed
<br>* add styles
<br>* menu operations (add,rename, delete), expand to submenus
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java?rev=891567&r1=891566&r2=891567&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java?rev=891567&r1=891566&r2=891567&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java Thu Dec 17 07:11:44 2009
<br>@@ -82,15 +82,18 @@
<br> if (breadcrumbsMenu != null)
<br> {
<br> List<MenuElement> breadcrumbsMenuElements = breadcrumbsMenu.getElements();
<br>- for (MenuElement breadcrumbMenuElement : breadcrumbsMenuElements)
<br>+ if (breadcrumbsMenuElements != null)
<br> {
<br>- if (breadcrumbMenuElement instanceof MenuOption)
<br>- {
<br>- MenuOption breadcrumbMenuOption = (MenuOption)breadcrumbMenuElement;
<br>- String title = breadcrumbMenuOption.getTitle(preferredLocale);
<br>- String url = admin.getPortalURL(request, response, breadcrumbMenuOption.getUrl());
<br>- breadcrumbs.add(new BreadcrumbMenuItem(title, url));
<br>- }
<br>+ for (MenuElement breadcrumbMenuElement : breadcrumbsMenuElements)
<br>+ {
<br>+ if (breadcrumbMenuElement instanceof MenuOption)
<br>+ {
<br>+ MenuOption breadcrumbMenuOption = (MenuOption)breadcrumbMenuElement;
<br>+ String title = breadcrumbMenuOption.getTitle(preferredLocale);
<br>+ String url = admin.getPortalURL(request, response, breadcrumbMenuOption.getUrl());
<br>+ breadcrumbs.add(new BreadcrumbMenuItem(title, url));
<br>+ }
<br>+ }
<br> }
<br> }
<br> }
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=891567&r1=891566&r2=891567&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=891567&r1=891566&r2=891567&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java Thu Dec 17 07:11:44 2009
<br>@@ -26,11 +26,16 @@
<br> import javax.portlet.PortletException;
<br> import javax.portlet.RenderRequest;
<br> import javax.portlet.RenderResponse;
<br>+import javax.servlet.http.HttpServletRequest;
<br>
<br> import org.apache.jetspeed.CommonPortletServices;
<br>+import org.apache.jetspeed.Jetspeed;
<br> import org.apache.jetspeed.administration.PortalAdministration;
<br>+import org.apache.jetspeed.container.url.BasePortalURL;
<br>+import org.apache.jetspeed.om.page.Link;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.page.PageManager;
<br>+import org.apache.jetspeed.request.RequestContext;
<br> import org.apache.jetspeed.spaces.Space;
<br> import org.apache.jetspeed.spaces.Spaces;
<br> import org.apache.portals.bridges.common.GenericServletPortlet;
<br>@@ -46,7 +51,8 @@
<br> {
<br> private Spaces spacesService;
<br> private PortalAdministration admin;
<br>- protected PageManager pageManager;
<br>+ protected PageManager pageManager;
<br>+ private BasePortalURL baseUrlAccess = null;
<br>
<br> public void init(PortletConfig config) throws PortletException
<br> {
<br>@@ -64,7 +70,16 @@
<br> if (null == pageManager)
<br> {
<br> throw new PortletException("Failed to find the Page Manager on portlet initialization");
<br>- }
<br>+ }
<br>+ try
<br>+ {
<br>+ baseUrlAccess = (BasePortalURL) Jetspeed.getComponentManager().getComponent("BasePortalURL");
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ baseUrlAccess = null; // optional
<br>+ }
<br>+
<br> }
<br>
<br> @SuppressWarnings("unchecked")
<br>@@ -76,6 +91,7 @@
<br> {
<br> request.getPortletSession().removeAttribute("spaces");
<br> request.getPortletSession().removeAttribute("pages");
<br>+ request.getPortletSession().removeAttribute("links");
<br> request.getPortletSession().removeAttribute("space");
<br> }
<br> List<Space> spaces = (List<Space>)request.getPortletSession().getAttribute("spaces");
<br>@@ -101,15 +117,9 @@
<br> }
<br> }
<br> request.getPortletSession().setAttribute("space", space);
<br>- }
<br>-
<br>- List<Page> pages = (List<Page>)request.getPortletSession().getAttribute("pages");
<br>- if (pages == null)
<br>- {
<br>- pages = spacesService.listPages(space);
<br>- request.getPortletSession().setAttribute("pages", pages);
<br>- }
<br>- request.setAttribute("pages", pages);
<br>+ }
<br>+ request.setAttribute("space", space);
<br>+ request.setAttribute("pageNavigator", this);
<br>
<br> try
<br> {
<br>@@ -124,12 +134,6 @@
<br> public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException,
<br> IOException
<br> {
<br>- String page = actionRequest.getParameter("page");
<br>- if (page != null)
<br>- {
<br>- String path = admin.getPortalURL(actionRequest, actionResponse, page);
<br>- actionResponse.sendRedirect(path);
<br>- }
<br> String addPage = actionRequest.getParameter("addPage");
<br> if (addPage != null)
<br> {
<br>@@ -147,6 +151,7 @@
<br> pageManager.updatePage(newPage);
<br>
<br> actionRequest.getPortletSession().removeAttribute("pages");
<br>+ actionRequest.getPortletSession().removeAttribute("links");
<br> String redirect = admin.getPortalURL(actionRequest, actionResponse, path);
<br> actionResponse.sendRedirect(redirect);
<br> }
<br>@@ -156,5 +161,33 @@
<br> }
<br> }
<br> }
<br>- }
<br>+ }
<br>+
<br>+ public String getAbsoluteUrl(String relativePath, RenderResponse renderResponse, RequestContext rc)
<br>+ {
<br>+ // only rewrite a non-absolute url
<br>+ if (relativePath != null && relativePath.indexOf("://") == -1 && relativePath.indexOf("mailto:") == -1)
<br>+ {
<br>+ HttpServletRequest request = rc.getRequest();
<br>+ StringBuffer path = new StringBuffer();
<br>+ if ( !rc.getPortalURL().isRelativeOnly() )
<br>+ {
<br>+ if (this.baseUrlAccess == null)
<br>+ {
<br>+ path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(request.getServerPort());
<br>+ }
<br>+ else
<br>+ {
<br>+ path.append(baseUrlAccess.getServerScheme()).append("://").append(baseUrlAccess.getServerName()).append(":").append(baseUrlAccess.getServerPort());
<br>+ }
<br>+ }
<br>+ return renderResponse.encodeURL(path.append(request.getContextPath()).append(request.getServletPath()).append(relativePath).toString());
<br>+
<br>+ }
<br>+ else
<br>+ {
<br>+ return relativePath;
<br>+ }
<br>+ }
<br>+
<br> }
<br>\ No newline at end of file
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=891567&r1=891566&r2=891567&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=891567&r1=891566&r2=891567&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp Thu Dec 17 07:11:44 2009
<br>@@ -16,26 +16,83 @@
<br>
<br> --%>
<br> <%@page import="java.util.List"%>
<br>+<%@page import="java.util.Locale"%>
<br> <%@page import="java.text.DecimalFormat"%>
<br> <%@page import="java.text.NumberFormat"%>
<br> <%@page import="org.apache.jetspeed.spaces.Space"%>
<br> <%@page import="org.apache.jetspeed.om.page.Page"%>
<br>+<%@page import="org.apache.jetspeed.om.page.Link"%>
<br>+<%@page import="org.apache.jetspeed.portalsite.Menu"%>
<br>+<%@page import="org.apache.jetspeed.portalsite.MenuElement"%>
<br>+<%@page import="org.apache.jetspeed.portalsite.MenuOption"%>
<br> <%@page import="org.apache.jetspeed.CommonPortletServices"%>
<br>+<%@page import="org.apache.jetspeed.request.RequestContext"%>
<br>+<%@page import="org.apache.jetspeed.portalsite.PortalSiteRequestContext"%>
<br>+<%@page import="org.apache.jetspeed.portlets.spaces.PageNavigator"%>
<br>+
<br> <%@ page contentType="text/html" %>
<br> <%@ taglib uri="<a href="http://java.sun.com/jsp/jstl/fmt" target="_top" rel="nofollow">http://java.sun.com/jsp/jstl/fmt</a>" prefix="fmt" %>
<br> <%@ taglib uri="<a href="http://java.sun.com/portlet" target="_top" rel="nofollow">http://java.sun.com/portlet</a>" prefix="portlet"%>
<br>
<br> <portlet:defineObjects/>
<br>+<%
<br>+RequestContext rc = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+PortalSiteRequestContext psrc = (PortalSiteRequestContext)rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext");
<br>+Space space = (Space)renderRequest.getAttribute("space");
<br>+Locale locale = renderRequest.getLocale();
<br>+PageNavigator pageNavigator = (PageNavigator)renderRequest.getAttribute("pageNavigator");
<br>+%>
<br> <table>
<br>+ <tr><td class="portlet-section-body"><b><%=space.getName() %> Space</b></td> </tr>
<br>+<%
<br>+Menu spaceMenu = psrc.getMenu("pages");
<br>+for (MenuElement element : (List<MenuElement>)spaceMenu.getElements())
<br>+{
<br>+ if (element.getElementType().equals(MenuElement.OPTION_ELEMENT_TYPE))
<br>+ {
<br>+ MenuOption option = (MenuOption)element;
<br>+ String url = pageNavigator.getAbsoluteUrl(option.getUrl(), renderResponse, rc);
<br>+ %>
<br>+ <tr>
<br>+ <td class="portlet-section-body"><a href="<%=url%>"><%=element.getTitle(locale) %></a></td>
<br>+ </tr>
<br>+ <%
<br>+ }
<br>+ else
<br>+ {
<br>+ %>
<br>+ <tr>
<br>+ <td class="portlet-section-body">---</td>
<br>+ </tr>
<br>+ <%
<br>+ }
<br>+}
<br>+%>
<br>+ <tr>
<br>+ <th class="portlet-section-header" colspan="1"></th>
<br>+ </tr>
<br> <%
<br>-List<Page> pages = (List<Page>)renderRequest.getAttribute("pages");
<br>-for (Page pg : pages)
<br>+Menu linksMenu = psrc.getMenu("additional-links");
<br>+for (MenuElement element : (List<MenuElement>)linksMenu.getElements())
<br> {
<br>+ if (element.getElementType().equals(MenuElement.OPTION_ELEMENT_TYPE))
<br>+ {
<br>+ MenuOption option = (MenuOption)element;
<br>+ String url = pageNavigator.getAbsoluteUrl(option.getUrl(), renderResponse, rc);
<br> %>
<br> <tr>
<br>- <td class="portlet-section-body"><a href="<portlet:actionURL><portlet:param name='page' value='<%=pg.getPath()%>'/></portlet:actionURL>"><%=pg.getTitle() %></a></td>
<br>+ <td class="portlet-section-body"><a href="<%=url%>"><%=element.getTitle(locale) %></a></td>
<br>+ </tr>
<br>+<%
<br>+ }
<br>+ else
<br>+ {
<br>+%>
<br>+ <tr>
<br>+ <td class="portlet-section-body">---</td>
<br> </tr>
<br> <%
<br>+ }
<br> }
<br> %>
<br> <tr>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824113&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26824113&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26821313
svn commit: r891498 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
2009-12-16T16:49:59Z
2009-12-16T16:49:59Z
taylor-8
Author: taylor
<br>Date: Thu Dec 17 00:49:59 2009
<br>New Revision: 891498
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891498&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891498&view=rev</a><br>Log:
<br><a href="https://issues.apache.org/jira/browse/JS2-1084" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1084</a><br>respect container fragment size properties
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=891498&r1=891497&r2=891498&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=891498&r1=891497&r2=891498&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java Thu Dec 17 00:49:59 2009
<br>@@ -81,25 +81,32 @@
<br> // need to have a better algorithm to determine number of columns and fragment column sizes
<br> int numberOfColumns = 1;
<br> String layoutType = "OneColumn";
<br>- String fragmentColumnSizes = "100%";
<br>+ String fragmentColumnSizes = rootFragment.getProperty("sizes");
<br> if (jetspeedLayout.indexOf("Two") > -1)
<br> {
<br> numberOfColumns = 2;
<br> layoutType = "TwoColumn";
<br>- fragmentColumnSizes = "50%,50%";
<br>+ if (fragmentColumnSizes == null)
<br>+ fragmentColumnSizes = "50%,50%";
<br> }
<br> else if (jetspeedLayout.indexOf("Three") > -1)
<br> {
<br> numberOfColumns = 3;
<br> layoutType = "ThreeColumn";
<br>- fragmentColumnSizes = "33%,34%,33%";
<br>+ if (fragmentColumnSizes == null)
<br>+ fragmentColumnSizes = "33%,34%,33%";
<br> }
<br> else if (jetspeedLayout.indexOf("Four") > -1)
<br> {
<br> numberOfColumns = 4;
<br> layoutType = "FourColumn";
<br>- fragmentColumnSizes = "25%,25%,25%,25%";
<br>- }
<br>+ if (fragmentColumnSizes == null)
<br>+ fragmentColumnSizes = "25%,25%,25%,25%";
<br>+ }
<br>+ else
<br>+ {
<br>+ fragmentColumnSizes = "100%";
<br>+ }
<br> String [] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,");
<br> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
<br> ColumnLayout columnLayout = new ColumnLayout(numberOfColumns, layoutType, rootFragment.getFragments(), fragmentColumnSizesArray);
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26821313&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26821313&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26820290
Spring MVC portlets don't work correctly with pluto 2.0.0
2009-12-16T15:17:14Z
2009-12-16T15:17:14Z
Luis Montes-4
They worked fine with 1.x<br><br>In a porltet JSP file, calling request.getContextPath() gives the portal app "/pluto" and not the portlet app's context path.<br><br><br>Any ideas how to fix this?<br><br>Thanks,<br>
<br>Luis<br><br>
<p>From forum: <a href="http://old.nabble.com/Pluto---User-f200.html" embed="fixTarget[200]" target="_top" >Pluto - User</a></p>
tag:old.nabble.com,2006:post-26818045
svn commit: r891420 [1/2] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/pages/ components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/ components/jetspeed-page-layout/src/main/java/org/apache/...
2009-12-16T12:38:23Z
2009-12-16T12:38:23Z
rwatler
Author: rwatler
<br>Date: Wed Dec 16 20:38:20 2009
<br>New Revision: 891420
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891420&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891420&view=rev</a><br>Log:
<br>Jetspeed DynamicPage Support
<br>-----------------------------------------------------------
<br>- DynamicPage support added to PortalSite and PageLayout components
<br>- DynamicPage test cases added to PortalSite unit tests
<br>- minor implementation details addressed in exisiting low-level DynamicPage PageManager support, (requires DBPSML schema update)
<br>- added content type mapping component to the PortalSite infrastructure that implements content type and request path mapping via Spring configuration
<br>- removed old profiler content url mapping hooks and cleaned up portal request url processing to preserve request urls
<br>- added example content mapping page/portlet to demonstrate and test these features
<br><br>To test Apache Portals Website "mounted" in portal using DynamicPages:
<br><br><a href="http://localhost:8080/jetspeed/portal/content/" target="_top" rel="nofollow">http://localhost:8080/jetspeed/portal/content/</a><br><br>Significant files:
<br><br>applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml - DynamicPage used to support Apache Portals Website
<br>components/jetspeed-portal/src/test/assembly/page-manager.xml - configuration of PortalSiteContentTypeMapper
<br>jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java - portal URL and content Type Mapping in PortalSite
<br><br><br><br>Added:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java
<br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
<br><br>Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml (added)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,47 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+<dynamic-page id="default-content" content-type="*"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br>+
<br>+ <title>Jetspeed 2 Portals Content</title>
<br>+
<br>+ <fragment id="dcdp-1-layout" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
<br>+ <property name="sizes" value="80%,20%" />
<br>+ <fragment id="dcdp-2-dynamic-content" type="portlet" name="j2-admin::DynamicWebContentPortlet" decorator="gray-gradient-noborder">
<br>+ <property name="row" value="0" />
<br>+ <property name="column" value="0" />
<br>+ <preference name="SRC">
<br>+ <value><a href="http://portals.apache.org/" target="_top" rel="nofollow">http://portals.apache.org/</a></value>
<br>+ </preference>
<br>+ <preference name="PORTALPATH">
<br>+ <value>/content/</value>
<br>+ </preference>
<br>+ </fragment>
<br>+ <fragment-reference id="dcdp-3-wp-reference" refid="wp-definition">
<br>+ <property name="row" value="0"/>
<br>+ <property name="column" value="1"/>
<br>+ </fragment-reference>
<br>+ </fragment>
<br>+
<br>+ <security-constraints>
<br>+ <security-constraints-ref>public-view</security-constraints-ref>
<br>+ </security-constraints>
<br>+
<br>+</dynamic-page>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java Wed Dec 16 20:38:20 2009
<br>@@ -37,6 +37,7 @@
<br> {
<br> private LinkedList elements = new LinkedList();
<br> private String requestPath;
<br>+ private String requestServerName;
<br>
<br> public List getElements()
<br> {
<br>@@ -45,13 +46,27 @@
<br>
<br> public void init(Profiler profiler, String requestPath)
<br> {
<br>+ init(profiler, requestPath, null);
<br>+ }
<br>+
<br>+ public void init(Profiler profiler, String requestPath, String requestServerName)
<br>+ {
<br> if (requestPath != null)
<br>+ {
<br> if (requestPath.indexOf("/") != -1)
<br>+ {
<br> this.requestPath = requestPath;
<br>+ }
<br> else
<br>+ {
<br> this.requestPath = "/" + requestPath;
<br>+ }
<br>+ }
<br> else
<br>+ {
<br> this.requestPath = "/";
<br>+ }
<br>+ this.requestServerName = requestServerName;
<br> }
<br>
<br> public Iterator iterator()
<br>@@ -176,4 +191,9 @@
<br> {
<br> return requestPath;
<br> }
<br>+
<br>+ public String getRequestServerName()
<br>+ {
<br>+ return requestServerName;
<br>+ }
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -28,15 +28,20 @@
<br> import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.page.PageManager;
<br>+import org.apache.jetspeed.page.PageNotFoundException;
<br>+import org.apache.jetspeed.page.PageNotRemovedException;
<br>+import org.apache.jetspeed.page.PageNotUpdatedException;
<br> import org.apache.jetspeed.om.folder.Folder;
<br> import org.apache.jetspeed.om.page.BaseFragmentElement;
<br> import org.apache.jetspeed.om.page.BaseFragmentsElement;
<br> import org.apache.jetspeed.om.page.BasePageElement;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br>+import org.apache.jetspeed.om.page.DynamicPage;
<br> import org.apache.jetspeed.om.page.Fragment;
<br> import org.apache.jetspeed.om.page.FragmentDefinition;
<br> import org.apache.jetspeed.om.page.FragmentReference;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.page.PageFragment;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br>@@ -46,6 +51,7 @@
<br> import org.apache.jetspeed.om.page.impl.ContentPageImpl;
<br> import org.apache.jetspeed.om.portlet.LocalizedField;
<br> import org.apache.jetspeed.om.preference.FragmentPreference;
<br>+import org.apache.jetspeed.page.document.NodeException;
<br> import org.apache.pluto.container.PortletPreference;
<br>
<br> import org.slf4j.Logger;
<br>@@ -96,7 +102,7 @@
<br> }
<br>
<br> // retrieve current page and root fragment from page manager
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> BaseFragmentElement rootFragment = page.getRootFragment();
<br> if (!(rootFragment instanceof Fragment))
<br> {
<br>@@ -126,7 +132,7 @@
<br> fragment.getFragments().add(newFragment);
<br>
<br> // update page in page manager
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br>
<br> // update content page context
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>@@ -178,14 +184,14 @@
<br> {
<br> throw new IllegalArgumentException("Locked content fragment is not mutable");
<br> }
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage)
<br> {
<br> throw new IllegalArgumentException("Only page fragments can be modified");
<br> }
<br>
<br> // retrieve current page and fragment from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> BaseFragmentElement parentFragment = page.getFragmentById(contentFragmentImpl.getFragment().getId());
<br> if (!(parentFragment instanceof Fragment))
<br> {
<br>@@ -215,7 +221,7 @@
<br> fragment.getFragments().add(newFragment);
<br>
<br> // update page in page manager
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br>
<br> // update content context
<br> ContentFragmentImpl newContentFragmentImpl = newContentFragment(contentFragmentImpl.getId(), page, null, page, newFragment, false);
<br>@@ -251,7 +257,7 @@
<br> }
<br>
<br> // retrieve current page and root fragment from page manager
<br>- Page page = pageManager.getPage(contentPage.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPage.getPage().getPath());
<br> BaseFragmentElement rootFragment = page.getRootFragment();
<br> if (!(rootFragment instanceof Fragment))
<br> {
<br>@@ -273,7 +279,7 @@
<br> fragment.getFragments().add(newFragment);
<br>
<br> // update page in page manager
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br>
<br> // update content page context
<br> ContentFragmentImpl newContentFragmentImpl = newContentFragment(pageRootContentFragmentImpl.getId(), page, null, page, newFragment, false);
<br>@@ -296,7 +302,7 @@
<br> {
<br> // retrieve current page and parent folders from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder pageFolder = (Folder)page.getParent();
<br> Folder documentOrderingFolder = (Folder)pageFolder.getParent();
<br> if (documentOrderingFolder != null)
<br>@@ -328,7 +334,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder documentOrderingFolder = (Folder)page.getParent();
<br>
<br> // check for edit permission
<br>@@ -357,7 +363,7 @@
<br> {
<br> // retrieve current page and parent folders from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder pageFolder = (Folder)page.getParent();
<br> Folder documentOrderingFolder = (Folder)pageFolder.getParent();
<br> if (documentOrderingFolder != null)
<br>@@ -389,7 +395,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder documentOrderingFolder = (Folder)page.getParent();
<br>
<br> // check for edit permission
<br>@@ -439,14 +445,14 @@
<br> {
<br> throw new IllegalArgumentException("Cannot use move fragment operation between pages");
<br> }
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentPageImpl.getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentPageImpl.getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Fragment reference and page not consistent or mutable");
<br> }
<br>
<br> // retrieve current page and fragments from page manager
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> BaseFragmentElement fromFragmentElement = page.getFragmentById(fromContentFragmentImpl.getFragment().getId());
<br> if (!(fromFragmentElement instanceof Fragment))
<br> {
<br>@@ -472,7 +478,7 @@
<br> // move page fragment and update page in page manager
<br> fragment = fromFragment.removeFragmentById(fragment.getId());
<br> toFragment.getFragments().add(fragment);
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br>
<br> // update content context
<br> fromContentFragmentImpl.removeFragmentById(fragmentId);
<br>@@ -489,7 +495,7 @@
<br> /* (non-Javadoc)
<br> * @see org.apache.jetspeed.layout.PageLayoutComponent#newContentPage(org.apache.jetspeed.om.page.Page, org.apache.jetspeed.om.page.PageTemplate, java.util.Map)
<br> */
<br>- public ContentPage newContentPage(Page page, PageTemplate pageTemplate, Map fragmentDefinitions)
<br>+ public ContentPage newContentPage(BaseConcretePageElement page, PageTemplate pageTemplate, Map fragmentDefinitions)
<br> {
<br> // generate content page
<br> String contentPageId = page.getId();
<br>@@ -573,7 +579,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder folder = (Folder)page.getParent();
<br>
<br> // check for edit permission
<br>@@ -681,7 +687,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder folder = (Folder)page.getParent();
<br>
<br> // check for edit permission
<br>@@ -751,7 +757,7 @@
<br> {
<br> // retrieve current page and document ordering folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> String documentName = page.getName();
<br> Folder documentOrderingFolder = (Folder)page.getParent();
<br>
<br>@@ -759,7 +765,7 @@
<br> page.checkAccess(JetspeedActions.EDIT);
<br>
<br> // remove in page manager
<br>- pageManager.removePage(page);
<br>+ removePage(page);
<br>
<br> // check for ordering folder edit permission
<br> documentOrderingFolder.checkAccess(JetspeedActions.EDIT);
<br>@@ -788,7 +794,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder folder = (Folder)page.getParent();
<br> String documentName = folder.getName();
<br> Folder documentOrderingFolder = (Folder)folder.getParent();
<br>@@ -837,14 +843,14 @@
<br> {
<br> throw new IllegalArgumentException("Parent content fragment and page not consistent or locked");
<br> }
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentPageImpl.getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentPageImpl.getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Fragment reference and page not consistent or mutable");
<br> }
<br>
<br> // retrieve current page and fragment from page manager
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -859,7 +865,7 @@
<br> boolean update = (page.removeFragmentById(pageFragmentId) != null);
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -881,14 +887,14 @@
<br> {
<br> // validate content fragment
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Only page fragments and fragment references are mutable");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -910,7 +916,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -938,7 +944,7 @@
<br>
<br> // retrieve current page from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br>
<br> // check for edit permission
<br> page.checkAccess(JetspeedActions.EDIT);
<br>@@ -954,7 +960,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -979,7 +985,7 @@
<br> {
<br> // retrieve current page and parent folder from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br> Folder folder = (Folder)page.getParent();
<br>
<br> // check for edit permission
<br>@@ -1034,14 +1040,14 @@
<br> {
<br> throw new IllegalArgumentException("Locked content fragment is not mutable");
<br> }
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage)
<br> {
<br> throw new IllegalArgumentException("Only page fragments can be modified");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> BaseFragmentElement foundFragment = page.getFragmentById(contentFragmentImpl.getFragment().getId());
<br> if (!(foundFragment instanceof Fragment))
<br> {
<br>@@ -1061,7 +1067,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -1083,14 +1089,14 @@
<br> {
<br> // validate content fragment
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Only page fragments and fragment references are mutable");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -1145,7 +1151,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -1186,14 +1192,14 @@
<br> {
<br> // validate content fragment
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Only page fragments and fragment references are mutable");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -1242,7 +1248,7 @@
<br> fragment.getPreferences().add(preference);
<br> }
<br> }
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br>
<br> // update content context
<br> contentFragmentImpl.setPreferences(preferences);
<br>@@ -1263,14 +1269,14 @@
<br> {
<br> // validate content fragment
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Only page fragments and fragment references are mutable");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -1301,7 +1307,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -1330,14 +1336,14 @@
<br> {
<br> // validate content fragment
<br> ContentFragmentImpl contentFragmentImpl = (ContentFragmentImpl)contentFragment;
<br>- boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof Page) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br>+ boolean contentFragmentDefinitionIsPage = ((contentFragmentImpl.getDefinition() instanceof BaseConcretePageElement) && contentFragmentImpl.getDefinition().getPath().equals(contentFragmentImpl.getPage().getPath()));
<br> if (!contentFragmentDefinitionIsPage && (contentFragmentImpl.getReference() == null))
<br> {
<br> throw new IllegalArgumentException("Only page fragments and fragment references are mutable");
<br> }
<br>
<br> // retrieve current fragment and page from page manager
<br>- Page page = pageManager.getPage(contentFragmentImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentFragmentImpl.getPage().getPath());
<br> String pageFragmentId = (contentFragmentDefinitionIsPage ? contentFragmentImpl.getFragment().getId() : contentFragmentImpl.getReference().getId());
<br> BaseFragmentElement fragment = page.getFragmentById(pageFragmentId);
<br> if (fragment == null)
<br>@@ -1368,7 +1374,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -1397,7 +1403,7 @@
<br> {
<br> // retrieve current page from page manager
<br> ContentPageImpl contentPageImpl = (ContentPageImpl)contentPage;
<br>- Page page = pageManager.getPage(contentPageImpl.getPage().getPath());
<br>+ BaseConcretePageElement page = getPage(contentPageImpl.getPage().getPath());
<br>
<br> // check for edit permission
<br> page.checkAccess(JetspeedActions.EDIT);
<br>@@ -1422,7 +1428,7 @@
<br> }
<br> if (update)
<br> {
<br>- pageManager.updatePage(page);
<br>+ updatePage(page);
<br> }
<br>
<br> // update content context
<br>@@ -1568,7 +1574,7 @@
<br> * @param locked locked fragment flag
<br> * @return content fragment hierarchy or null if undefined
<br> */
<br>- private ContentFragmentImpl newContentFragment(String parentId, Page page, Map fragmentDefinitions, BaseFragmentsElement definition, BaseFragmentElement fragment, boolean locked)
<br>+ private ContentFragmentImpl newContentFragment(String parentId, BaseConcretePageElement page, Map fragmentDefinitions, BaseFragmentsElement definition, BaseFragmentElement fragment, boolean locked)
<br> {
<br> // generate content fragment hierarchy for specific fragment;
<br> // merges fragment hierarchy and attributes from fragments,
<br>@@ -1645,7 +1651,7 @@
<br> * @param fragmentFragment referenced root PSML fragment from fragment definition
<br> * @return content fragment hierarchy or null if undefined
<br> */
<br>- private ContentFragmentImpl newContentFragment(String parentId, Page page, Map fragmentDefinitions, BaseFragmentsElement definition, FragmentReference fragmentReference, Fragment [] fragmentFragment)
<br>+ private ContentFragmentImpl newContentFragment(String parentId, BaseConcretePageElement page, Map fragmentDefinitions, BaseFragmentsElement definition, FragmentReference fragmentReference, Fragment [] fragmentFragment)
<br> {
<br> // generate content fragment hierarchy for reference fragment from
<br> // fragment definition root fragment if located
<br>@@ -1672,7 +1678,7 @@
<br> * @param locked locked fragment flag
<br> * @return content fragment hierarchy or null if undefined
<br> */
<br>- private ContentFragmentImpl newContentFragment(String id, Page page, Map fragmentDefinitions, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br>+ private ContentFragmentImpl newContentFragment(String id, BaseConcretePageElement page, Map fragmentDefinitions, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br> {
<br> // generate content fragment hierarchy for fragment
<br> ContentFragmentImpl contentFragmentImpl = new ContentFragmentImpl(this, id, page, definition, fragment, reference, locked);
<br>@@ -1846,4 +1852,69 @@
<br> }
<br> return false;
<br> }
<br>+
<br>+ /**
<br>+ * Get page or dynamic page from page manager.
<br>+ *
<br>+ * @param pagePath path to page
<br>+ * @return page or dynamic page
<br>+ * @throws PageNotFoundException
<br>+ * @throws NodeException
<br>+ */
<br>+ private BaseConcretePageElement getPage(String pagePath) throws PageNotFoundException, NodeException
<br>+ {
<br>+ if (pagePath.endsWith(Page.DOCUMENT_TYPE))
<br>+ {
<br>+ return pageManager.getPage(pagePath);
<br>+ }
<br>+ if (pagePath.endsWith(DynamicPage.DOCUMENT_TYPE))
<br>+ {
<br>+ return pageManager.getDynamicPage(pagePath);
<br>+ }
<br>+ throw new PageNotFoundException("Unable to classify page path by type: "+pagePath);
<br>+ }
<br>+
<br>+ /**
<br>+ * Update page or dynamic page using page manager.
<br>+ *
<br>+ * @param page page or dynamic page to update
<br>+ * @throws NodeException
<br>+ * @throws PageNotUpdatedException
<br>+ */
<br>+ private void updatePage(BaseConcretePageElement page) throws NodeException, PageNotUpdatedException
<br>+ {
<br>+ if (page instanceof Page)
<br>+ {
<br>+ pageManager.updatePage((Page)page);
<br>+ return;
<br>+ }
<br>+ if (page instanceof DynamicPage)
<br>+ {
<br>+ pageManager.updateDynamicPage((DynamicPage)page);
<br>+ return;
<br>+ }
<br>+ throw new PageNotUpdatedException("Unable to classify page by type: "+((page != null) ? page.getClass().getName() : "null"));
<br>+ }
<br>+
<br>+ /**
<br>+ * Remove page or dynamic page using page manager.
<br>+ *
<br>+ * @param page page or dynamic page to update
<br>+ * @throws NodeException
<br>+ * @throws PageNotRemovedException
<br>+ */
<br>+ private void removePage(BaseConcretePageElement page) throws NodeException, PageNotRemovedException
<br>+ {
<br>+ if (page instanceof Page)
<br>+ {
<br>+ pageManager.removePage((Page)page);
<br>+ return;
<br>+ }
<br>+ if (page instanceof DynamicPage)
<br>+ {
<br>+ pageManager.removeDynamicPage((DynamicPage)page);
<br>+ return;
<br>+ }
<br>+ throw new PageNotRemovedException("Unable to classify page by type: "+((page != null) ? page.getClass().getName() : "null"));
<br>+ }
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -27,11 +27,11 @@
<br> import org.apache.jetspeed.decoration.Decoration;
<br> import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.layout.impl.PageLayoutComponentUtils;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.BaseFragmentsElement;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.Fragment;
<br> import org.apache.jetspeed.om.page.FragmentReference;
<br>-import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.preference.FragmentPreference;
<br> import org.apache.pluto.container.PortletPreference;
<br>
<br>@@ -50,7 +50,7 @@
<br>
<br> private PageLayoutComponent pageLayoutComponent;
<br> private String id;
<br>- private Page page;
<br>+ private BaseConcretePageElement page;
<br> private BaseFragmentsElement definition;
<br> private Fragment fragment;
<br> private FragmentReference reference;
<br>@@ -116,7 +116,7 @@
<br> * @param reference PSML page fragment reference
<br> * @param locked locked flag
<br> */
<br>- public ContentFragmentImpl(PageLayoutComponent pageLayoutComponent, String id, Page page, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br>+ public ContentFragmentImpl(PageLayoutComponent pageLayoutComponent, String id, BaseConcretePageElement page, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br> {
<br> this.pageLayoutComponent = pageLayoutComponent;
<br> this.id = id;
<br>@@ -838,7 +838,7 @@
<br> *
<br> * @return the PSML page
<br> */
<br>- public Page getPage()
<br>+ public BaseConcretePageElement getPage()
<br> {
<br> return page;
<br> }
<br>@@ -884,7 +884,7 @@
<br> * @param reference PSML page fragment reference
<br> * @param locked locked flag
<br> */
<br>- public void initialize(PageLayoutComponent pageLayoutComponent, Page page, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br>+ public void initialize(PageLayoutComponent pageLayoutComponent, BaseConcretePageElement page, BaseFragmentsElement definition, Fragment fragment, FragmentReference reference, boolean locked)
<br> {
<br> this.pageLayoutComponent = pageLayoutComponent;
<br> this.page = page;
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -23,9 +23,9 @@
<br>
<br> import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.layout.impl.PageLayoutComponentUtils;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br>-import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.om.portlet.GenericMetadata;
<br>
<br>@@ -39,7 +39,7 @@
<br> {
<br> private PageLayoutComponent pageLayoutComponent;
<br> private String id;
<br>- private Page page;
<br>+ private BaseConcretePageElement page;
<br> private PageTemplate pageTemplate;
<br> private Map fragmentDefinitions;
<br>
<br>@@ -83,7 +83,7 @@
<br> * @param pageTemplate PSML page template
<br> * @param fragmentDefinitions PSML fragment definitions
<br> */
<br>- public ContentPageImpl(PageLayoutComponent pageLayoutComponent, String id, Page page, PageTemplate pageTemplate, Map fragmentDefinitions)
<br>+ public ContentPageImpl(PageLayoutComponent pageLayoutComponent, String id, BaseConcretePageElement page, PageTemplate pageTemplate, Map fragmentDefinitions)
<br> {
<br> this.pageLayoutComponent = pageLayoutComponent;
<br> this.id = id;
<br>@@ -208,7 +208,7 @@
<br> /* (non-Javadoc)
<br> * @see org.apache.jetspeed.om.page.ContentPage#getPage()
<br> */
<br>- public Page getPage()
<br>+ public BaseConcretePageElement getPage()
<br> {
<br> return page;
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/DynamicPageImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -28,22 +28,22 @@
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>- private String pageType;
<br>+ private String contentType;
<br>
<br> /* (non-Javadoc)
<br>- * @see org.apache.jetspeed.om.page.DynamicPage#getPageType()
<br>+ * @see org.apache.jetspeed.om.page.DynamicPage#getContentType()
<br> */
<br>- public String getPageType()
<br>+ public String getContentType()
<br> {
<br>- return pageType;
<br>+ return contentType;
<br> }
<br>
<br> /* (non-Javadoc)
<br>- * @see org.apache.jetspeed.om.page.DynamicPage#setPageType(java.lang.String)
<br>+ * @see org.apache.jetspeed.om.page.DynamicPage#setContentType(java.lang.String)
<br> */
<br>- public void setPageType(String pageType)
<br>+ public void setContentType(String contentType)
<br> {
<br>- this.pageType = pageType;
<br>+ this.contentType = contentType;
<br> }
<br>
<br> /* (non-Javadoc)
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DynamicPageImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -28,22 +28,22 @@
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>- private String pageType;
<br>+ private String contentType;
<br>
<br> /* (non-Javadoc)
<br>- * @see org.apache.jetspeed.om.page.DynamicPage#getPageType()
<br>+ * @see org.apache.jetspeed.om.page.DynamicPage#getContentType()
<br> */
<br>- public String getPageType()
<br>+ public String getContentType()
<br> {
<br>- return pageType;
<br>+ return contentType;
<br> }
<br>
<br> /* (non-Javadoc)
<br>- * @see org.apache.jetspeed.om.page.DynamicPage#setPageType(java.lang.String)
<br>+ * @see org.apache.jetspeed.om.page.DynamicPage#setContentType(java.lang.String)
<br> */
<br>- public void setPageType(String pageType)
<br>+ public void setContentType(String contentType)
<br> {
<br>- this.pageType = pageType;
<br>+ this.contentType = contentType;
<br> }
<br>
<br> /* (non-Javadoc)
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java Wed Dec 16 20:38:20 2009
<br>@@ -1122,7 +1122,7 @@
<br> DynamicPage dynamicPage = newDynamicPage(path);
<br> copyPageAttributes(source, copyIds, dynamicPage);
<br> dynamicPage.setHidden(source.isHidden());
<br>- dynamicPage.setPageType(source.getPageType());
<br>+ dynamicPage.setContentType(source.getContentType());
<br> return dynamicPage;
<br> }
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml Wed Dec 16 20:38:20 2009
<br>@@ -95,8 +95,8 @@
<br> extends="org.apache.jetspeed.om.page.psml.AbstractBaseConcretePageElement">
<br> <map-to xml="dynamic-page"/>
<br>
<br>- <field name="pageType" type="string">
<br>- <bind-xml name="type" node="attribute"/>
<br>+ <field name="contentType" type="string">
<br>+ <bind-xml name="content-type" node="attribute"/>
<br> </field>
<br> </class>
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/ojb/page-manager-repository.xml Wed Dec 16 20:38:20 2009
<br>@@ -1578,8 +1578,8 @@
<br> <!-- org.apache.jetspeed.om.page.impl.DynamicPageImpl mapping -->
<br>
<br> <field-descriptor
<br>- name="pageType"
<br>- column="PAGE_TYPE"
<br>+ name="contentType"
<br>+ column="CONTENT_TYPE"
<br> jdbc-type="VARCHAR"
<br> />
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java Wed Dec 16 20:38:20 2009
<br>@@ -336,7 +336,7 @@
<br>
<br> DynamicPage testdynamicpage = pageManager.getDynamicPage("/test001.dpsml");
<br> assertTrue(testdynamicpage.getId().equals("/test001.dpsml"));
<br>- assertTrue(testdynamicpage.getPageType().equals("default"));
<br>+ assertTrue(testdynamicpage.getContentType().equals("default"));
<br> assertTrue(testdynamicpage.getTitle().equals("Test Dynamic Page"));
<br> assertTrue(testdynamicpage.getVersion().equals("2.77"));
<br> rootFragmentElement = testdynamicpage.getRootFragment();
<br>@@ -501,7 +501,7 @@
<br> assertTrue(bf instanceof PageFragment);
<br>
<br> DynamicPage dynamicpage = pageManager.newDynamicPage("/test002.dpsml");
<br>- dynamicpage.setPageType("default");
<br>+ dynamicpage.setContentType("default");
<br> dynamicpage.setTitle("Created Dynamic Page");
<br> rootFragmentElement = dynamicpage.getRootFragment();
<br> assertTrue(rootFragmentElement instanceof Fragment);
<br>@@ -528,7 +528,7 @@
<br> dynamicpage = pageManager.getDynamicPage("/test002.dpsml");
<br> assertNotNull(dynamicpage);
<br> assertTrue(dynamicpage.getId().equals("/test002.dpsml"));
<br>- assertEquals("default", dynamicpage.getPageType());
<br>+ assertEquals("default", dynamicpage.getContentType());
<br> assertEquals("Created Dynamic Page", dynamicpage.getTitle());
<br> assertNotNull(dynamicpage.getRootFragment());
<br> rootFragmentElement = dynamicpage.getRootFragment();
<br>@@ -1422,7 +1422,7 @@
<br> DynamicPage clonedynamicpage = pageManager.copyDynamicPage(testdynamicpage, "/cloned.dpsml");
<br> assertNotNull(clonedynamicpage);
<br> assertTrue(clonedynamicpage.getId().equals("/cloned.dpsml"));
<br>- assertTrue(clonedynamicpage.getPageType().equals("default"));
<br>+ assertTrue(clonedynamicpage.getContentType().equals("default"));
<br> assertTrue(clonedynamicpage.getTitle().equals("Clone Test Dynamic Page"));
<br> rootFragmentElement = clonedynamicpage.getRootFragment();
<br> assertTrue(rootFragmentElement instanceof Fragment);
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java Wed Dec 16 20:38:20 2009
<br>@@ -454,7 +454,7 @@
<br> pageManager.updatePageTemplate(pageTemplate);
<br>
<br> DynamicPage dynamicPage = pageManager.newDynamicPage("/dynamic-page.dpsml");
<br>- dynamicPage.setPageType("default");
<br>+ dynamicPage.setContentType("default");
<br> dynamicPage.setTitle("Created Dynamic Page");
<br> rootFragmentElement = dynamicPage.getRootFragment();
<br> assertTrue(rootFragmentElement instanceof Fragment);
<br>@@ -694,7 +694,7 @@
<br> {
<br> DynamicPage check = pageManager.getDynamicPage("/dynamic-page.dpsml");
<br> assertNotNull(check);
<br>- assertEquals("default", check.getPageType());
<br>+ assertEquals("default", check.getContentType());
<br> assertEquals("Created Dynamic Page", check.getTitle());
<br> assertNotNull(check.getRootFragment());
<br> BaseFragmentElement rootFragmentElement = check.getRootFragment();
<br>@@ -1062,7 +1062,7 @@
<br> DynamicPage dynamicPage = pageManager.getDynamicPage("/dynamic-page.dpsml");
<br> assertEquals("/dynamic-page.dpsml", dynamicPage.getPath());
<br> dynamicPage.setTitle("UPDATED");
<br>- dynamicPage.setPageType("UPDATED");
<br>+ dynamicPage.setContentType("UPDATED");
<br> pageManager.updateDynamicPage(dynamicPage);
<br>
<br> FragmentDefinition fragmentDefinition = pageManager.getFragmentDefinition("/fragment-definition.fpsml");
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -15,7 +15,7 @@
<br> See the License for the specific language governing permissions and
<br> limitations under the License.
<br> -->
<br>-<dynamic-page id="clonetest" type="default"
<br>+<dynamic-page id="clonetest" content-type="default"
<br> xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br> xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br> xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -15,7 +15,7 @@
<br> See the License for the specific language governing permissions and
<br> limitations under the License.
<br> -->
<br>-<dynamic-page id="test001" type="default" version='2.77'
<br>+<dynamic-page id="test001" content-type="default" version='2.77'
<br> xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br> xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br> xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/AbstractPatternMapping.java Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,39 @@
<br>+package org.apache.jetspeed.portalsite.impl;
<br>+
<br>+import java.util.regex.Matcher;
<br>+import java.util.regex.Pattern;
<br>+
<br>+/**
<br>+ * This class specifies an abstract pattern mapping definition for use
<br>+ * by the portal-site content type mapper component mappings.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818045&i=0" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id:$
<br>+ */
<br>+public class AbstractPatternMapping
<br>+{
<br>+ private String pattern;
<br>+ private Pattern compiledPattern;
<br>+
<br>+ /**
<br>+ * Construct pattern mapping.
<br>+ *
<br>+ * @param pattern mapping pattern
<br>+ */
<br>+ protected AbstractPatternMapping(String pattern)
<br>+ {
<br>+ this.pattern = pattern;
<br>+ this.compiledPattern = Pattern.compile(pattern);
<br>+ }
<br>+
<br>+ /**
<br>+ * Allocate new matcher for mapping pattern.
<br>+ *
<br>+ * @param input input string
<br>+ * @return allocated matcher
<br>+ */
<br>+ protected Matcher getPatternMatcher(String input)
<br>+ {
<br>+ return compiledPattern.matcher(input);
<br>+ }
<br>+}
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ContentTypeMapping.java Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,55 @@
<br>+package org.apache.jetspeed.portalsite.impl;
<br>+
<br>+import java.util.regex.Matcher;
<br>+
<br>+/**
<br>+ * This class specifies a content type mapping definition for use
<br>+ * by the portal-site content type mapper component.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818045&i=1" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id:$
<br>+ */
<br>+public class ContentTypeMapping extends AbstractPatternMapping
<br>+{
<br>+ private String mappedType;
<br>+ private boolean mappedTypeReplacements;
<br>+
<br>+ /**
<br>+ * Construct content type pattern mapping.
<br>+ *
<br>+ * @param pattern request path matching pattern
<br>+ * @param mappedType resulting content type
<br>+ */
<br>+ public ContentTypeMapping(String pattern, String mappedType)
<br>+ {
<br>+ super(pattern);
<br>+ this.mappedType = mappedType;
<br>+ this.mappedTypeReplacements = (mappedType.indexOf('$') != -1);
<br>+ }
<br>+
<br>+ /**
<br>+ * Match content type pattern against request path, replacing
<br>+ * all subsequence expressions in the mapped type.
<br>+ *
<br>+ * @param requestPath request path to match
<br>+ * @return mapped content type or null if not matched
<br>+ */
<br>+ public String map(String requestPath)
<br>+ {
<br>+ Matcher patternMatcher = getPatternMatcher(requestPath);
<br>+ if (patternMatcher.find())
<br>+ {
<br>+ String type = mappedType;
<br>+ if (mappedTypeReplacements)
<br>+ {
<br>+ for (int i = 0; (i <= patternMatcher.groupCount()); i++)
<br>+ {
<br>+ String groupMatch = requestPath.substring(patternMatcher.start(i), patternMatcher.end(i));
<br>+ type = type.replace("$"+i, groupMatch);
<br>+ }
<br>+ }
<br>+ return type;
<br>+ }
<br>+ return null;
<br>+ }
<br>+}
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -175,7 +175,7 @@
<br> else
<br> {
<br> // limit cyclic references to this menu if named and
<br>- // referencable as root menu instance
<br>+ // referenced as root menu instance
<br> boolean menuNameReferenced = false;
<br> if ((definition.getName() != null) && (parent == null))
<br> {
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -19,6 +19,7 @@
<br> import org.apache.jetspeed.om.folder.Folder;
<br> import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
<br> import org.apache.jetspeed.om.page.Link;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.page.document.Node;
<br> import org.apache.jetspeed.page.document.NodeNotFoundException;
<br>@@ -187,7 +188,7 @@
<br> if (context != null)
<br> {
<br> // get request page
<br>- Page requestPage = null;
<br>+ BaseConcretePageElement requestPage = null;
<br> try
<br> {
<br> requestPage = context.getPage();
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteContentTypeMapperImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,110 @@
<br>+package org.apache.jetspeed.portalsite.impl;
<br>+
<br>+import java.util.List;
<br>+
<br>+import org.apache.jetspeed.om.page.Page;
<br>+import org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper;
<br>+
<br>+/**
<br>+ * This class implements the the content type mapper component
<br>+ * for use with the portal-site component.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818045&i=2" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id:$
<br>+ */
<br>+public class PortalSiteContentTypeMapperImpl implements PortalSiteContentTypeMapper
<br>+{
<br>+ public static final String DEFAULT_PAGE_SYSTEM_TYPE_SUFFIX = Page.DOCUMENT_TYPE;
<br>+
<br>+ private List<ContentTypeMapping> contentTypeMappings;
<br>+ private List<RequestPathMapping> requestPathMappings;
<br>+
<br>+ /**
<br>+ * Construct default PortalSite content type mapper implementation.
<br>+ */
<br>+ public PortalSiteContentTypeMapperImpl()
<br>+ {
<br>+ this(null);
<br>+ }
<br>+
<br>+ /**
<br>+ * Construct default PortalSite content type mapper implementation.
<br>+ *
<br>+ * @param contentTypeMappings mappings to determine content type from request path
<br>+ */
<br>+ public PortalSiteContentTypeMapperImpl(List<ContentTypeMapping> contentTypeMappings)
<br>+ {
<br>+ this(contentTypeMappings, null);
<br>+ }
<br>+
<br>+ /**
<br>+ * Construct default PortalSite content type mapper implementation.
<br>+ *
<br>+ * @param contentTypeMappings mappings to determine content type from request path
<br>+ * @param requestPathMappings mappings to determine request path from server name,
<br>+ * content type, and request path
<br>+ */
<br>+ public PortalSiteContentTypeMapperImpl(List<ContentTypeMapping> contentTypeMappings, List<RequestPathMapping> requestPathMappings)
<br>+ {
<br>+ this.contentTypeMappings = contentTypeMappings;
<br>+ this.requestPathMappings = requestPathMappings;
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper#mapContentType(java.lang.String)
<br>+ */
<br>+ public String mapContentType(String requestPath)
<br>+ {
<br>+ // match content type patterns to determine content types
<br>+ if (contentTypeMappings != null)
<br>+ {
<br>+ for (ContentTypeMapping mapping : contentTypeMappings)
<br>+ {
<br>+ String contentType = mapping.map(requestPath);
<br>+ if (contentType != null)
<br>+ {
<br>+ return contentType;
<br>+ }
<br>+ }
<br>+ }
<br>+ return null;
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper#mapRequestPath(java.lang.String, java.lang.String, java.lang.String)
<br>+ */
<br>+ public String mapRequestPath(String serverName, String contentType, String requestPath)
<br>+ {
<br>+ if (requestPathMappings != null)
<br>+ {
<br>+ boolean requestPathMapped = false;
<br>+ for (RequestPathMapping mapping : requestPathMappings)
<br>+ {
<br>+ String mappedRequestPath = mapping.map(serverName, contentType, requestPath);
<br>+ if ((mappedRequestPath != null) && !mappedRequestPath.equals(requestPath))
<br>+ {
<br>+ requestPath = mappedRequestPath;
<br>+ requestPathMapped = true;
<br>+ }
<br>+ }
<br>+ if (requestPathMapped)
<br>+ {
<br>+ return requestPath;
<br>+ }
<br>+ }
<br>+ return null;
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper#mapSystemType(java.lang.String)
<br>+ */
<br>+ public String mapSystemType(String requestPath)
<br>+ {
<br>+ // match request path suffixes to determine page requests
<br>+ if (requestPath.endsWith(DEFAULT_PAGE_SYSTEM_TYPE_SUFFIX))
<br>+ {
<br>+ return PAGE_SYSTEM_TYPE;
<br>+ }
<br>+ return null;
<br>+ }
<br>+}
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -18,6 +18,7 @@
<br>
<br> import org.apache.jetspeed.page.PageManager;
<br> import org.apache.jetspeed.portalsite.PortalSite;
<br>+import org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper;
<br> import org.apache.jetspeed.portalsite.PortalSiteSessionContext;
<br>
<br> /**
<br>@@ -32,15 +33,22 @@
<br> * pageManager - PageManager component
<br> */
<br> private PageManager pageManager;
<br>+
<br>+ /**
<br>+ * contentTypeMapper - PortalSiteContentTypeMapper component
<br>+ */
<br>+ private PortalSiteContentTypeMapper contentTypeMapper;
<br>
<br> /**
<br> * PortalSiteImpl - component constructor
<br> *
<br> * @param pageManager PageManager component instance
<br>+ * @param contentTypeMapper PortalSiteContentTypeMapper component instance
<br> */
<br>- public PortalSiteImpl(PageManager pageManager)
<br>+ public PortalSiteImpl(PageManager pageManager, PortalSiteContentTypeMapper contentTypeMapper)
<br> {
<br> this.pageManager = pageManager;
<br>+ this.contentTypeMapper = contentTypeMapper;
<br> }
<br>
<br> /**
<br>@@ -50,7 +58,7 @@
<br> */
<br> public PortalSiteSessionContext newSessionContext()
<br> {
<br>- return new PortalSiteSessionContextImpl(pageManager);
<br>+ return new PortalSiteSessionContextImpl(pageManager, contentTypeMapper);
<br> }
<br>
<br> /**
<br>@@ -62,4 +70,14 @@
<br> {
<br> return pageManager;
<br> }
<br>+
<br>+ /**
<br>+ * getContentTypeMapper - return PortalSiteContentTypeMapper component instance
<br>+ *
<br>+ * @return PortalSiteContentTypeMapper instance
<br>+ */
<br>+ public PortalSiteContentTypeMapper getContentTypeMapper()
<br>+ {
<br>+ return contentTypeMapper;
<br>+ }
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -28,7 +28,7 @@
<br> import org.apache.jetspeed.om.folder.Folder;
<br> import org.apache.jetspeed.om.page.FragmentDefinition;
<br> import org.apache.jetspeed.om.page.FragmentReference;
<br>-import org.apache.jetspeed.om.page.Page;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.page.document.Node;
<br> import org.apache.jetspeed.page.document.NodeException;
<br>@@ -79,7 +79,7 @@
<br> /**
<br> * requestPage - cached request profiled page proxy
<br> */
<br>- private Page requestPage;
<br>+ private BaseConcretePageElement requestPage;
<br>
<br> /**
<br> * requestPageTemplate - cached request page template proxy
<br>@@ -230,14 +230,14 @@
<br> }
<br>
<br> /**
<br>- * getManagedPage - get request profiled concrete page instance
<br>- * as managed by the page manager
<br>+ * getManagedPage - get request profiled concrete page or dynamic page
<br>+ * instance as managed by the page manager
<br> *
<br> * @return managed page
<br> * @throws NodeNotFoundException if page not found
<br> * @throws SecurityException if page view access not granted
<br> */
<br>- public Page getManagedPage() throws NodeNotFoundException
<br>+ public BaseConcretePageElement getManagedPage() throws NodeNotFoundException
<br> {
<br> return sessionContext.getManagedPage(getPage());
<br> }
<br>@@ -296,7 +296,7 @@
<br> * @throws NodeNotFoundException if page not found
<br> * @throws SecurityException if page view access not granted
<br> */
<br>- public Page getPage() throws NodeNotFoundException
<br>+ public BaseConcretePageElement getPage() throws NodeNotFoundException
<br> {
<br> // select request page from session context using
<br> // request profile locators if not previously
<br>@@ -320,7 +320,7 @@
<br> if (!requestPageTemplateCached)
<br> {
<br> // get requested page
<br>- Page page = getPage();
<br>+ BaseConcretePageElement page = getPage();
<br> if (page != null)
<br> {
<br> // scan through site looking for first page template
<br>@@ -365,7 +365,7 @@
<br> if (!requestFragmentDefinitionsCached)
<br> {
<br> // get requested page and optional page template
<br>- Page page = getPage();
<br>+ BaseConcretePageElement page = getPage();
<br> PageTemplate pageTemplate = getPageTemplate();
<br> if (page != null)
<br> {
<br>@@ -471,7 +471,7 @@
<br> public Folder getFolder() throws NodeNotFoundException
<br> {
<br> // return parent folder of request page
<br>- Page page = getPage();
<br>+ BaseConcretePageElement page = getPage();
<br> if (page != null)
<br> {
<br> return (Folder)page.getParent();
<br>@@ -650,7 +650,7 @@
<br> {
<br> // access page and page templates to force request
<br> // page resolution
<br>- Page page = getPage();
<br>+ BaseConcretePageElement page = getPage();
<br> PageTemplate pageTemplate = getPageTemplate();
<br>
<br> // return available menu definition names from
<br>@@ -732,7 +732,7 @@
<br> {
<br> // access page and page template to force request
<br> // page resolution
<br>- Page page = getPage();
<br>+ BaseConcretePageElement page = getPage();
<br> PageTemplate pageTemplate = getPageTemplate();
<br> if ((page != null) && (name != null))
<br> {
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818045&i=3" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818045&i=4" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26818046
svn commit: r891420 [2/2] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/pages/ components/jetspeed-locator/src/main/java/org/apache/jetspeed/profiler/impl/ components/jetspeed-page-layout/src/main/java/org/apache/...
2009-12-16T12:38:23Z
2009-12-16T12:38:23Z
rwatler
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -32,8 +32,10 @@
<br> import javax.servlet.http.HttpSessionEvent;
<br>
<br> import org.apache.jetspeed.om.folder.Folder;
<br>+import org.apache.jetspeed.om.folder.FolderNotFoundException;
<br> import org.apache.jetspeed.om.page.DynamicPage;
<br> import org.apache.jetspeed.om.page.FragmentDefinition;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.page.PageManager;
<br>@@ -42,6 +44,7 @@
<br> import org.apache.jetspeed.page.document.NodeException;
<br> import org.apache.jetspeed.page.document.NodeNotFoundException;
<br> import org.apache.jetspeed.page.document.NodeSet;
<br>+import org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper;
<br> import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
<br> import org.apache.jetspeed.portalsite.PortalSiteSessionContext;
<br> import org.apache.jetspeed.portalsite.view.SiteView;
<br>@@ -89,6 +92,11 @@
<br> private transient PageManager pageManager;
<br>
<br> /**
<br>+ * contentTypeMapper - PortalSiteContentTypeMapper component
<br>+ */
<br>+ private transient PortalSiteContentTypeMapper contentTypeMapper;
<br>+
<br>+ /**
<br> * profileLocators - map of session profile locators by locator names
<br> */
<br> private transient Map profileLocators;
<br>@@ -140,10 +148,12 @@
<br> * PortalSiteSessionContextImpl - constructor
<br> *
<br> * @param pageManager PageManager component instance
<br>+ * @param contentTypeMapper PortalSiteContentTypeMapper component instance
<br> */
<br>- public PortalSiteSessionContextImpl(PageManager pageManager)
<br>+ public PortalSiteSessionContextImpl(PageManager pageManager, PortalSiteContentTypeMapper contentTypeMapper)
<br> {
<br> this.pageManager = pageManager;
<br>+ this.contentTypeMapper = contentTypeMapper;
<br> }
<br>
<br> /**
<br>@@ -214,13 +224,14 @@
<br> * @throws NodeNotFoundException if not found
<br> * @throws SecurityException if view access not granted
<br> */
<br>- public Page selectRequestPage(Map requestProfileLocators, boolean requestFallback, boolean useHistory, boolean forceReservedVisible) throws NodeNotFoundException
<br>+ public BaseConcretePageElement selectRequestPage(Map requestProfileLocators, boolean requestFallback, boolean useHistory, boolean forceReservedVisible) throws NodeNotFoundException
<br> {
<br> // validate and update session profile locators if modified
<br> if (updateSessionProfileLocators(requestProfileLocators, forceReservedVisible))
<br> {
<br>- // extract page request path from the locators
<br>+ // extract page request path and server from the locators
<br> String requestPath = Folder.PATH_SEPARATOR;
<br>+ String requestServerName = null;
<br> ProfileLocator locator = (ProfileLocator)requestProfileLocators.get(ProfileLocator.PAGE_LOCATOR);
<br> if (locator != null)
<br> {
<br>@@ -237,6 +248,62 @@
<br> locator = (ProfileLocator)requestProfileLocators.values().iterator().next();
<br> requestPath = locator.getRequestPath();
<br> }
<br>+ requestServerName = locator.getRequestServerName();
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Select request page: requestPath="+requestPath+", requestServerName: "+requestServerName);
<br>+ }
<br>+
<br>+ // determine content mapping for request path if content type
<br>+ // mapper configured for context
<br>+ if (contentTypeMapper != null)
<br>+ {
<br>+ // test for system page or folder request mappings; if system
<br>+ // types matched, continue below with native portal resolution
<br>+ // of request
<br>+ String systemType = contentTypeMapper.mapSystemType(requestPath);
<br>+ if (systemType == null)
<br>+ {
<br>+ // test for content type mappings; if no content type matched
<br>+ // request, continue with native portal resolution of request
<br>+ String contentType = contentTypeMapper.mapContentType(requestPath);
<br>+ if (contentType != null)
<br>+ {
<br>+ // log mapping
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Content request: requestPath="+requestPath+", mapped to content type: "+contentType);
<br>+ }
<br>+
<br>+ // support request path mapping of content requests
<br>+ String mappedRequestPath = contentTypeMapper.mapRequestPath(requestServerName, contentType, requestPath);
<br>+ if (mappedRequestPath != null)
<br>+ {
<br>+ // log mapping
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Mapped content request: serverName="+requestServerName+", contentType="+contentType+", requestPath="+requestPath+", mapped to: "+mappedRequestPath);
<br>+ }
<br>+ requestPath = mappedRequestPath;
<br>+ }
<br>+
<br>+ // attempt to match content request against dynamic pages
<br>+ // using profile locators and site view; start at root
<br>+ // folder until path no longer matches and search from
<br>+ // there back up toward the root for dynamic pages by
<br>+ // content type; fallback to wildcard content type
<br>+ return selectContentRequestPage(requestPath, contentType);
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ // log mapping
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("System request: requestPath="+requestPath+", mapped to system type: "+systemType);
<br>+ }
<br>+ }
<br>+ }
<br>
<br> // attempt to select request page or folder using
<br> // profile locators and site view; if fallback
<br>@@ -405,10 +472,10 @@
<br> // log modified page request
<br> if (log.isDebugEnabled() && !path.equals(requestPath))
<br> {
<br>- log.debug("Request page modified by profile locator: request path=" + path);
<br>+ log.debug("Request path modified by profile locator: request path=" + path + ", original request path=" + requestPath);
<br> }
<br>+ return path;
<br> }
<br>- return path;
<br> }
<br> }
<br> }
<br>@@ -680,6 +747,130 @@
<br> }
<br>
<br> /**
<br>+ * selectContentRequestPage - select dynamic page proxy for request for
<br>+ * specified content request path and content
<br>+ * type given profile locators and site view
<br>+ * associated with this context
<br>+ *
<br>+ * @param requestPath request path
<br>+ * @param contentType content type
<br>+ * @return selected dynamic page proxy for request
<br>+ * @throws NodeNotFoundException if not found
<br>+ * @throws SecurityException if view access not granted
<br>+ */
<br>+ private DynamicPage selectContentRequestPage(String requestPath, String contentType) throws NodeNotFoundException
<br>+ {
<br>+ // save access exceptions
<br>+ SecurityException accessException = null;
<br>+
<br>+ // valid SiteView required from session profile locators
<br>+ SiteView view = getSiteView();
<br>+ if (view != null)
<br>+ {
<br>+ // default request to root folder if not specified
<br>+ if (requestPath == null)
<br>+ {
<br>+ requestPath = Folder.PATH_SEPARATOR;
<br>+ }
<br>+
<br>+ // log content page request
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Request content page: request path=" + requestPath);
<br>+ }
<br>+
<br>+ // search for deepest matching content request path
<br>+ // that matches request path; start with root folder in view
<br>+ Folder contentRequestFolder = (Folder)view.getNodeProxy(Folder.PATH_SEPARATOR, null, false, false);
<br>+ String contentRequestPath = contentRequestFolder.getPath();
<br>+ String contentRequestFile = null;
<br>+ for (;;)
<br>+ {
<br>+ // find next path name
<br>+ int startOfPathNameIndex = (contentRequestPath.equals(Folder.PATH_SEPARATOR) ? 1 : contentRequestPath.length()+1);
<br>+ int endOfPathNameIndex = requestPath.indexOf(Folder.PATH_SEPARATOR, startOfPathNameIndex);
<br>+ if ((endOfPathNameIndex == -1) || (endOfPathNameIndex == startOfPathNameIndex))
<br>+ {
<br>+ break;
<br>+ }
<br>+ // find folder in view
<br>+ try
<br>+ {
<br>+ String pathFolderName = requestPath.substring(startOfPathNameIndex, endOfPathNameIndex);
<br>+ contentRequestFolder = contentRequestFolder.getFolder(pathFolderName);
<br>+ contentRequestPath = contentRequestFolder.getPath();
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ break;
<br>+ }
<br>+ }
<br>+
<br>+ // select matching dynamic pages in folders from deepest
<br>+ // to root folders in content request path
<br>+ while (contentRequestFolder != null)
<br>+ {
<br>+ // select dynamic page by content type or wildcard match
<br>+ try
<br>+ {
<br>+ NodeSet dynamicPages = contentRequestFolder.getDynamicPages();
<br>+ if ((dynamicPages != null) && !dynamicPages.isEmpty())
<br>+ {
<br>+ // select matching page
<br>+ DynamicPage wildcardMatchingPage = null;
<br>+ Iterator dynamicPagesIter = dynamicPages.iterator();
<br>+ while (dynamicPagesIter.hasNext())
<br>+ {
<br>+ DynamicPage dynamicPage = (DynamicPage)dynamicPagesIter.next();
<br>+ if ((dynamicPage.getContentType() == null) || dynamicPage.getContentType().equals(DynamicPage.WILDCARD_CONTENT_TYPE))
<br>+ {
<br>+ wildcardMatchingPage = dynamicPage;
<br>+ }
<br>+ else if (dynamicPage.getContentType().equals(contentType))
<br>+ {
<br>+ // log selected dynamic page
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Selected "+contentType+" content dynamic page, path=" + view.getManagedDynamicPage(dynamicPage).getPath());
<br>+ }
<br>+ return dynamicPage;
<br>+ }
<br>+ }
<br>+ // select wildcard matching page
<br>+ if (wildcardMatchingPage != null)
<br>+ {
<br>+ // log selected dynamic page
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Selected "+contentType+" content dynamic page with wildcard, path=" + view.getManagedDynamicPage(wildcardMatchingPage).getPath());
<br>+ }
<br>+ return wildcardMatchingPage;
<br>+ }
<br>+ }
<br>+ }
<br>+ catch (NodeException ne)
<br>+ {
<br>+ break;
<br>+ }
<br>+ catch (SecurityException se)
<br>+ {
<br>+ accessException = se;
<br>+ }
<br>+
<br>+ // continue search with parent folder
<br>+ contentRequestFolder = (Folder)contentRequestFolder.getParent();
<br>+ }
<br>+ }
<br>+
<br>+ // no dynamic page matched or accessible
<br>+ if (accessException != null)
<br>+ {
<br>+ throw accessException;
<br>+ }
<br>+ throw new NodeNotFoundException("No dynamic page matched " + requestPath + " request in site view.");
<br>+ }
<br>+
<br>+ /**
<br> * getRequestRootFolder - select root folder proxy for given profile locators
<br> *
<br> * @param requestProfileLocators map of profile locators for request
<br>@@ -938,6 +1129,16 @@
<br> }
<br>
<br> /**
<br>+ * getContentTypeMapper - return PortalSiteContentTypeMapper component instance
<br>+ *
<br>+ * @return PortalSiteContentTypeMapper instance
<br>+ */
<br>+ public PortalSiteContentTypeMapper getContentTypeMapper()
<br>+ {
<br>+ return contentTypeMapper;
<br>+ }
<br>+
<br>+ /**
<br> * isValid - return flag indicating whether this context instance
<br> * is valid or if it is stale after being persisted and
<br> * reloaded as session state
<br>@@ -1000,16 +1201,25 @@
<br> }
<br>
<br> /**
<br>- * getManagedPage - get concrete page instance from page proxy
<br>+ * getManagedConcretePage - get concrete page or dynamic page instance
<br>+ * from page proxy
<br> *
<br> * @param page page proxy
<br> * @return managed page
<br> */
<br>- public Page getManagedPage(Page page)
<br>+ public BaseConcretePageElement getManagedPage(BaseConcretePageElement page)
<br> {
<br>- // return managed page in site view
<br>+ // return managed page or dynamic page in site view
<br> SiteView view = getSiteView();
<br>- return ((view != null) ? view.getManagedPage(page) : null);
<br>+ if (page instanceof Page)
<br>+ {
<br>+ return ((view != null) ? view.getManagedPage((Page)page) : null);
<br>+ }
<br>+ else if (page instanceof DynamicPage)
<br>+ {
<br>+ return ((view != null) ? view.getManagedDynamicPage((DynamicPage)page) : null);
<br>+ }
<br>+ return null;
<br> }
<br>
<br> /**
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/RequestPathMapping.java Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,92 @@
<br>+package org.apache.jetspeed.portalsite.impl;
<br>+
<br>+import java.util.regex.Matcher;
<br>+
<br>+import org.apache.jetspeed.om.page.DynamicPage;
<br>+
<br>+/**
<br>+ * This class specifies a request mapping definition for use
<br>+ * by the portal-site content type mapper component.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818046&i=0" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id:$
<br>+ */
<br>+public class RequestPathMapping extends AbstractPatternMapping
<br>+{
<br>+ private String serverName;
<br>+ private String contentType;
<br>+ private String mappedPath;
<br>+
<br>+ /**
<br>+ * Construct request path mapping for any server name and
<br>+ * content type.
<br>+ *
<br>+ * @param pattern request path find pattern
<br>+ * @param mappedPath resulting request path
<br>+ */
<br>+ public RequestPathMapping(String pattern, String mappedPath)
<br>+ {
<br>+ this(null, pattern, mappedPath);
<br>+ }
<br>+
<br>+ /**
<br>+ * Construct request path mapping for specified content type and
<br>+ * any server name.
<br>+ *
<br>+ * @param contentType request content path
<br>+ * @param pattern request path find pattern
<br>+ * @param mappedPath resulting request path
<br>+ */
<br>+ public RequestPathMapping(String contentType, String pattern, String mappedPath)
<br>+ {
<br>+ this(null, contentType, pattern, mappedPath);
<br>+ }
<br>+
<br>+ /**
<br>+ * Construct request path mapping for specified content type and
<br>+ * server name or server domain name. Server domain names must
<br>+ * start with a '.' character.
<br>+ *
<br>+ * @param serverName request server name or server domain name
<br>+ * @param contentType request content path
<br>+ * @param pattern request path find pattern
<br>+ * @param mappedPath resulting request path
<br>+ */
<br>+ public RequestPathMapping(String serverName, String contentType, String pattern, String mappedPath)
<br>+ {
<br>+ super(pattern);
<br>+ this.serverName = serverName;
<br>+ this.contentType = contentType;
<br>+ this.mappedPath = mappedPath;
<br>+ }
<br>+
<br>+ /**
<br>+ * Match request path pattern against request path, replacing
<br>+ * all subsequence expressions in the mapped path.
<br>+ *
<br>+ * @param requestServerName request server name to match
<br>+ * @param requestContentType request content type to match
<br>+ * @param requestPath request path to map
<br>+ * @return mapped request path or null if pattern not found
<br>+ */
<br>+ public String map(String requestServerName, String requestContentType, String requestPath)
<br>+ {
<br>+ // match server name or server domain name if specified
<br>+ if ((serverName != null) && (requestServerName != null) && !serverName.equals(requestServerName) && (!serverName.startsWith(".") || !requestServerName.endsWith(serverName)))
<br>+ {
<br>+ return null;
<br>+ }
<br>+ // match content type if specified
<br>+ if ((contentType != null) && !contentType.equals(DynamicPage.WILDCARD_CONTENT_TYPE) && (requestContentType != null) && !contentType.equals(requestContentType))
<br>+ {
<br>+ return null;
<br>+ }
<br>+ // find/replace pattern in request path
<br>+ Matcher patternMatcher = getPatternMatcher(requestPath);
<br>+ if (patternMatcher.find())
<br>+ {
<br>+ return patternMatcher.replaceAll(mappedPath);
<br>+ }
<br>+ return null;
<br>+ }
<br>+}
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/view/SiteView.java Wed Dec 16 20:38:20 2009
<br>@@ -1127,8 +1127,12 @@
<br> */
<br> private static boolean isProxyViewable(Node nodeProxy, boolean onlyVisible)
<br> {
<br>- // pages and links are always considered viewable;
<br>- // folders must be tested for viewable and visibile
<br>+ // pages and links are always considered viewable
<br>+ if ((nodeProxy instanceof Page) || (nodeProxy instanceof Link))
<br>+ {
<br>+ return true;
<br>+ }
<br>+ // folders must be tested for viewable and visible
<br> // child nodes
<br> if (nodeProxy instanceof Folder)
<br> {
<br>@@ -1156,7 +1160,8 @@
<br> }
<br> return false;
<br> }
<br>- return true;
<br>+ // templates, fragments, and dynamic page are not visible
<br>+ return false;
<br> }
<br>
<br> /**
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml Wed Dec 16 20:38:20 2009
<br>@@ -167,10 +167,37 @@
<br> </bean>
<br>
<br> <!-- PortalSite -->
<br>+ <bean id="org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper"
<br>+ name="portalSiteContentTypeMapper"
<br>+ class="org.apache.jetspeed.portalsite.impl.PortalSiteContentTypeMapperImpl">
<br>+ <constructor-arg index="0">
<br>+ <list>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.ContentTypeMapping">
<br>+ <constructor-arg index="0"><value>\w[.](\w+)$</value></constructor-arg> <!-- use $ for '$' -->
<br>+ <constructor-arg index="1"><value>$1-type</value></constructor-arg> <!-- use $ for '$' -->
<br>+ </bean>
<br>+ </list>
<br>+ </constructor-arg>
<br>+ <constructor-arg index="1">
<br>+ <list>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.RequestPathMapping">
<br>+ <constructor-arg index="0"><value>/preview/</value></constructor-arg>
<br>+ <constructor-arg index="1"><value>/</value></constructor-arg>
<br>+ </bean>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.RequestPathMapping">
<br>+ <constructor-arg index="0"><value>.domain.com</value></constructor-arg>
<br>+ <constructor-arg index="1"><value>doc-type</value></constructor-arg>
<br>+ <constructor-arg index="2"><value>/(?:draft|scratch)/</value></constructor-arg>
<br>+ <constructor-arg index="3"><value>/pub/</value></constructor-arg>
<br>+ </bean>
<br>+ </list>
<br>+ </constructor-arg>
<br>+ </bean>
<br> <bean id="org.apache.jetspeed.portalsite.PortalSite"
<br> name="portalSite"
<br> class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
<br> <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
<br>+ <constructor-arg index="1"><ref bean="portalSiteContentTypeMapper"/></constructor-arg>
<br> </bean>
<br>
<br> </beans>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java Wed Dec 16 20:38:20 2009
<br>@@ -30,8 +30,10 @@
<br> import org.apache.jetspeed.components.test.AbstractSpringTestCase;
<br> import org.apache.jetspeed.om.folder.Folder;
<br> import org.apache.jetspeed.om.folder.MenuDefinition;
<br>+import org.apache.jetspeed.om.page.DynamicPage;
<br> import org.apache.jetspeed.om.page.FragmentDefinition;
<br> import org.apache.jetspeed.om.page.Link;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.page.PageManager;
<br>@@ -139,44 +141,11 @@
<br> Link rootLink0 = pageManager.getLink("/link0.link");
<br> assertNotNull(rootLink0);
<br> assertEquals(rootFolder.getLink("link0.link"), rootLink0);
<br>+ DynamicPage docPage = pageManager.getDynamicPage("/docpage.dpsml");
<br>+ assertNotNull(docPage);
<br>+ assertEquals(rootFolder.getDynamicPage("docpage.dpsml"), docPage);
<br> }
<br>
<br>- public void testRelativeNavigations() throws Exception
<br>- {
<br>- JetspeedProfileLocator locator = new JetspeedProfileLocator();
<br>-
<br>- locator.init(null, "/");
<br>- locator.add("hostname", true, false, "dash");
<br>- locator.add("user", true, false, "joe");
<br>- locator.add("page", false, false, "home");
<br>- SiteView profileView = new SiteView(pageManager, locator, false);
<br>- assertEquals("/_hostname/dash/_user/joe,/_hostname/dash,/", profileView.getSearchPathsString());
<br>-
<br>- locator = new JetspeedProfileLocator();
<br>- locator.init(null, "/");
<br>- locator.add("hostname", true, false, "dash");
<br>- locator.add("user", true, false, "joe");
<br>- locator.add("navigation", false, true, "/");
<br>- locator.add("hostname", true, false, "dash");
<br>- locator.add("role", true, false, "user");
<br>- locator.add("page", false, false, "home");
<br>- profileView = new SiteView(pageManager, locator, false);
<br>- assertEquals("/_hostname/dash/_user/joe,/_hostname/dash/_role/user,/_hostname/dash,/", profileView.getSearchPathsString());
<br>-
<br>- locator = new JetspeedProfileLocator();
<br>- //locator.init(null, "/__subsite-root");
<br>- locator.init(null, "/");
<br>- locator.add("navigation", false, true, "subsite-root");
<br>- locator.add("hostname", true, false, "localhost");
<br>- locator.add("user", true, false, "sublocal");
<br>- locator.add("navigation", false, true, "subsite-root");
<br>- locator.add("hostname", true, false, "localhost");
<br>- locator.add("role", true, false, "somerole");
<br>- locator.add("path", false, false, "home");
<br>- profileView = new SiteView(pageManager, locator, false);
<br>- assertEquals("/__subsite-root/_hostname/localhost/_user/sublocal,/__subsite-root/_hostname/localhost/_role/somerole,/__subsite-root/_hostname/localhost,/__subsite-root", profileView.getSearchPathsString());
<br>- }
<br>-
<br> /**
<br> * testSiteView - Test SiteView operation
<br> *
<br>@@ -192,8 +161,9 @@
<br> assertEquals("/", rootFolderProxy.getName());
<br> assertEquals("root", rootFolderProxy.getTitle());
<br> assertEquals("/", extractFileSystemPathFromId(rootFolderProxy.getId()));
<br>- assertEquals(4, rootFolderProxy.getFolders().size());
<br>+ assertEquals(5, rootFolderProxy.getFolders().size());
<br> Iterator foldersIter = rootFolderProxy.getFolders().iterator();
<br>+ assertEquals("contentfolder", ((Folder)foldersIter.next()).getName());
<br> assertEquals("folder0", ((Folder)foldersIter.next()).getName());
<br> assertEquals("folder1", ((Folder)foldersIter.next()).getName());
<br> assertEquals("folder2", ((Folder)foldersIter.next()).getName());
<br>@@ -208,6 +178,10 @@
<br> Iterator linksIter = rootFolderProxy.getLinks().iterator();
<br> assertEquals("link1.link", ((Link)linksIter.next()).getName());
<br> assertEquals("link0.link", ((Link)linksIter.next()).getName());
<br>+ assertEquals(2, rootFolderProxy.getDynamicPages().size());
<br>+ Iterator dynamicPagesIter = rootFolderProxy.getDynamicPages().iterator();
<br>+ assertEquals("contentpage.dpsml", ((DynamicPage)dynamicPagesIter.next()).getName());
<br>+ assertEquals("docpage.dpsml", ((DynamicPage)dynamicPagesIter.next()).getName());
<br> Page rootPage0Proxy = rootFolderProxy.getPage("page0.psml");
<br> assertNotNull(rootPage0Proxy);
<br> assertEquals(rootFolderProxy, rootPage0Proxy.getParent());
<br>@@ -222,6 +196,11 @@
<br> assertEquals(rootFolderProxy, rootLink0Proxy.getParent());
<br> assertEquals("link0.link", rootLink0Proxy.getName());
<br> assertEquals("/link0.link", extractFileSystemPathFromId(rootLink0Proxy.getId()));
<br>+ DynamicPage docPageProxy = rootFolderProxy.getDynamicPage("docpage.dpsml");
<br>+ assertNotNull(docPageProxy);
<br>+ assertEquals(rootFolderProxy, docPageProxy.getParent());
<br>+ assertEquals("docpage.dpsml", docPageProxy.getName());
<br>+ assertEquals("/docpage.dpsml", extractFileSystemPathFromId(docPageProxy.getId()));
<br> Folder rootFolder0Proxy = rootFolderProxy.getFolder("folder0");
<br> assertNotNull(rootFolder0Proxy);
<br> assertEquals(rootFolderProxy, rootFolder0Proxy.getParent());
<br>@@ -270,7 +249,7 @@
<br> assertTrue(rootPageProxiesByPath.contains(rootPage0Proxy));
<br> List rootFolderProxiesByPath = baseView.getNodeProxies("/*/", null, false, false);
<br> assertNotNull(rootFolderProxiesByPath);
<br>- assertEquals(4,rootFolderProxiesByPath.size());
<br>+ assertEquals(5,rootFolderProxiesByPath.size());
<br> assertTrue(rootFolderProxiesByPath.contains(rootFolder0Proxy));
<br> List folderPageProxiesByPath = baseView.getNodeProxies("*/p*[0-9].psml", rootFolderProxy, false, false);
<br> assertNotNull(folderPageProxiesByPath);
<br>@@ -285,9 +264,10 @@
<br> assertEquals("/", rootFolderProxy.getName());
<br> assertEquals("user root", rootFolderProxy.getTitle());
<br> assertEquals("/_user/user", extractFileSystemPathFromId(rootFolderProxy.getId()));
<br>- assertEquals(4, rootFolderProxy.getFolders().size());
<br>+ assertEquals(5, rootFolderProxy.getFolders().size());
<br> assertEquals(4, rootFolderProxy.getPages().size());
<br> assertEquals(2, rootFolderProxy.getLinks().size());
<br>+ assertEquals(2, rootFolderProxy.getDynamicPages().size());
<br> rootPage0Proxy = rootFolderProxy.getPage("page0.psml");
<br> assertNotNull(rootPage0Proxy);
<br> assertEquals(rootFolderProxy, rootPage0Proxy.getParent());
<br>@@ -466,6 +446,46 @@
<br> }
<br>
<br> /**
<br>+ * testRelativeNavigations - Test SiteView search patch for navigation paths
<br>+ *
<br>+ * @throws Exception
<br>+ */
<br>+ public void testRelativeNavigations() throws Exception
<br>+ {
<br>+ JetspeedProfileLocator locator = new JetspeedProfileLocator();
<br>+
<br>+ locator.init(null, "/");
<br>+ locator.add("hostname", true, false, "dash");
<br>+ locator.add("user", true, false, "joe");
<br>+ locator.add("page", false, false, "home");
<br>+ SiteView profileView = new SiteView(pageManager, locator, false);
<br>+ assertEquals("/_hostname/dash/_user/joe,/_hostname/dash,/", profileView.getSearchPathsString());
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/");
<br>+ locator.add("hostname", true, false, "dash");
<br>+ locator.add("user", true, false, "joe");
<br>+ locator.add("navigation", false, true, "/");
<br>+ locator.add("hostname", true, false, "dash");
<br>+ locator.add("role", true, false, "user");
<br>+ locator.add("page", false, false, "home");
<br>+ profileView = new SiteView(pageManager, locator, false);
<br>+ assertEquals("/_hostname/dash/_user/joe,/_hostname/dash/_role/user,/_hostname/dash,/", profileView.getSearchPathsString());
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/");
<br>+ locator.add("navigation", false, true, "subsite-root");
<br>+ locator.add("hostname", true, false, "localhost");
<br>+ locator.add("user", true, false, "sublocal");
<br>+ locator.add("navigation", false, true, "subsite-root");
<br>+ locator.add("hostname", true, false, "localhost");
<br>+ locator.add("role", true, false, "somerole");
<br>+ locator.add("path", false, false, "home");
<br>+ profileView = new SiteView(pageManager, locator, false);
<br>+ assertEquals("/__subsite-root/_hostname/localhost/_user/sublocal,/__subsite-root/_hostname/localhost/_role/somerole,/__subsite-root/_hostname/localhost,/__subsite-root", profileView.getSearchPathsString());
<br>+ }
<br>+
<br>+ /**
<br> * testPortalSiteSetup - Test PortalSite test configuration
<br> *
<br> * @throws Exception
<br>@@ -487,8 +507,9 @@
<br> locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br> PortalSiteRequestContext requestContext = sessionContext.newRequestContext(locators);
<br> assertNotNull(requestContext);
<br>- Page requestPageProxy = requestContext.getPage();
<br>+ BaseConcretePageElement requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page2.psml", requestPageProxy.getName());
<br> assertEquals("/_user/user/page2.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br> PageTemplate requestPageTemplateProxy = requestContext.getPageTemplate();
<br>@@ -523,7 +544,7 @@
<br> assertNull(requestParentFolderProxy);
<br> NodeSet requestSiblingFolderProxies = requestContext.getSiblingFolders();
<br> assertNotNull(requestSiblingFolderProxies);
<br>- assertEquals(3, requestSiblingFolderProxies.size());
<br>+ assertEquals(4, requestSiblingFolderProxies.size());
<br> assertNotNull(requestSiblingFolderProxies.get("folder0"));
<br> assertEquals("/folder0", extractFileSystemPathFromId(requestSiblingFolderProxies.get("folder0").getId()));
<br> assertNotNull(requestSiblingFolderProxies.get("folder1"));
<br>@@ -561,8 +582,9 @@
<br> locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br> PortalSiteRequestContext requestContext = sessionContext.newRequestContext(locators);
<br> assertNotNull(requestContext);
<br>- Page requestPageProxy = requestContext.getPage();
<br>+ BaseConcretePageElement requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page2.psml", requestPageProxy.getName());
<br> assertEquals("/_user/user/page2.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>
<br>@@ -576,6 +598,7 @@
<br> assertNotNull(requestContext);
<br> requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page2.psml", requestPageProxy.getName());
<br> assertEquals("/_user/user/page2.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>
<br>@@ -589,6 +612,7 @@
<br> assertNotNull(requestContext);
<br> requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page1.psml", requestPageProxy.getName());
<br> assertEquals("/page1.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>
<br>@@ -602,6 +626,7 @@
<br> assertNotNull(requestContext);
<br> requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page0.psml", requestPageProxy.getName());
<br> assertEquals("/_user/user/folder1/page0.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>
<br>@@ -615,6 +640,7 @@
<br> assertNotNull(requestContext);
<br> requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page0.psml", requestPageProxy.getName());
<br> assertEquals("/folder0/page0.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>
<br>@@ -626,6 +652,7 @@
<br> assertNotNull(requestContext);
<br> requestPageProxy = requestContext.getPage();
<br> assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof Page);
<br> assertEquals("page1.psml", requestPageProxy.getName());
<br> assertEquals("/folder3/default-folder1/page1.psml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br> }
<br>@@ -1335,6 +1362,83 @@
<br> }
<br>
<br> /**
<br>+ * testPortalSiteContentRequests - Test PortalSite content request mapping and
<br>+ * dynamic page resolution
<br>+ *
<br>+ * @throws Exception
<br>+ */
<br>+ public void testPotalSiteContentRequests() throws Exception
<br>+ {
<br>+ assertNotNull(portalSite);
<br>+ PortalSiteSessionContext sessionContext = portalSite.newSessionContext();
<br>+ assertNotNull(sessionContext);
<br>+ JetspeedProfileLocator locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/document.doc");
<br>+ locator.add("user", true, false, "user");
<br>+ Map locators = new HashMap();
<br>+ locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br>+ PortalSiteRequestContext requestContext = sessionContext.newRequestContext(locators);
<br>+ assertNotNull(requestContext);
<br>+ BaseConcretePageElement requestPageProxy = requestContext.getPage();
<br>+ assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof DynamicPage);
<br>+ assertEquals("docpage.dpsml", requestPageProxy.getName());
<br>+ assertEquals("/docpage.dpsml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/contentfolder/document.doc");
<br>+ locator.add("user", true, false, "user");
<br>+ locators = new HashMap();
<br>+ locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br>+ requestContext = sessionContext.newRequestContext(locators);
<br>+ assertNotNull(requestContext);
<br>+ requestPageProxy = requestContext.getPage();
<br>+ assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof DynamicPage);
<br>+ assertEquals("docpage.dpsml", requestPageProxy.getName());
<br>+ assertEquals("/contentfolder/docpage.dpsml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/contentfolder/document.txt");
<br>+ locator.add("user", true, false, "user");
<br>+ locators = new HashMap();
<br>+ locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br>+ requestContext = sessionContext.newRequestContext(locators);
<br>+ assertNotNull(requestContext);
<br>+ requestPageProxy = requestContext.getPage();
<br>+ assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof DynamicPage);
<br>+ assertEquals("contentpage.dpsml", requestPageProxy.getName());
<br>+ assertEquals("/contentpage.dpsml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/preview/document.doc");
<br>+ locator.add("user", true, false, "user");
<br>+ locators = new HashMap();
<br>+ locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br>+ requestContext = sessionContext.newRequestContext(locators);
<br>+ assertNotNull(requestContext);
<br>+ requestPageProxy = requestContext.getPage();
<br>+ assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof DynamicPage);
<br>+ assertEquals("docpage.dpsml", requestPageProxy.getName());
<br>+ assertEquals("/docpage.dpsml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>+
<br>+ locator = new JetspeedProfileLocator();
<br>+ locator.init(null, "/preview/contentfolder/draft/document.doc", "test.domain.com");
<br>+ locator.add("user", true, false, "user");
<br>+ locators = new HashMap();
<br>+ locators.put(ProfileLocator.PAGE_LOCATOR, locator);
<br>+ requestContext = sessionContext.newRequestContext(locators);
<br>+ assertNotNull(requestContext);
<br>+ requestPageProxy = requestContext.getPage();
<br>+ assertNotNull(requestPageProxy);
<br>+ assertTrue(requestPageProxy instanceof DynamicPage);
<br>+ assertEquals("docpage.dpsml", requestPageProxy.getName());
<br>+ assertEquals("/contentfolder/pub/docpage.dpsml", extractFileSystemPathFromId(requestPageProxy.getId()));
<br>+ }
<br>+
<br>+ /**
<br> * extractFileSystemPathFromId - utility to convert proxy ids to file system paths
<br> *
<br> * @param id proxy node id
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/docpage.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,27 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+
<br>+<dynamic-page id="docpage" content-type="doc-type"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br>+
<br>+ <title>/contentfolder/docpage.dpsml</title>
<br>+ <fragment id="fake" name="fake" type="fake"/>
<br>+</dynamic-page>
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentfolder/pub/docpage.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,27 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+
<br>+<dynamic-page id="docpage" content-type="doc-type"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br>+
<br>+ <title>/contentfolder/pub/docpage.dpsml</title>
<br>+ <fragment id="fake" name="fake" type="fake"/>
<br>+</dynamic-page>
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,27 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+
<br>+<dynamic-page id="contentpage" content-type="*"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br>+
<br>+ <title>/contentpage.dpsml</title>
<br>+ <fragment id="fake" name="fake" type="fake"/>
<br>+</dynamic-page>
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,27 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+
<br>+<dynamic-page id="docpage" content-type="doc-type"
<br>+ xmlns="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://portals.apache.org/jetspeed" target="_top" rel="nofollow">http://portals.apache.org/jetspeed</a> <a href="http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd" target="_top" rel="nofollow">http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd</a>">
<br>+
<br>+ <title>/docpage.dpsml</title>
<br>+ <fragment id="fake" name="fake" type="fake"/>
<br>+</dynamic-page>
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java Wed Dec 16 20:38:20 2009
<br>@@ -245,13 +245,13 @@
<br>
<br> public String getPageBasePath()
<br> {
<br>- if ( null == path || (1 == path.length() && '/' == path.charAt(0)) )
<br>+ if (null == path || (1 == path.length() && '/' == path.charAt(0)))
<br> {
<br> return basePath;
<br> }
<br>- else if ( -1 != path.indexOf('/') && !path.endsWith("/") )
<br>+ else if (-1 != path.indexOf('/'))
<br> {
<br>- return basePath + path.substring(0, path.lastIndexOf('/') );
<br>+ return basePath + path.substring(0, path.lastIndexOf('/'));
<br> }
<br> else
<br> {
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java Wed Dec 16 20:38:20 2009
<br>@@ -82,6 +82,10 @@
<br> buffer.append(token);
<br> }
<br> }
<br>+ if (pathInfo.endsWith("/"))
<br>+ {
<br>+ buffer.append("/");
<br>+ }
<br> if ( buffer.length() > 0 )
<br> {
<br> path = buffer.toString();
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java Wed Dec 16 20:38:20 2009
<br>@@ -24,7 +24,9 @@
<br> import org.apache.jetspeed.ajax.AjaxBuilder;
<br> import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
<br> import org.apache.jetspeed.om.folder.Folder;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.BaseFragmentElement;
<br>+import org.apache.jetspeed.om.page.DynamicPage;
<br> import org.apache.jetspeed.om.page.Fragment;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.page.PageManager;
<br>@@ -92,7 +94,7 @@
<br> return success;
<br> }
<br> int count = 0;
<br>- Page page = null;
<br>+ BaseConcretePageElement page = null;
<br> String path = getActionParameter(requestContext, "path");
<br> if (path == null)
<br> {
<br>@@ -102,11 +104,24 @@
<br> {
<br> if (!method.equals("add"))
<br> {
<br>- page = pageManager.getPage(path);
<br>+ if (path.endsWith(Page.DOCUMENT_TYPE))
<br>+ {
<br>+ page = pageManager.getPage(path);
<br>+ }
<br>+ else if (path.endsWith(DynamicPage.DOCUMENT_TYPE))
<br>+ {
<br>+ page = pageManager.getDynamicPage(path);
<br>+ }
<br>+ else
<br>+ {
<br>+ success = false;
<br>+ resultMap.put(REASON, "Can't lookup page by document type: " + path);
<br>+ return success;
<br>+ }
<br> }
<br> else
<br> {
<br>- if (pageManager.pageExists(path))
<br>+ if (pageManager.pageExists(path) || pageManager.dynamicPageExists(path))
<br> {
<br> success = false;
<br> resultMap.put(REASON, "Can't create: Page already exists: " + path);
<br>@@ -170,22 +185,46 @@
<br> {
<br> String destination = getActionParameter(requestContext, "destination");
<br> String name = getActionParameter(requestContext, RESOURCE_NAME);
<br>- destination = destination + Folder.PATH_SEPARATOR + name;
<br>- Page newPage = pageManager.copyPage(page,destination);
<br>- pageManager.updatePage(newPage);
<br>+ destination = destination + Folder.PATH_SEPARATOR + name;
<br>+ if (page instanceof Page)
<br>+ {
<br>+ Page newPage = pageManager.copyPage((Page)page,destination);
<br>+ pageManager.updatePage(newPage);
<br>+ }
<br>+ else if (page instanceof DynamicPage)
<br>+ {
<br>+ DynamicPage newPage = pageManager.copyDynamicPage((DynamicPage)page,destination);
<br>+ pageManager.updateDynamicPage(newPage);
<br>+ }
<br> }
<br> else if (method.equals("move"))
<br> {
<br> String destination = getActionParameter(requestContext, "destination");
<br> String name = getActionParameter(requestContext, RESOURCE_NAME);
<br> destination = destination + Folder.PATH_SEPARATOR + name;
<br>- Page newPage = pageManager.copyPage(page, destination, true);
<br>- pageManager.updatePage(newPage);
<br>- pageManager.removePage(page);
<br>+ if (page instanceof Page)
<br>+ {
<br>+ Page newPage = pageManager.copyPage((Page)page, destination, true);
<br>+ pageManager.updatePage(newPage);
<br>+ pageManager.removePage((Page)page);
<br>+ }
<br>+ else if (page instanceof DynamicPage)
<br>+ {
<br>+ DynamicPage newPage = pageManager.copyDynamicPage((DynamicPage)page, destination, true);
<br>+ pageManager.updateDynamicPage(newPage);
<br>+ pageManager.removeDynamicPage((DynamicPage)page);
<br>+ }
<br> }
<br> else if (method.equals("remove"))
<br> {
<br>- pageManager.removePage(page);
<br>+ if (page instanceof Page)
<br>+ {
<br>+ pageManager.removePage((Page)page);
<br>+ }
<br>+ else if (page instanceof DynamicPage)
<br>+ {
<br>+ pageManager.removeDynamicPage((DynamicPage)page);
<br>+ }
<br> }
<br> else if (method.equals("update-fragment"))
<br> {
<br>@@ -238,7 +277,14 @@
<br> }
<br> if (count > 0)
<br> {
<br>- pageManager.updatePage(page);
<br>+ if (page instanceof Page)
<br>+ {
<br>+ pageManager.updatePage((Page)page);
<br>+ }
<br>+ else
<br>+ {
<br>+ pageManager.updateDynamicPage((DynamicPage)page);
<br>+ }
<br> }
<br> resultMap.put("count", Integer.toString(count));
<br> resultMap.put(STATUS, status);
<br>@@ -252,7 +298,7 @@
<br> return success;
<br> }
<br>
<br>- protected int updatePortletDecorator(RequestContext requestContext, Map resultMap, Page page, String fragmentId, String portletDecorator)
<br>+ protected int updatePortletDecorator(RequestContext requestContext, Map resultMap, BaseConcretePageElement page, String fragmentId, String portletDecorator)
<br> {
<br> int count = 0;
<br> BaseFragmentElement fragment = page.getFragmentById(fragmentId);
<br>@@ -264,7 +310,7 @@
<br> return count;
<br> }
<br>
<br>- protected int updateFragment(RequestContext requestContext, Map resultMap, Page page, String fragmentId, String layout)
<br>+ protected int updateFragment(RequestContext requestContext, Map resultMap, BaseConcretePageElement page, String fragmentId, String layout)
<br> {
<br> int count = 0;
<br> String sizes = getActionParameter(requestContext, SIZES);
<br>@@ -298,7 +344,7 @@
<br> return count;
<br> }
<br>
<br>- protected int addFragment(RequestContext requestContext, Map resultMap, Page page, String parentFragmentId, String layout)
<br>+ protected int addFragment(RequestContext requestContext, Map resultMap, BaseConcretePageElement page, String parentFragmentId, String layout)
<br> {
<br> int count = 0;
<br> String sizes = getActionParameter(requestContext, SIZES);
<br>@@ -321,7 +367,7 @@
<br> return count;
<br> }
<br>
<br>- protected int removeFragment(RequestContext requestContext, Map resultMap, Page page, String fragmentId)
<br>+ protected int removeFragment(RequestContext requestContext, Map resultMap, BaseConcretePageElement page, String fragmentId)
<br> {
<br> int count = 0;
<br> BaseFragmentElement fragment = page.getFragmentById(fragmentId);
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -28,6 +28,7 @@
<br> import org.apache.jetspeed.decoration.PageActionAccess;
<br> import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.Page;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.page.document.NodeNotFoundException;
<br>@@ -164,6 +165,14 @@
<br> {
<br> try
<br> {
<br>+ // save original request in the event it is modified below
<br>+ // and some down stream content portlet needs it set
<br>+ request.setAttribute(PortalReservedParameters.PATH_ATTRIBUTE, request.getPath());
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Request path: "+request.getPath());
<br>+ }
<br>+
<br> // get profiler locators for request subject/principal using the profiler
<br> Subject subject = request.getSubject();
<br> if (subject == null)
<br>@@ -255,14 +264,19 @@
<br> // as returned by the PageManager component; accessing
<br> // the managed page here selects the current page for the
<br> // request
<br>- Page managedPage = requestContext.getManagedPage();
<br>+ BaseConcretePageElement managedPage = requestContext.getManagedPage();
<br> PageTemplate managedPageTemplate = requestContext.getManagedPageTemplate();
<br> Map managedFragmentDefinitions = requestContext.getManagedFragmentDefinitions();
<br> ContentPage contentPage = pageLayoutComponent.newContentPage(managedPage, managedPageTemplate, managedFragmentDefinitions);
<br> request.setPage(contentPage);
<br> request.setProfileLocators(requestContext.getLocators());
<br>
<br>- request.setAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE,getPageActionAccess(request));
<br>+ request.setAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE,getPageActionAccess(request));
<br>+
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Page path: "+contentPage.getPath());
<br>+ }
<br> }
<br>
<br> // continue
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Wed Dec 16 20:38:20 2009
<br>@@ -43,7 +43,7 @@
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.om.page.Fragment;
<br>-import org.apache.jetspeed.om.page.Page;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.om.page.impl.ContentFragmentImpl;
<br> import org.apache.jetspeed.om.portlet.Language;
<br>@@ -584,7 +584,7 @@
<br> }
<br> PortalSiteSessionContext sessionContext = (PortalSiteSessionContext)getSessionAttribute(ProfilerValveImpl.PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY);
<br> PortalSiteRequestContext requestContext = sessionContext.newRequestContext(locators, true, true);
<br>- Page managedPage = requestContext.getManagedPage();
<br>+ BaseConcretePageElement managedPage = requestContext.getManagedPage();
<br> PageTemplate managedPageTemplate = requestContext.getManagedPageTemplate();
<br> Map managedFragmentDefinitions = requestContext.getManagedFragmentDefinitions();
<br> ContentPage cpage = pageLayoutComponent.newContentPage(managedPage, managedPageTemplate, managedFragmentDefinitions);
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml Wed Dec 16 20:38:20 2009
<br>@@ -141,10 +141,23 @@
<br> </bean>
<br>
<br> <!-- PortalSite -->
<br>+ <bean id="org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper"
<br>+ name="portalSiteContentTypeMapper"
<br>+ class="org.apache.jetspeed.portalsite.impl.PortalSiteContentTypeMapperImpl">
<br>+ <constructor-arg index="0">
<br>+ <list>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.ContentTypeMapping">
<br>+ <constructor-arg index="0"><value>\w[.](\w+)$</value></constructor-arg> <!-- use $ for '$' -->
<br>+ <constructor-arg index="1"><value>$1</value></constructor-arg> <!-- use $ for '$' -->
<br>+ </bean>
<br>+ </list>
<br>+ </constructor-arg>
<br>+ </bean>
<br> <bean id="org.apache.jetspeed.portalsite.PortalSite"
<br> name="portalSite"
<br> class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
<br> <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
<br>+ <constructor-arg index="1"><ref bean="portalSiteContentTypeMapper"/></constructor-arg>
<br> </bean>
<br>
<br> <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java Wed Dec 16 20:38:20 2009
<br>@@ -733,7 +733,7 @@
<br> {
<br> ProfileLocator locator = (ProfileLocator) beanFactory.getBean(
<br> this.locatorBean, ProfileLocator.class);
<br>- locator.init(this, context.getPath());
<br>+ locator.init(this, context.getPath(), ((context.getRequest() != null) ? context.getRequest().getServerName() : null));
<br> return locator;
<br> } catch (Exception e)
<br> {
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/impl/PathSessionResolver.java Wed Dec 16 20:38:20 2009
<br>@@ -16,7 +16,6 @@
<br> */
<br> package org.apache.jetspeed.profiler.rules.impl;
<br>
<br>-import org.apache.jetspeed.PortalReservedParameters;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.profiler.rules.RuleCriterion;
<br> import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
<br>@@ -45,8 +44,6 @@
<br> else
<br> {
<br> path = context.getPath();
<br>- if (path != null)
<br>- path = mapPath(context, path);
<br> }
<br>
<br> if ((path == null) || path.equals("/"))
<br>@@ -61,37 +58,6 @@
<br> return path;
<br> }
<br>
<br>- private String mapPath(RequestContext context, String originalPath)
<br>- {
<br>- String path = originalPath;
<br>- if (path.endsWith(".psml"))
<br>- {
<br>- return originalPath;
<br>- }
<br>- for (int ix=0; ix < REGEX_MAP.length; ix++)
<br>- {
<br>- if (path.matches(REGEX_MAP[ix][0]))
<br>- {
<br>- path = REGEX_MAP[ix][1];
<br>- context.setPath(path);
<br>- context.setAttribute(PortalReservedParameters.PATH_ATTRIBUTE, originalPath);
<br>- break;
<br>- }
<br>- }
<br>- return path;
<br>- }
<br>-
<br>- // TODO: configure this information externally and live
<br>- static String[][] REGEX_MAP =
<br>- {
<br>- {".*\\.(...|....)", "/Public/content.psml"}
<br>-// {".*\\.html", "/Public/content.psml"},
<br>-// {".*\\.pdf", "/Public/content.psml"},
<br>-// {"/_content.*", "/Public/content.psml"}
<br>-// {"/data/*", "/Public/content2.psml"},
<br>- };
<br>-
<br>-
<br> /* (non-Javadoc)
<br> * @see org.apache.jetspeed.profiler.rules.RuleCriterionResolver#isControl()
<br> */
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java Wed Dec 16 20:38:20 2009
<br>@@ -20,7 +20,7 @@
<br>
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br>-import org.apache.jetspeed.om.page.Page;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br>
<br> /**
<br>@@ -136,7 +136,7 @@
<br> * by page and/or page template
<br> * @return new content page
<br> */
<br>- ContentPage newContentPage(Page page, PageTemplate pageTemplate, Map fragmentDefinitions);
<br>+ ContentPage newContentPage(BaseConcretePageElement page, PageTemplate pageTemplate, Map fragmentDefinitions);
<br>
<br> /**
<br> * Create a new sibling folder with specified configuration and
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java Wed Dec 16 20:38:20 2009
<br>@@ -192,7 +192,7 @@
<br> *
<br> * @return persistent page or null
<br> */
<br>- Page getPage();
<br>+ BaseConcretePageElement getPage();
<br>
<br> /**
<br> * Access underlying concrete persistent page template or
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/DynamicPage.java Wed Dec 16 20:38:20 2009
<br>@@ -28,18 +28,20 @@
<br> public interface DynamicPage extends BaseConcretePageElement, Serializable
<br> {
<br> String DOCUMENT_TYPE = ".dpsml";
<br>+
<br>+ String WILDCARD_CONTENT_TYPE = "*";
<br>
<br> /**
<br>- * Get the page type name that applies to this page.
<br>+ * Get the content type name that applies to this page.
<br> *
<br> * @return the page type name name
<br> */
<br>- String getPageType();
<br>+ String getContentType();
<br>
<br> /**
<br>- * Set the page type name for this page.
<br>+ * Set the content type name for this page.
<br> *
<br>- * @param pageType the name of the page type for the page
<br>+ * @param contentType the name of the content type for the page
<br> */
<br>- void setPageType(String pageType);
<br>+ void setContentType(String contentType);
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSite.java Wed Dec 16 20:38:20 2009
<br>@@ -39,4 +39,11 @@
<br> * @return PageManager instance
<br> */
<br> PageManager getPageManager();
<br>+
<br>+ /**
<br>+ * getContentTypeMapper - return PortalSiteContentTypeMapper component instance
<br>+ *
<br>+ * @return PortalSiteContentTypeMapper instance
<br>+ */
<br>+ PortalSiteContentTypeMapper getContentTypeMapper();
<br> }
<br><br>Added: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java?rev=891420&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java?rev=891420&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteContentTypeMapper.java Wed Dec 16 20:38:20 2009
<br>@@ -0,0 +1,61 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.portalsite;
<br>+
<br>+/**
<br>+ * This interface defines the content type mapper component
<br>+ * for use with the portal-site component.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818046&i=1" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id:$
<br>+ */
<br>+public interface PortalSiteContentTypeMapper
<br>+{
<br>+ public static final String PAGE_SYSTEM_TYPE = "portal-page";
<br>+ public static final String FOLDER_SYSTEM_TYPE = "portal-folder";
<br>+
<br>+ /**
<br>+ * mapSystemType - map request to system type; implementation should
<br>+ * return null if type is not known.
<br>+ *
<br>+ * @param requestPath raw portal request path
<br>+ * @return mapped system type string or null
<br>+ */
<br>+ String mapSystemType(String requestPath);
<br>+
<br>+ /**
<br>+ * mapContentType - map request to content type used to select dynamic
<br>+ * pages; implementation should return null to handle
<br>+ * request as page and folder lookup.
<br>+ *
<br>+ * @param requestPath raw portal request path
<br>+ * @return mapped content type string or null
<br>+ */
<br>+ String mapContentType(String requestPath);
<br>+
<br>+ /**
<br>+ * mapRequestPath - map content request path given previously mapped content
<br>+ * type; implementation should return null to indicate no
<br>+ * mapping is available.
<br>+ *
<br>+ * @param serverName request server name
<br>+ * @param contentType mapped content type
<br>+ * @param requestPath raw portal request path
<br>+ * @return mapped request path or null
<br>+ */
<br>+ String mapRequestPath(String serverName, String contentType, String requestPath);
<br>+}
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java Wed Dec 16 20:38:20 2009
<br>@@ -20,7 +20,7 @@
<br> import java.util.Set;
<br>
<br> import org.apache.jetspeed.om.folder.Folder;
<br>-import org.apache.jetspeed.om.page.Page;
<br>+import org.apache.jetspeed.om.page.BaseConcretePageElement;
<br> import org.apache.jetspeed.om.page.PageTemplate;
<br> import org.apache.jetspeed.page.document.NodeNotFoundException;
<br> import org.apache.jetspeed.page.document.NodeSet;
<br>@@ -55,7 +55,7 @@
<br> * @throws NodeNotFoundException if page not found
<br> * @throws SecurityException if page view access not granted
<br> */
<br>- Page getManagedPage() throws NodeNotFoundException;
<br>+ BaseConcretePageElement getManagedPage() throws NodeNotFoundException;
<br>
<br> /**
<br> * getManagedPageTemplate - get request profiled concrete page
<br>@@ -86,7 +86,7 @@
<br> * @throws NodeNotFoundException if page not found
<br> * @throws SecurityException if page view access not granted
<br> */
<br>- Page getPage() throws NodeNotFoundException;
<br>+ BaseConcretePageElement getPage() throws NodeNotFoundException;
<br>
<br> /**
<br> * getPageTemplate - get page template proxy for request profiled page
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java Wed Dec 16 20:38:20 2009
<br>@@ -80,6 +80,13 @@
<br> PageManager getPageManager();
<br>
<br> /**
<br>+ * getContentTypeMapper - return PortalSiteContentTypeMapper component instance
<br>+ *
<br>+ * @return PortalSiteContentTypeMapper instance
<br>+ */
<br>+ PortalSiteContentTypeMapper getContentTypeMapper();
<br>+
<br>+ /**
<br> * isValid - return flag indicating whether this context instance
<br> * is valid or if it is stale after being persisted and
<br> * reloaded as session state
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/ProfileLocator.java Wed Dec 16 20:38:20 2009
<br>@@ -55,6 +55,15 @@
<br> void init(Profiler profiler, String requestPath);
<br>
<br> /**
<br>+ * Initialize this page context.
<br>+ *
<br>+ * @param profiler The profiler initializing this locator.
<br>+ * @param requestPath The request path used to create this locator.
<br>+ * @param requestServerName The request server name used to create this locator.
<br>+ */
<br>+ void init(Profiler profiler, String requestPath, String requestServerName);
<br>+
<br>+ /**
<br> * Get an iterator over the locator's properties.
<br> * Elements are returned as @link ProfileLocatorProperty array.
<br> *
<br>@@ -164,4 +173,12 @@
<br> * @return The request path.
<br> */
<br> String getRequestPath();
<br>+
<br>+ /**
<br>+ * <p>Retain the request server name to support additional page location mapping
<br>+ * not part of the profiler rule criterion.</p>
<br>+ *
<br>+ * @return The request server name.
<br>+ */
<br>+ String getRequestServerName();
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml Wed Dec 16 20:38:20 2009
<br>@@ -186,7 +186,7 @@
<br> <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
<br> <column name="PARENT_ID" type="INTEGER" required="true"/>
<br> <column name="PATH" required="true" size="240" type="VARCHAR"/>
<br>- <column name="PAGE_TYPE" size="40" type="VARCHAR"/>
<br>+ <column name="CONTENT_TYPE" size="40" type="VARCHAR"/>
<br> <column name="NAME" required="true" size="80" type="VARCHAR"/>
<br> <column name="VERSION" size="40" type="VARCHAR"/>
<br> <column name="TITLE" size="100" type="VARCHAR"/>
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=891420&r1=891419&r2=891420&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=891420&r1=891419&r2=891420&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Wed Dec 16 20:38:20 2009
<br>@@ -379,12 +379,39 @@
<br> </bean>
<br>
<br> <!-- PortalSite -->
<br>+ <bean id="org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper" name="portalSiteContentTypeMapper"
<br>+ class="org.apache.jetspeed.portalsite.impl.PortalSiteContentTypeMapperImpl">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg index="0">
<br>+ <list>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.ContentTypeMapping">
<br>+ <constructor-arg index="0">
<br>+ <value>^/content/.*\w[.](\w+)$</value> <!-- use $ for '$' -->
<br>+ </constructor-arg>
<br>+ <constructor-arg index="1">
<br>+ <value>$1</value> <!-- use $ for '$' -->
<br>+ </constructor-arg>
<br>+ </bean>
<br>+ <bean class="org.apache.jetspeed.portalsite.impl.ContentTypeMapping">
<br>+ <constructor-arg index="0">
<br>+ <value>^/content/</value>
<br>+ </constructor-arg>
<br>+ <constructor-arg index="1">
<br>+ <value>html</value>
<br>+ </constructor-arg>
<br>+ </bean>
<br>+ </list>
<br>+ </constructor-arg>
<br>+ </bean>
<br> <bean id="org.apache.jetspeed.portalsite.PortalSite" name="portalSite"
<br> class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
<br> <meta key="j2:cat" value="default" />
<br> <constructor-arg index="0">
<br> <ref bean="org.apache.jetspeed.page.PageManager" />
<br> </constructor-arg>
<br>+ <constructor-arg index="1">
<br>+ <ref bean="org.apache.jetspeed.portalsite.PortalSiteContentTypeMapper"/>
<br>+ </constructor-arg>
<br> </bean>
<br>
<br> <!-- PageSerializer, source: xmlPageManager, dest: dbPageMmanager -->
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818046&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26818046&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26817843
svn commit: r891415 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/content/ webapp/WEB-INF/
2009-12-16T12:22:15Z
2009-12-16T12:22:15Z
rwatler
Author: rwatler
<br>Date: Wed Dec 16 20:22:15 2009
<br>New Revision: 891415
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891415&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891415&view=rev</a><br>Log:
<br>Jetspeed DynamicPage Support - J2-admin Demo Portlet
<br>-----------------------------------------------------------
<br>- added DynamicWebContentPortlet as example DynamicPage 'aware' content portlet
<br>- includes custom URL rewriter, DynamicWebContentRewriter, to support 1:1 overlayed content and portal URL mappings
<br><br><br>Added:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java
<br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br><br>Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java?rev=891415&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java?rev=891415&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java (added)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentPortlet.java Wed Dec 16 20:22:15 2009
<br>@@ -0,0 +1,172 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.portlets.content;
<br>+
<br>+import java.io.ByteArrayInputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStreamReader;
<br>+import java.io.PrintWriter;
<br>+import java.util.HashMap;
<br>+import java.util.Map;
<br>+
<br>+import javax.portlet.ActionRequest;
<br>+import javax.portlet.ActionResponse;
<br>+import javax.portlet.PortletException;
<br>+import javax.portlet.PortletMode;
<br>+import javax.portlet.RenderRequest;
<br>+import javax.portlet.RenderResponse;
<br>+
<br>+import org.apache.jetspeed.request.RequestContext;
<br>+import org.apache.portals.applications.webcontent.portlet.WebContentHistoryPage;
<br>+import org.apache.portals.applications.webcontent.portlet.WebContentPortlet;
<br>+import org.apache.portals.applications.webcontent.rewriter.WebContentRewriter;
<br>+import org.apache.portals.messaging.PortletMessaging;
<br>+
<br>+import org.slf4j.Logger;
<br>+import org.slf4j.LoggerFactory;
<br>+
<br>+/**
<br>+ * WebContentPortlet that dynamically adjusts its content url based
<br>+ * on portal request urls. This portlet is designed to work in conjunction
<br>+ * with the DynamicPage PSML and PortalSite component in Jetspeed.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817843&i=0" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id$
<br>+ */
<br>+public class DynamicWebContentPortlet extends WebContentPortlet
<br>+{
<br>+ private final static Logger log = LoggerFactory.getLogger(DynamicWebContentPortlet.class);
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.portlet.WebContentPortlet#processAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse)
<br>+ */
<br>+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException
<br>+ {
<br>+ // process preferences
<br>+ if (actionRequest.getPortletMode() == PortletMode.EDIT)
<br>+ {
<br>+ processPreferencesAction(actionRequest, actionResponse);
<br>+ return;
<br>+ }
<br>+
<br>+ // extract rewritten action and save in page
<br>+ String webContentURL = actionRequest.getParameter(WebContentRewriter.ACTION_PARAMETER_URL);
<br>+ String webContentMethod = actionRequest.getParameter(WebContentRewriter.ACTION_PARAMETER_METHOD);
<br>+ Map webContentParams = new HashMap(actionRequest.getParameterMap()) ;
<br>+ webContentParams.remove(WebContentRewriter.ACTION_PARAMETER_URL);
<br>+ webContentParams.remove(WebContentRewriter.ACTION_PARAMETER_METHOD);
<br>+ WebContentHistoryPage webContentPage = new WebContentHistoryPage(webContentURL, webContentParams, webContentMethod);
<br>+ PortletMessaging.publish(actionRequest, getClass().getName(), webContentPage);
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.portlet.WebContentPortlet#doView(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
<br>+ */
<br>+ public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException
<br>+ {
<br>+ // portal request context
<br>+ RequestContext rc = (RequestContext) request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+
<br>+ // default page view rendering
<br>+ String viewPage = (String)request.getAttribute(PARAM_VIEW_PAGE);
<br>+ if (viewPage != null)
<br>+ {
<br>+ super.doView(request, response);
<br>+ return;
<br>+ }
<br>+
<br>+ // get source web content URL, parameters, and method to view
<br>+ String sourceURL = null;
<br>+ Map sourceParams = null;
<br>+ boolean sourcePostMethod = false;
<br>+ WebContentHistoryPage webContentPage = (WebContentHistoryPage)PortletMessaging.receive(request, getClass().getName());
<br>+ if (webContentPage != null)
<br>+ {
<br>+ // view rewritten action URL page
<br>+ sourceURL = webContentPage.getUrl();
<br>+ sourceParams = webContentPage.getParams();
<br>+ sourcePostMethod = webContentPage.isPost();
<br>+ }
<br>+ else
<br>+ {
<br>+ // load and validate preferences, (base url and portal base path
<br>+ // should both end in a "/" path separator to ensure that relative
<br>+ // urls in the content resolve predictably)
<br>+ String baseURL = request.getPreferences().getValue("SRC", null);
<br>+ String portalBasePath = request.getPreferences().getValue("PORTALPATH", null);
<br>+ if ((baseURL == null) || (portalBasePath == null))
<br>+ {
<br>+ throw new PortletException("Required SRC and PORTALPATH preferences not set");
<br>+ }
<br>+ if (!baseURL.endsWith("/"))
<br>+ {
<br>+ baseURL += "/";
<br>+ }
<br>+ if (!portalBasePath.startsWith("/"))
<br>+ {
<br>+ portalBasePath = "/"+portalBasePath;
<br>+ }
<br>+ if (!portalBasePath.endsWith("/"))
<br>+ {
<br>+ portalBasePath += "/";
<br>+ }
<br>+ // view content page based on portal request URL
<br>+ String portalRequestPath = rc.getPath();
<br>+ if (!portalRequestPath.startsWith(portalBasePath))
<br>+ {
<br>+ throw new PortletException("Unable to map portal request path: "+portalRequestPath+" onto portal base path: "+portalBasePath);
<br>+ }
<br>+ sourceURL = baseURL+portalRequestPath.substring(portalBasePath.length());
<br>+ }
<br>+
<br>+ // get web content
<br>+ byte[] content = null;
<br>+ try
<br>+ {
<br>+ // initialize and lock stateful rewriter
<br>+ String basePortalPath = rc.getPortalURL().getPageBasePath();
<br>+ initializeRewriter(DynamicWebContentRewriter.class);
<br>+ ((DynamicWebContentRewriter)getRewriter()).setBasePortalPath(basePortalPath);
<br>+
<br>+ // get and rewrite web content
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("Portal request: "+rc.getPath()+", Web content: "+sourceURL);
<br>+ }
<br>+ try
<br>+ {
<br>+ content = doWebContent(sourceURL, sourceParams, sourcePostMethod, request, response);
<br>+ }
<br>+ catch (Throwable t)
<br>+ {
<br>+ throw new PortletException("Error retrieveing web content: "+t, t);
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ // unlock stateful rewriter
<br>+ freeRewriter();
<br>+ }
<br>+
<br>+ // write web content to portlet writer
<br>+ response.setContentType("text/html");
<br>+ PrintWriter writer = response.getWriter();
<br>+ ByteArrayInputStream bais = new ByteArrayInputStream(content);
<br>+ drain(new InputStreamReader(bais, defaultEncoding), writer);
<br>+ bais.close();
<br>+ }
<br>+}
<br><br>Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java?rev=891415&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java?rev=891415&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java (added)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/content/DynamicWebContentRewriter.java Wed Dec 16 20:22:15 2009
<br>@@ -0,0 +1,297 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.portlets.content;
<br>+
<br>+import java.util.regex.Pattern;
<br>+import java.util.regex.Matcher;
<br>+
<br>+import javax.portlet.PortletURL;
<br>+
<br>+import org.apache.portals.applications.webcontent.rewriter.MutableAttributes;
<br>+import org.apache.portals.applications.webcontent.rewriter.WebContentRewriter;
<br>+
<br>+import org.slf4j.Logger;
<br>+import org.slf4j.LoggerFactory;
<br>+
<br>+/**
<br>+ * WebContentRewriter that overlays page navigation onto portal content paths.
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817843&i=1" target="_top" rel="nofollow">rwatler@...</a>">Randy Watler</a>
<br>+ * @version $Id$
<br>+ */
<br>+public class DynamicWebContentRewriter extends WebContentRewriter
<br>+{
<br>+ private final static Logger log = LoggerFactory.getLogger(DynamicWebContentRewriter.class);
<br>+
<br>+ private final static Pattern ONCLICK_LOCATION_PATTERN = Pattern.compile("[.]location *= *'([^']*)'");
<br>+ private final static Pattern STYLE_URL_PATTERN = Pattern.compile("url\\( *\"([^\"]*)\" *\\)");
<br>+
<br>+ protected String basePortalPath;
<br>+
<br>+ public String getBasePortalPath()
<br>+ {
<br>+ return basePortalPath;
<br>+ }
<br>+
<br>+ public void setBasePortalPath(String basePortalPath)
<br>+ {
<br>+ this.basePortalPath = basePortalPath;
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("basePortalPath: "+basePortalPath);
<br>+ }
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.rewriter.AbstractRewriter#setBaseUrl(java.lang.String)
<br>+ */
<br>+ public void setBaseUrl(String base)
<br>+ {
<br>+ super.setBaseUrl(base);
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("baseUrl: "+base);
<br>+ }
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.rewriter.WebContentRewriter#setActionURL(javax.portlet.PortletURL)
<br>+ */
<br>+ public void setActionURL(PortletURL action)
<br>+ {
<br>+ super.setActionURL(action);
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("actionURL: "+action);
<br>+ }
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.rewriter.WebContentRewriter#rewriteUrl(java.lang.String, java.lang.String, java.lang.String, org.apache.portals.applications.webcontent.rewriter.MutableAttributes)
<br>+ */
<br>+ public String rewriteUrl(String url, String tag, String attribute, MutableAttributes otherAttributes)
<br>+ {
<br>+ String rewrittenUrl = url;
<br>+ if (tag.equalsIgnoreCase("A") && attribute.equalsIgnoreCase("href"))
<br>+ {
<br>+ // redirect navigation through portal content urls
<br>+ rewrittenUrl = portalURL(url);
<br>+ }
<br>+ else if (tag.equalsIgnoreCase("FORM") && attribute.equalsIgnoreCase("action"))
<br>+ {
<br>+ // redirect forms through portal as action
<br>+ getActionURL().setParameter(ACTION_PARAMETER_URL, webContentURL(url));
<br>+ String httpMethod = otherAttributes.getValue("method");
<br>+ if (httpMethod != null)
<br>+ {
<br>+ getActionURL().setParameter(ACTION_PARAMETER_METHOD, httpMethod);
<br>+ }
<br>+ rewrittenUrl = getActionURL().toString();
<br>+ }
<br>+ else if (attribute.equalsIgnoreCase("onclick"))
<br>+ {
<br>+ // redirect javascript click navigation through portal content urls
<br>+ String javascript = url;
<br>+ StringBuilder rewrittenJavascript = new StringBuilder();
<br>+ int rewrittenIndex = 0;
<br>+ Matcher matcher = ONCLICK_LOCATION_PATTERN.matcher(javascript);
<br>+ while (matcher.find())
<br>+ {
<br>+ rewrittenJavascript.append(javascript.substring(rewrittenIndex,matcher.start(1)));
<br>+ rewrittenJavascript.append(portalURL(matcher.group(1)));
<br>+ rewrittenIndex = matcher.end(1);
<br>+ }
<br>+ if (rewrittenIndex > 0)
<br>+ {
<br>+ rewrittenJavascript.append(javascript.substring(rewrittenIndex));
<br>+ rewrittenUrl = rewrittenJavascript.toString();
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ // access assets directly externally from portal
<br>+ rewrittenUrl = webContentURL(url);
<br>+ }
<br>+
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.debug("rewriteUrl: "+url+" -> "+rewrittenUrl);
<br>+ }
<br>+ return rewrittenUrl;
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.portals.applications.webcontent.rewriter.BasicRewriter#rewriteText(java.lang.String, java.lang.String)
<br>+ */
<br>+ public String rewriteText(String tag, String text)
<br>+ {
<br>+ String rewrittenText = null;
<br>+ if (tag.equalsIgnoreCase("STYLE"))
<br>+ {
<br>+ StringBuilder rewrittenStyle = new StringBuilder();
<br>+ int rewrittenIndex = 0;
<br>+ Matcher matcher = STYLE_URL_PATTERN.matcher(text);
<br>+ while (matcher.find())
<br>+ {
<br>+ rewrittenStyle.append(text.substring(rewrittenIndex,matcher.start(1)));
<br>+ rewrittenStyle.append(webContentURL(matcher.group(1)));
<br>+ rewrittenIndex = matcher.end(1);
<br>+ }
<br>+ if (rewrittenIndex > 0)
<br>+ {
<br>+ rewrittenStyle.append(text.substring(rewrittenIndex));
<br>+ rewrittenText = rewrittenStyle.toString();
<br>+ }
<br>+ }
<br>+
<br>+ if (rewrittenText != null)
<br>+ {
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ String logText = text.replace('\n', ' ').replace('\r', ' ');
<br>+ String logRewrittenText = rewrittenText.replace('\n', ' ').replace('\r', ' ');
<br>+ log.debug("rewriteText: "+logText+" -> "+logRewrittenText);
<br>+ }
<br>+ }
<br>+ return rewrittenText;
<br>+ }
<br>+
<br>+ protected String webContentURL(String url)
<br>+ {
<br>+ // form absolute web content URL
<br>+ if (!url.startsWith("http://") && !url.startsWith("https://"))
<br>+ {
<br>+ if (url.startsWith("/"))
<br>+ {
<br>+ // get site root base url
<br>+ String baseRootUrl = baseRootURL(getBaseUrl());
<br>+ // append site relative url to base url
<br>+ url = baseRootUrl+url.substring(1);
<br>+ }
<br>+ else
<br>+ {
<br>+ // strip "./" prefix from url
<br>+ while (url.startsWith("./"))
<br>+ {
<br>+ url = url.substring(2);
<br>+ }
<br>+ // get base url
<br>+ String baseUrl = baseURL(getBaseUrl(), false);
<br>+ // strip "../" prefix from url
<br>+ while (url.startsWith("../"))
<br>+ {
<br>+ url = url.substring(3);
<br>+ baseUrl = baseURL(baseUrl, true);
<br>+ }
<br>+ // append relative url to base url
<br>+ url = baseUrl+url;
<br>+ }
<br>+ }
<br>+ return url;
<br>+ }
<br>+
<br>+ protected String portalURL(String url)
<br>+ {
<br>+ // derive content relative url if necessary
<br>+ if (url.startsWith("http://") || url.startsWith("https://"))
<br>+ {
<br>+ // get base url
<br>+ String baseUrl = baseURL(getBaseUrl(), false);
<br>+ // strip base url to create relative url
<br>+ if (url.startsWith(baseUrl))
<br>+ {
<br>+ return url.substring(baseUrl.length());
<br>+ }
<br>+ // compute relative url from base if possible
<br>+ String baseRootUrl = baseRootURL(getBaseUrl());
<br>+ if (url.startsWith(baseRootUrl))
<br>+ {
<br>+ url = url.substring(baseRootUrl.length());
<br>+ String remainingBasePath = baseUrl.substring(baseRootUrl.length());
<br>+ int remainingBasePathIndex = remainingBasePath.indexOf('/');
<br>+ while (remainingBasePathIndex != -1)
<br>+ {
<br>+ url = "../"+url;
<br>+ remainingBasePathIndex = remainingBasePath.indexOf('/', remainingBasePathIndex+1);
<br>+ }
<br>+ }
<br>+ }
<br>+ else if (url.startsWith("/"))
<br>+ {
<br>+ // get base url
<br>+ String baseUrl = baseURL(getBaseUrl(), false);
<br>+ // compute relative url from root relative url
<br>+ String baseRootUrl = baseRootURL(getBaseUrl());
<br>+ url = url.substring(1);
<br>+ String remainingBasePath = baseUrl.substring(baseRootUrl.length());
<br>+ int remainingBasePathIndex = remainingBasePath.indexOf('/');
<br>+ while (remainingBasePathIndex != -1)
<br>+ {
<br>+ url = "../"+url;
<br>+ remainingBasePathIndex = remainingBasePath.indexOf('/', remainingBasePathIndex+1);
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ // strip "./" prefix from url
<br>+ while (url.startsWith("./"))
<br>+ {
<br>+ url = url.substring(2);
<br>+ }
<br>+ }
<br>+ // make portal site relative url from content relative urls
<br>+ if (!url.startsWith("http://") && !url.startsWith("https://"))
<br>+ {
<br>+ String basePortalPath = getBasePortalPath();
<br>+ if (!basePortalPath.endsWith("/"))
<br>+ {
<br>+ basePortalPath += "/";
<br>+ }
<br>+ url = basePortalPath+url;
<br>+ }
<br>+ return url;
<br>+ }
<br>+
<br>+ protected static String baseURL(String baseUrl, boolean force)
<br>+ {
<br>+ boolean folderUrl = baseUrl.endsWith("/");
<br>+ if (!folderUrl || force)
<br>+ {
<br>+ int baseRootUrlIndex = baseUrl.indexOf('/');
<br>+ baseRootUrlIndex = baseUrl.indexOf('/', baseRootUrlIndex+1);
<br>+ baseRootUrlIndex = baseUrl.indexOf('/', baseRootUrlIndex+1);
<br>+ int baseUrlIndex = (folderUrl ? baseUrl.lastIndexOf('/', baseUrl.length()-2) : baseUrl.lastIndexOf('/'));
<br>+ if ((baseRootUrlIndex != -1) || (baseUrlIndex > baseUrlIndex))
<br>+ {
<br>+ baseUrl = baseUrl.substring(0, baseUrlIndex+1);
<br>+ }
<br>+ else if (!folderUrl)
<br>+ {
<br>+ baseUrl += "/";
<br>+ }
<br>+ }
<br>+ return baseUrl;
<br>+ }
<br>+
<br>+ protected static String baseRootURL(String baseUrl)
<br>+ {
<br>+ int baseRootUrlIndex = baseUrl.indexOf('/');
<br>+ baseRootUrlIndex = baseUrl.indexOf('/', baseRootUrlIndex+1);
<br>+ baseRootUrlIndex = baseUrl.indexOf('/', baseRootUrlIndex+1);
<br>+ return ((baseRootUrlIndex != -1) ? baseUrl : baseUrl.substring(0, baseRootUrlIndex))+"/";
<br>+ }
<br>+}
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891415&r1=891414&r2=891415&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=891415&r1=891414&r2=891415&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Wed Dec 16 20:22:15 2009
<br>@@ -2314,6 +2314,51 @@
<br> </portlet-info>
<br> </portlet>
<br>
<br>+ <portlet>
<br>+ <description>Portal DynamicPage enabled content portlet that displays content of another website inside the portal without using frames. All links are rewritten back to the portal to attempt to proxy all content through the portal.</description>
<br>+ <portlet-name>DynamicWebContentPortlet</portlet-name>
<br>+ <display-name>Portal DynamicPage WebContent Portlet</display-name>
<br>+ <portlet-class>org.apache.jetspeed.portlets.content.DynamicWebContentPortlet</portlet-class>
<br>+ <init-param>
<br>+ <name>EditPage</name>
<br>+ <value>/WEB-INF/view/edit-prefs.vm</value>
<br>+ </init-param>
<br>+ <init-param>
<br>+ <name>portlet-icon</name>
<br>+ <value>preferences-system-network-proxy.png</value>
<br>+ </init-param>
<br>+ <expiration-cache>0</expiration-cache>
<br>+ <supports>
<br>+ <mime-type>text/html</mime-type>
<br>+ <portlet-mode>EDIT</portlet-mode>
<br>+ <portlet-mode>VIEW</portlet-mode>
<br>+ </supports>
<br>+ <supported-locale>en</supported-locale>
<br>+ <portlet-info>
<br>+ <title>Portal DynamicPage WebContent Portlet</title>
<br>+ <short-title>DynamicWebContent</short-title>
<br>+ <keywords>web,content,webnav,bridge,proxy,rewrite,dpsml</keywords>
<br>+ </portlet-info>
<br>+ <portlet-preferences>
<br>+ <preference>
<br>+ <name>SRC</name>
<br>+ <value><a href="http://portals.apache.org/" target="_top" rel="nofollow">http://portals.apache.org/</a></value>
<br>+ </preference>
<br>+ <preference>
<br>+ <name>PORTALPATH</name>
<br>+ <value>/content/</value>
<br>+ </preference>
<br>+ <preference>
<br>+ <name>PROXYHOST</name>
<br>+ <value></value>
<br>+ </preference>
<br>+ <preference>
<br>+ <name>PROXYPORT</name>
<br>+ <value></value>
<br>+ </preference>
<br>+ </portlet-preferences>
<br>+ </portlet>
<br>+
<br> <custom-portlet-mode>
<br> <description>a Custom Config Mode</description>
<br> <portlet-mode>config</portlet-mode>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817843&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817843&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26817485
svn commit: r891409 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-16T11:58:45Z
2009-12-16T11:58:45Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 19:58:44 2009
<br>New Revision: 891409
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891409&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891409&view=rev</a><br>Log:
<br>JS2-1057: Adding pagination
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=891409&r1=891408&r2=891409&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=891409&r1=891408&r2=891409&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Wed Dec 16 19:58:44 2009
<br>@@ -18,7 +18,9 @@
<br>
<br> import java.io.IOException;
<br> import java.util.Arrays;
<br>+import java.util.HashMap;
<br> import java.util.List;
<br>+import java.util.Map;
<br>
<br> import javax.portlet.ActionRequest;
<br> import javax.portlet.ActionResponse;
<br>@@ -26,6 +28,7 @@
<br> import javax.portlet.PortletConfig;
<br> import javax.portlet.PortletContext;
<br> import javax.portlet.PortletException;
<br>+import javax.portlet.PortletPreferences;
<br> import javax.portlet.PortletRequest;
<br> import javax.portlet.RenderRequest;
<br> import javax.portlet.RenderResponse;
<br>@@ -102,9 +105,15 @@
<br> public void doView(RenderRequest request, RenderResponse response)
<br> throws PortletException, IOException
<br> {
<br>- request.setAttribute("categories", retrieveCategories(request));
<br>+ List<String> categories = retrieveCategories(request);
<br>+ request.setAttribute("categories", categories);
<br>+ Map<String, String> categoryKeywordsMap = retrieveCategoryKeywordsMap(categories, request);
<br>+ request.setAttribute("categoryKeywords", categoryKeywordsMap);
<br>+
<br> request.setAttribute("layouts", LayoutBean.retrieveLayouts(request, decorationFactory));
<br> request.setAttribute("themes", ThemeBean.retrieveThemes(request, decorationFactory));
<br>+ PortletPreferences prefs = request.getPreferences();
<br>+ request.setAttribute("prefs", prefs.getMap());
<br>
<br> boolean hasEditAccess = false;
<br>
<br>@@ -186,4 +195,18 @@
<br> return categories;
<br> }
<br>
<br>+ public Map<String, String> retrieveCategoryKeywordsMap(List<String> categories, PortletRequest request) throws PortletException
<br>+ {
<br>+ Map<String, String> keywordsMap = new HashMap<String, String>();
<br>+ PortletPreferences prefs = request.getPreferences();
<br>+
<br>+ for (String category : categories)
<br>+ {
<br>+ String keywords = prefs.getValue("Keywords:" + category, "");
<br>+ keywordsMap.put(category, keywords);
<br>+ }
<br>+
<br>+ return keywordsMap;
<br>+ }
<br>+
<br> }
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891409&r1=891408&r2=891409&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891409&r1=891408&r2=891409&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Wed Dec 16 19:58:44 2009
<br>@@ -31,16 +31,17 @@
<br>
<br> <portlet:defineObjects/>
<br> <c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<br>-<c:set var="portalContextPrefix" value="${requestContext.request.contextPath}"/>
<br> <c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
<br> <c:set var="portalPagePath" value="${requestContext.portalURL.path}"/>
<br> <c:if test="${empty portalPagePath}">
<br> <c:set var="portalPagePath" value="/"/>
<br> </c:if>
<br>
<br>+<c:set var="portletPageSize" value="${prefs['Rows'][0]}"/>
<br>+
<br> <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <td class="portlet-section-subheader" colspan='10'>
<br>+ <td class="portlet-section-subheader">
<br> <a href="#" id="<portlet:namespace/>portletsTabAction">Portlets</a>
<br> |
<br> <a href="#" id="<portlet:namespace/>layoutTabAction">Layout</a>
<br>@@ -55,21 +56,21 @@
<br> <form id="<portlet:namespace/>form">
<br> <table id="<portlet:namespace/>portletsTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>- <th class="portlet-section-header" colspan="10">Portlets</th>
<br>+ <th class="portlet-section-header">Portlets</th>
<br> </tr>
<br> <tr>
<br>- <td class="portlet-section-subheader" colspan='10'>
<br>+ <td class="portlet-section-subheader">
<br> <input type="text" name="query" size="15" value="" >
<br> <input type="submit" value="Search" />
<br> </td>
<br> </tr>
<br>
<br> <tr>
<br>- <td class="portlet-section-subheader" colspan='10'>
<br>+ <td class="portlet-section-subheader">
<br> <select id="<portlet:namespace/>categories">
<br> <option value="">Choose a category</option>
<br> <c:forEach var="category" items="${categories}">
<br>- <option value="${category}">${category}</option>
<br>+ <option value="${category}" keywords="${categoryKeywords[category]}">${category}</option>
<br> </c:forEach>
<br> </select>
<br> </td>
<br>@@ -82,7 +83,22 @@
<br> </tr>
<br>
<br> <tr>
<br>- <th class="portlet-section-header" colspan="2"></th>
<br>+ <td class="portlet-section-subheader">
<br>+ <div id="<portlet:namespace/>pageNavBar" class="jstbPageNavBar">
<br>+ <a href="#" class="jstbPageNav" pageIndex="first"><<</a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="prev"><</a>
<br>+ <select id="<portlet:namespace/>pageNavIndex">
<br>+ <option value="">Page</option>
<br>+ </select>
<br>+ </select>
<br>+ <a href="#" class="jstbPageNav" pageIndex="next">></a>
<br>+ <a href="#" class="jstbPageNav" pageIndex="last">>></a>
<br>+ </div>
<br>+ </td>
<br>+ </tr>
<br>+
<br>+ <tr>
<br>+ <th class="portlet-section-header"></th>
<br> </tr>
<br> </table>
<br> </form>
<br>@@ -170,7 +186,57 @@
<br> </table>
<br>
<br> <script language="javascript">
<br>-YUI().use('io', 'json', 'node-base', 'cookie', 'jetui-portal', function(Y) {
<br>+YUI().use('jetui-portal', 'io', 'json', 'node-base', 'cookie', function(Y) {
<br>+
<br>+ var pagination = {
<br>+ portlet : { uri : null, totalSize : 0, pageSize : ${portletPageSize}, beginIndex : 0 },
<br>+
<br>+ getPageBeginIndex : function(info, scrollTo) {
<br>+ if (isNaN(scrollTo)) {
<br>+ if ("first" == scrollTo) {
<br>+ return 0;
<br>+ } else if ("prev" == scrollTo) {
<br>+ return Math.max(info.beginIndex - info.pageSize, 0);
<br>+ } else if ("next" == scrollTo) {
<br>+ var lastPageBeginIndex = 0;
<br>+ if (info.totalSize > 0) {
<br>+ lastPageBeginIndex = parseInt((info.totalSize - 1) / info.pageSize) * info.pageSize;
<br>+ }
<br>+ return Math.min(info.beginIndex + info.pageSize, lastPageBeginIndex);
<br>+ } else if ("last" == scrollTo) {
<br>+ var lastPageBeginIndex = 0;
<br>+ if (info.totalSize > 0) {
<br>+ lastPageBeginIndex = parseInt((info.totalSize - 1) / info.pageSize) * info.pageSize;
<br>+ }
<br>+ return lastPageBeginIndex;
<br>+ } else {
<br>+ return -1;
<br>+ }
<br>+ } else {
<br>+ var lastPageBeginIndex = 0;
<br>+ if (info.totalSize > 0) {
<br>+ lastPageBeginIndex = parseInt((info.totalSize - 1) / info.pageSize) * info.pageSize;
<br>+ }
<br>+ return Math.min((parseInt(scrollTo) - 1) * info.pageSize, lastPageBeginIndex);
<br>+ }
<br>+ },
<br>+
<br>+ getPageCount : function(info) {
<br>+ var count = parseInt(info.totalSize / info.pageSize);
<br>+ if (info.totalSize % info.pageSize != 0) {
<br>+ ++count;
<br>+ }
<br>+ return count;
<br>+ },
<br>+
<br>+ getCurrentPageIndex : function(info) {
<br>+ if (info.totalSize > 0) {
<br>+ return parseInt(info.beginIndex / info.pageSize) + 1;
<br>+ } else {
<br>+ return 0;
<br>+ }
<br>+ }
<br>+ };
<br>
<br> function switchTab(e) {
<br> var tabId = null;
<br>@@ -222,6 +288,9 @@
<br> return;
<br> }
<br>
<br>+ pagination.portlet.totalSize = dataOut.totalSize;
<br>+ pagination.portlet.beginIndex = Math.max(dataOut.beginIndex, 0);
<br>+
<br> var portletsPanel = Y.Node.one("#<portlet:namespace/>portletItemsPanel");
<br> var clonedPortletsPanel = portletsPanel.cloneNode(false);
<br> portletsPanel.get("parentNode").replaceChild(clonedPortletsPanel, portletsPanel);
<br>@@ -236,9 +305,9 @@
<br> clone.setStyle('display', '');
<br> var imgNode = clone.one('img');
<br> if (def.portletIcon) {
<br>- imgNode.set("src", "${portalContextPrefix}/images/portlets/" + def.portletIcon);
<br>+ imgNode.set("src", "${portalContextPath}/images/portlets/" + def.portletIcon);
<br> } else {
<br>- imgNode.set("src", "${portalContextPefix}/images/portlets/applications-other.png");
<br>+ imgNode.set("src", "${portalContextPath}/images/portlets/applications-other.png");
<br> }
<br>
<br> var nameNode = clone.one('div');
<br>@@ -260,6 +329,20 @@
<br>
<br> portletsPanel.appendChild(clone);
<br> }
<br>+
<br>+ var navSel = Y.one("#<portlet:namespace/>pageNavIndex");
<br>+ var options = navSel.getElementsByTagName("OPTION");
<br>+ for (var i = options.size() - 1; i > 0; i--) {
<br>+ navSel.removeChild(options.item(i));
<br>+ }
<br>+ var pageCount = pagination.getPageCount(pagination.portlet);
<br>+ for (var i = 1; i <= pageCount; i++) {
<br>+ var option = Y.Node.create("<option value='" + i + "'>" + (i < 10 ? " " + i : i) + "</option>");
<br>+ navSel.appendChild(option);
<br>+ }
<br>+ var curPageIndex = pagination.getCurrentPageIndex(pagination.portlet);
<br>+ var pageIndices = Y.Node.getDOMNode(navSel);
<br>+ pageIndices.options[curPageIndex].selected = true;
<br> };
<br>
<br> var loadPortletsInCategory = function(e) {
<br>@@ -272,8 +355,10 @@
<br> return;
<br> }
<br> Y.Cookie.set("toolboxcat", category);
<br>- var uri = "${portalContextPrefix}/services/portletregistry/definition/?_type=json";
<br>+ var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
<br>+ uri += "&max=" + pagination.portlet.pageSize + "&begin=0";
<br> uri += "&query=" + category;
<br>+ pagination.portlet.uri = uri;
<br> var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
<br> Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>form")).query.value = "";
<br> }
<br>@@ -281,14 +366,43 @@
<br> var loadPortletsByQuery = function(e) {
<br> var form = Y.Node.getDOMNode(e.target);
<br> var query = form.query.value;
<br>- var uri = "${portalContextPrefix}/services/portletregistry/definition/?_type=json";
<br>+ var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
<br>+ uri += "&max=" + pagination.portlet.pageSize + "&begin=0";
<br> if (query) {
<br> uri += "&query=" + query;
<br> }
<br>+ pagination.portlet.uri = uri;
<br> var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
<br>-
<br> Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories")).selectedIndex = 0;
<br>+ e.halt();
<br>+ };
<br>
<br>+ var onPortletPaginationLinkClick = function(e) {
<br>+ var navElem = e.target;
<br>+ var beginIndex = pagination.getPageBeginIndex(pagination.portlet, navElem.getAttribute("pageIndex"));
<br>+
<br>+ if (beginIndex != -1 && beginIndex != pagination.portlet.beginIndex) {
<br>+ var uri = pagination.portlet.uri.replace(/&begin=\d+/, "&begin=" + beginIndex);
<br>+ var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
<br>+ }
<br>+
<br>+ e.halt();
<br>+ };
<br>+
<br>+ var onPortletPaginationSelectChange = function(e) {
<br>+ var pageIndices = Y.Node.getDOMNode(e.target);
<br>+ var pageIndex = pageIndices.options[pageIndices.selectedIndex].value;
<br>+ if (pageIndex) {
<br>+ var beginIndex = pagination.getPageBeginIndex(pagination.portlet, pageIndex);
<br>+
<br>+ if (beginIndex != -1 && beginIndex != pagination.portlet.beginIndex) {
<br>+ var uri = pagination.portlet.uri.replace(/&begin=\d+/, "&begin=" + beginIndex);
<br>+ var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
<br>+ }
<br>+ } else {
<br>+ var curPageIndex = pagination.getCurrentPageIndex(pagination.portlet);
<br>+ pageIndices.options[curPageIndex].selected = true;
<br>+ }
<br> e.halt();
<br> };
<br>
<br>@@ -308,7 +422,7 @@
<br> return;
<br> }
<br>
<br>- var portal = JETUI_YUI.getPortalInstance();
<br>+ var portal = (JETUI_YUI ? JETUI_YUI.getPortalInstance() : null);
<br> if (portal) {
<br> portal.addPortlet(dataOut);
<br> } else {
<br>@@ -321,7 +435,7 @@
<br> var portletUniqueName = a.getAttribute("portletUniqueName");
<br>
<br> if (portletUniqueName) {
<br>- var uri = "${portalContextPrefix}/services/pagelayout/fragment/portlet/" + portletUniqueName + "/?_type=json";
<br>+ var uri = "${portalContextPath}/services/pagelayout/fragment/portlet/" + portletUniqueName + "/?_type=json";
<br> var config = {
<br> on: { complete: onAddPortletComplete },
<br> method: "POST",
<br>@@ -341,6 +455,13 @@
<br> Y.on("change", loadPortletsInCategory, "#<portlet:namespace/>categories");
<br> Y.on("submit", loadPortletsByQuery, "#<portlet:namespace/>form");
<br>
<br>+ var pageNavBar = Y.one("#<portlet:namespace/>pageNavBar");
<br>+ var navLinks = pageNavBar.all(".jstbPageNav");
<br>+ navLinks.each(function(v, k) {
<br>+ v.on("click", onPortletPaginationLinkClick);
<br>+ });
<br>+ Y.one("#<portlet:namespace/>pageNavIndex").on("change", onPortletPaginationSelectChange);
<br>+
<br> var tabId = Y.Cookie.get("toolboxtab");
<br> if (!tabId) {
<br> tabId = "portlets";
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817485&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817485&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26817078
Re: Building js2 with tests?
2009-12-16T11:32:20Z
2009-12-16T11:32:20Z
Randy Watler
David,
<br><br>Here is the sequence I use:
<br><br> > mvn clean install
<br> > mvn jetspeed:mvn -Dtarget=testdb
<br> > mvn -P test test
<br><br>There is also a target to combine the last two steps in the jetspeed
<br>plugin, but I don't use that, (due to general pluginphobia).
<br><br>HTH,
<br><br>Randy
<br><br>David Jencks wrote:
<div class='shrinkable-quote'><br>> I'm trying to figure out just how much the pluto DI changes I'm
<br>> working on will break js2... so far
<br>>
<br>> mvn clean install
<br>>
<br>> seems to work, much to my surprise, but if I enable tests I get stuck
<br>> on some db tests. I looked around briefly but didn't find any
<br>> instructions.
<br>>
<br>> What's the secret?
<br>>
<br>> So far I've added this to the root pom properties:
<br>>
<br>>
<br>> <org.apache.jetspeed.test.database.driver>org.apache.derby.jdbc.EmbeddedDriver</org.apache.jetspeed.test.database.driver>
<br>>
<br>>
<br>> <org.apache.jetspeed.test.database.url>jdbc:derby:${pom.basedir}/target/testdb;create=true</org.apache.jetspeed.test.database.url>
<br>>
<br>>
<br>> <org.apache.jetspeed.test.database.user></org.apache.jetspeed.test.database.user>
<br>>
<br>>
<br>> <org.apache.jetspeed.test.database.password></org.apache.jetspeed.test.database.password>
<br>>
<br>>
<br>>
<br>> and get errors like this:
<br>>
<br>> ...
<br>> Caused by: ERROR 42X05: Table/View 'CAPABILITY' does not exist.
<br>> at
<br>> org.apache.derby.iapi.error.StandardException.newException(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.FromBaseTable.bindTableDescriptor(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.FromBaseTable.bindNonVTITables(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.FromList.bindTables(Unknown Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.SelectNode.bindNonVTITables(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.DMLStatementNode.bindTables(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.DMLStatementNode.bind(Unknown Source)
<br>> at
<br>> org.apache.derby.impl.sql.compile.CursorNode.bindStatement(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown Source)
<br>> at org.apache.derby.impl.sql.GenericStatement.prepare(Unknown
<br>> Source)
<br>> at
<br>> org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext.prepareInternalStatement(Unknown
<br>> Source)
<br>> ... 98 more
<br>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0, Time elapsed: 8.81
<br>> sec <<< FAILURE!
<br>>
<br>> Results :
<br>>
<br>> Tests in error:
<br>> firstTestSetup(org.apache.jetspeed.capabilities.TestCapability)
<br>> testCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>> testNewMimeType(org.apache.jetspeed.capabilities.TestCapability)
<br>> testNewCapability(org.apache.jetspeed.capabilities.TestCapability)
<br>> testNewMediaType(org.apache.jetspeed.capabilities.TestCapability)
<br>> testNewClient(org.apache.jetspeed.capabilities.TestCapability)
<br>> testCapabilityRepeat(org.apache.jetspeed.capabilities.TestCapability)
<br>> lastTestTeardown(org.apache.jetspeed.capabilities.TestCapability)
<br>>
<br>> Tests run: 8, Failures: 0, Errors: 8, Skipped: 0
<br>>
<br>> thanks
<br>> david jencks
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817078&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817078&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817078&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26817078&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26816935
Building js2 with tests?
2009-12-16T11:24:32Z
2009-12-16T11:24:32Z
djencks
I'm trying to figure out just how much the pluto DI changes I'm
<br>working on will break js2... so far
<br><br>mvn clean install
<br><br>seems to work, much to my surprise, but if I enable tests I get stuck
<br>on some db tests. I looked around briefly but didn't find any
<br>instructions.
<br><br>What's the secret?
<br><br>So far I've added this to the root pom properties:
<br><br>
<br><
<br>org
<br>.apache
<br>.jetspeed.test.database.driver>org.apache.derby.jdbc.EmbeddedDriver</
<br>org.apache.jetspeed.test.database.driver>
<br> <org.apache.jetspeed.test.database.url>jdbc:derby:${pom.basedir}/
<br>target/testdb;create=true</org.apache.jetspeed.test.database.url>
<br> <org.apache.jetspeed.test.database.user></
<br>org.apache.jetspeed.test.database.user>
<br> <org.apache.jetspeed.test.database.password></
<br>org.apache.jetspeed.test.database.password>
<br><br><br>and get errors like this:
<br><br>...
<br>Caused by: ERROR 42X05: Table/View 'CAPABILITY' does not exist.
<br> at
<br>org.apache.derby.iapi.error.StandardException.newException(Unknown
<br>Source)
<br> at
<br>org
<br>.apache
<br>.derby.impl.sql.compile.FromBaseTable.bindTableDescriptor(Unknown
<br>Source)
<br> at
<br>org
<br>.apache.derby.impl.sql.compile.FromBaseTable.bindNonVTITables(Unknown
<br>Source)
<br> at
<br>org.apache.derby.impl.sql.compile.FromList.bindTables(Unknown Source)
<br> at
<br>org.apache.derby.impl.sql.compile.SelectNode.bindNonVTITables(Unknown
<br>Source)
<br> at
<br>org.apache.derby.impl.sql.compile.DMLStatementNode.bindTables(Unknown
<br>Source)
<br> at
<br>org.apache.derby.impl.sql.compile.DMLStatementNode.bind(Unknown Source)
<br> at
<br>org.apache.derby.impl.sql.compile.CursorNode.bindStatement(Unknown
<br>Source)
<br> at
<br>org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown Source)
<br> at org.apache.derby.impl.sql.GenericStatement.prepare(Unknown
<br>Source)
<br> at
<br>org
<br>.apache
<br>.derby
<br>.impl
<br>.sql
<br>.conn
<br>.GenericLanguageConnectionContext.prepareInternalStatement(Unknown
<br>Source)
<br> ... 98 more
<br>Tests run: 8, Failures: 0, Errors: 8, Skipped: 0, Time elapsed: 8.81
<br>sec <<< FAILURE!
<br><br>Results :
<br><br>Tests in error:
<br> firstTestSetup(org.apache.jetspeed.capabilities.TestCapability)
<br> testCapability(org.apache.jetspeed.capabilities.TestCapability)
<br> testNewMimeType(org.apache.jetspeed.capabilities.TestCapability)
<br> testNewCapability(org.apache.jetspeed.capabilities.TestCapability)
<br> testNewMediaType(org.apache.jetspeed.capabilities.TestCapability)
<br> testNewClient(org.apache.jetspeed.capabilities.TestCapability)
<br> testCapabilityRepeat(org.apache.jetspeed.capabilities.TestCapability)
<br> lastTestTeardown(org.apache.jetspeed.capabilities.TestCapability)
<br><br>Tests run: 8, Failures: 0, Errors: 8, Skipped: 0
<br><br>thanks
<br>david jencks
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26816935&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26816935&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26813554
svn commit: r891283 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-16T08:00:46Z
2009-12-16T08:00:46Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 16:00:46 2009
<br>New Revision: 891283
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891283&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891283&view=rev</a><br>Log:
<br>JS2-1057: Removing unused codes and changes on accessing the portal singleton instance.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=891283&r1=891282&r2=891283&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=891283&r1=891282&r2=891283&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Wed Dec 16 16:00:46 2009
<br>@@ -31,14 +31,12 @@
<br> import javax.portlet.RenderResponse;
<br>
<br> import org.apache.commons.lang.StringUtils;
<br>-import org.apache.commons.lang.math.NumberUtils;
<br> import org.apache.jetspeed.CommonPortletServices;
<br> import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.decoration.DecorationFactory;
<br> import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br>-import org.apache.jetspeed.om.page.Fragment;
<br> import org.apache.jetspeed.portlet.HeaderPhaseSupportConstants;
<br> import org.apache.jetspeed.request.RequestContext;
<br> import org.apache.portals.bridges.common.GenericServletPortlet;
<br>@@ -187,77 +185,5 @@
<br>
<br> return categories;
<br> }
<br>-
<br>- protected ContentFragment findFirstUnlockedFragment(ContentFragment fragment)
<br>- {
<br>- if (fragment.isLocked())
<br>- {
<br>- List<ContentFragment> fragments = (List<ContentFragment>) fragment.getFragments();
<br>-
<br>- for (ContentFragment f : fragments)
<br>- {
<br>- if (f.getType().equals(Fragment.LAYOUT))
<br>- {
<br>- fragment = findFirstUnlockedFragment(f);
<br>- if (fragment != null)
<br>- return fragment;
<br>- }
<br>- }
<br>-
<br>- return null;
<br>- }
<br>- return fragment;
<br>- }
<br>-
<br>- // BOZO: this only works with flat collections of 1,2,3,4 column layouts. Not meant to work with nested layouts
<br>- // TODO: move code to an AJAX API
<br>- protected void addPortletToLeastUsedColumn(ContentPage page, String portletName)
<br>- {
<br>- ContentFragment layoutFragment = findFirstUnlockedFragment(page.getRootFragment());
<br>-
<br>- if (layoutFragment != null)
<br>- {
<br>- String layoutType = layoutFragment.getName();
<br>- List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
<br>- int columnCounts[] = new int[getLayoutSize(layoutType)];
<br>-
<br>- for (ContentFragment fragment : fragments)
<br>- {
<br>- int column = fragment.getLayoutColumn();
<br>- int row = fragment.getLayoutRow();
<br>- if (column == -1)
<br>- column = NumberUtils.min(columnCounts);
<br>- if (row == -1)
<br>- row = columnCounts[column];
<br>- if (column > fragments.size() -1)
<br>- {
<br>- fragment.updateRowColumn(-1, 0);
<br>- column = 0;
<br>- }
<br>- columnCounts[column]++;
<br>- }
<br>-
<br>- int placedColumn = 0;
<br>-
<br>- for (int ix = 1; ix < columnCounts.length; ix++)
<br>- {
<br>- if (columnCounts[ix] < columnCounts[placedColumn])
<br>- placedColumn = ix;
<br>- }
<br>-
<br>- layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
<br>- }
<br>- }
<br>
<br>- public static int getLayoutSize(String layoutType)
<br>- {
<br>- if (layoutType.indexOf("TwoColumns") > -1)
<br>- return 2;
<br>- if (layoutType.indexOf("ThreeColumns") > -1)
<br>- return 3;
<br>- if (layoutType.indexOf("FourColumns") > -1)
<br>- return 4;
<br>- else
<br>- return 1;
<br>- }
<br> }
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891283&r1=891282&r2=891283&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891283&r1=891282&r2=891283&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Wed Dec 16 16:00:46 2009
<br>@@ -171,7 +171,7 @@
<br>
<br> <script language="javascript">
<br> YUI().use('io', 'json', 'node-base', 'cookie', 'jetui-portal', function(Y) {
<br>-
<br>+
<br> function switchTab(e) {
<br> var tabId = null;
<br> if ('string' == typeof(e)) {
<br>@@ -308,8 +308,8 @@
<br> return;
<br> }
<br>
<br>- if (JETUI_YUI && JETUI_YUI.portalInstance) {
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br>+ if (portal) {
<br> portal.addPortlet(dataOut);
<br> } else {
<br> location.href = location.href;
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813554&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813554&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26813518
svn commit: r891280 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: javascript/jetspeed/jetui/jetui-portal.js jetui/engine/portal.js
2009-12-16T07:58:54Z
2009-12-16T07:58:54Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 15:58:53 2009
<br>New Revision: 891280
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891280&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891280&view=rev</a><br>Log:
<br>JS2-1084: Adding singleton access method for portal instance.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891280&r1=891279&r2=891280&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891280&r1=891279&r2=891280&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Wed Dec 16 15:58:53 2009
<br>@@ -27,6 +27,22 @@
<br>
<br> Y.namespace("JetUI");
<br>
<br>+ // JETUI_YUI must be defined outside. However, just check again not to throw exceptions.
<br>+ if (!JETUI_YUI) {
<br>+ JETUI_YUI = {};
<br>+ }
<br>+
<br>+ /**
<br>+ * Global method definition to returns the portal singleton instance
<br>+ * @method
<br>+ */
<br>+ JETUI_YUI.getPortalInstance = function() {
<br>+ if (!JETUI_YUI._portalInstance) {
<br>+ JETUI_YUI._portalInstance = new Y.JetUI.Portal(JETUI_YUI.config);
<br>+ }
<br>+ return JETUI_YUI._portalInstance;
<br>+ };
<br>+
<br> /**
<br> * Create a portal to represent a portal screen.
<br> *
<br>@@ -127,9 +143,11 @@
<br> * @protected
<br> */
<br> initializer : function(cfg) {
<br>- this.portalContextPath = cfg.portalContextPath;
<br>- this.portalServletPath = cfg.portalServletPath;
<br>- this.portalPagePath = cfg.portalPagePath;
<br>+ if (cfg) {
<br>+ this.portalContextPath = cfg.portalContextPath;
<br>+ this.portalServletPath = cfg.portalServletPath;
<br>+ this.portalPagePath = cfg.portalPagePath;
<br>+ }
<br> },
<br>
<br> /**
<br>@@ -193,10 +211,7 @@
<br> * @method movePortlet
<br> */
<br> movePortlet : function(e) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>-
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var drop = e.drop.get('node'),
<br> drag = e.drag.get('node');
<br> var dragParent = drag.get('parentNode');
<br>@@ -263,9 +278,7 @@
<br> * @method removePortlet
<br> */
<br> removePortlet : function(e) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var windowId = null;
<br> if (e instanceof String) {
<br> windowId = e;
<br>@@ -287,9 +300,7 @@
<br> * @method createDecoratorActionNode
<br> */
<br> createDecoratorActionNode : function(decoAction) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var node = Y.Node.create("<a class='action portlet-action'/>");
<br> var icon = Y.Node.create("<img border='0'/>");
<br> node.setAttribute("href", decoAction.action);
<br>@@ -307,9 +318,7 @@
<br> * @method onPortletDecorationReadComplete
<br> */
<br> onPortletDecorationReadComplete : function(id, o, args) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var windowId = args.complete[0];
<br> var actionBarElem = args.complete[1];
<br> var existingActionElem = null;
<br>@@ -345,9 +354,7 @@
<br> * @method onPortletRenderComplete
<br> */
<br> onPortletRenderComplete : function(id, o, args) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var id = id;
<br> var v = args.complete;
<br> var windowId = v.get("id");
<br>@@ -395,10 +402,7 @@
<br> * @method addPortlet
<br> */
<br> addPortlet : function(fragment) {
<br>- if (!JETUI_YUI || !JETUI_YUI.portalInstance)
<br>- return;
<br>-
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var templatePanel = Y.Node.one("#jsPortletTemplate");
<br> var v = templatePanel.cloneNode(true);
<br> v.setStyle('display', '');
<br>@@ -440,13 +444,6 @@
<br> });
<br>
<br> /**
<br>- * The portal singleton instance
<br>- */
<br>- if (JETUI_YUI && !JETUI_YUI.portalInstance) {
<br>- JETUI_YUI.portalInstance = new Y.JetUI.Portal(JETUI_YUI.config);
<br>- }
<br>-
<br>- /**
<br> * Create a portlet window to represent a portal window.
<br> *
<br> * @class JetUI.Portlet
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891280&r1=891279&r2=891280&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891280&r1=891279&r2=891280&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Wed Dec 16 15:58:53 2009
<br>@@ -4,7 +4,7 @@
<br> var config = JETUI_YUI.config;
<br> Y.log("Starting up JETUI " + config.engine + " engine...");
<br>
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br>
<br> ////////////////////////////////////////////////////
<br> // Create Navigator Portlet
<br>@@ -176,7 +176,7 @@
<br> });
<br>
<br> Y.DD.DDM.on('drag:drophit', function(e) {
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> var drop = e.drop.get('node'),
<br> drag = e.drag.get('node');
<br> if (drag.data.get("toolbar"))
<br>@@ -312,7 +312,7 @@
<br> });
<br>
<br> Y.DD.DDM.on('drag:over', function(e) {
<br>- var portal = JETUI_YUI.portalInstance;
<br>+ var portal = JETUI_YUI.getPortalInstance();
<br> if (portal.isMoving)
<br> return;
<br>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813518&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813518&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26813308
[jira] Commented: (JS2-749) Jetspeed Login Module fails to load on Windows in directories with spaces in the path
2009-12-16T07:47:18Z
2009-12-16T07:47:18Z
Jetspeed - Dev mailing list
<br> [ <a href="https://issues.apache.org/jira/browse/JS2-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12791413#action_12791413" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12791413#action_12791413</a> ]
<br><br>Frank Otto commented on JS2-749:
<br>--------------------------------
<br><br>I have the same problem with jetspeed 2.2.0.
<br><br>My tomcat folder is: C:\Programme\Tomcat Server\ and I get following error on jetspeed:
<br><br>java.lang.SecurityException: C:\Programme\Tomcat%20Server\work\Catalina\localhost\jetspeed\loader\login.conf (Das System kann den angegebenen Pfad nicht finden)
<br><br>I solved this by writing my own AuthenticationProvider with a workaround for jetspeeds BaseAuthenticationProvider:
<br><br>File file = new File(loginConfigUrl.toURI());
<br>...
<br>System.setProperty("java.security.auth.login.config", file.getAbsolutePath());
<br><br>Hope this helps...
<br><br><br>kind regards,
<br><br>F.O.
<br><div class='shrinkable-quote'><br>> Jetspeed Login Module fails to load on Windows in directories with spaces in the path
<br>> -------------------------------------------------------------------------------------
<br>>
<br>> Key: JS2-749
<br>> URL: <a href="https://issues.apache.org/jira/browse/JS2-749" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-749</a><br>> Project: Jetspeed 2
<br>> Issue Type: Bug
<br>> Components: Security
<br>> Affects Versions: 2.2.0
<br>> Environment: Windows
<br>> Reporter: David Sean Taylor
<br>> Assignee: Vivek Kumar
<br>> Priority: Minor
<br>> Fix For: 2.2.0
<br>>
<br>>
<br>> Jetspeed Login Module fails to load on Windows in directories with spaces in the path
<br>> It appears that we are breaking the Login Module on Windows when there are spaces in the path to the login module configuration file that Jetspeed provides, and is put into the work area of the application server. The problem is the Java class loader encodes the space, but then the file system does not understand the encoding (%20). If we do not encode the space, the file system correctly finds the resource. This change should be tested on all major file systems before committing.
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813308&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26813308&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26811976
svn commit: r891250 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-16T06:32:07Z
2009-12-16T06:32:07Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 14:32:06 2009
<br>New Revision: 891250
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891250&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891250&view=rev</a><br>Log:
<br>JS2-1057: Adding logic to use least used column to add a portlet fragment
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891250&r1=891249&r2=891250&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=891250&r1=891249&r2=891250&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Wed Dec 16 14:32:06 2009
<br>@@ -325,7 +325,8 @@
<br> var config = {
<br> on: { complete: onAddPortletComplete },
<br> method: "POST",
<br>- headers: { "X-Portal-Path" : "${portalPagePath}" }
<br>+ headers: { "X-Portal-Path" : "${portalPagePath}" },
<br>+ data: "minrowscol=true"
<br> };
<br> var request = Y.io(uri, config);
<br> }
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811976&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811976&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26811960
svn commit: r891249 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/ applications/jetspeed/src/main/webapp/jetui/engine/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/
2009-12-16T06:31:15Z
2009-12-16T06:31:15Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 14:31:14 2009
<br>New Revision: 891249
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891249&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891249&view=rev</a><br>Log:
<br>JS2-1057: Adding logic to use least used column to add a portlet fragment
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891249&r1=891248&r2=891249&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891249&r1=891248&r2=891249&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Wed Dec 16 14:31:14 2009
<br>@@ -126,7 +126,10 @@
<br> * @method initializer
<br> * @protected
<br> */
<br>- initializer : function(cfg) {
<br>+ initializer : function(cfg) {
<br>+ this.portalContextPath = cfg.portalContextPath;
<br>+ this.portalServletPath = cfg.portalServletPath;
<br>+ this.portalPagePath = cfg.portalPagePath;
<br> },
<br>
<br> /**
<br>@@ -437,6 +440,13 @@
<br> });
<br>
<br> /**
<br>+ * The portal singleton instance
<br>+ */
<br>+ if (JETUI_YUI && !JETUI_YUI.portalInstance) {
<br>+ JETUI_YUI.portalInstance = new Y.JetUI.Portal(JETUI_YUI.config);
<br>+ }
<br>+
<br>+ /**
<br> * Create a portlet window to represent a portal window.
<br> *
<br> * @class JetUI.Portlet
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891249&r1=891248&r2=891249&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=891249&r1=891248&r2=891249&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Wed Dec 16 14:31:14 2009
<br>@@ -4,14 +4,7 @@
<br> var config = JETUI_YUI.config;
<br> Y.log("Starting up JETUI " + config.engine + " engine...");
<br>
<br>- // initialize singleton portal instance
<br>- if (!JETUI_YUI.portalInstance) {
<br>- JETUI_YUI.portalInstance = new Y.JetUI.Portal();
<br>- }
<br> var portal = JETUI_YUI.portalInstance;
<br>- portal.portalContextPath = config.portalContextPath;
<br>- portal.portalServletPath = config.portalServletPath;
<br>- portal.portalPagePath = config.portalPagePath;
<br>
<br> ////////////////////////////////////////////////////
<br> // Create Navigator Portlet
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java?rev=891249&r1=891248&r2=891249&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java?rev=891249&r1=891248&r2=891249&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageLayoutService.java Wed Dec 16 14:31:14 2009
<br>@@ -25,6 +25,7 @@
<br> import javax.servlet.ServletContext;
<br> import javax.servlet.http.HttpServletRequest;
<br> import javax.ws.rs.DELETE;
<br>+import javax.ws.rs.FormParam;
<br> import javax.ws.rs.GET;
<br> import javax.ws.rs.POST;
<br> import javax.ws.rs.PUT;
<br>@@ -35,6 +36,7 @@
<br> import javax.ws.rs.core.Context;
<br> import javax.ws.rs.core.UriInfo;
<br>
<br>+import org.apache.commons.lang.BooleanUtils;
<br> import org.apache.commons.lang.StringUtils;
<br> import org.apache.commons.lang.math.NumberUtils;
<br> import org.apache.jetspeed.JetspeedActions;
<br>@@ -125,7 +127,10 @@
<br> public ContentFragmentBean addContentFragment(@Context HttpServletRequest servletRequest,
<br> @Context UriInfo uriInfo,
<br> @PathParam("type") String fragmentType,
<br>- @PathParam("name") String fragmentName)
<br>+ @PathParam("name") String fragmentName,
<br>+ @FormParam("row") String rowParam,
<br>+ @FormParam("col") String colParam,
<br>+ @FormParam("minrowscol") String minRowsColumnParam)
<br> {
<br> if (StringUtils.isBlank(fragmentType) || StringUtils.isBlank(fragmentName))
<br> {
<br>@@ -135,15 +140,49 @@
<br> RequestContext requestContext = (RequestContext) servletRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br> ContentPage contentPage = getContentPage(requestContext, JetspeedActions.EDIT);
<br>
<br>+ int row = NumberUtils.toInt(rowParam, -1);
<br>+ int col = NumberUtils.toInt(colParam, -1);
<br>+ boolean minRowsColumn = BooleanUtils.toBoolean(minRowsColumnParam);
<br>+
<br> try
<br> {
<br> ContentFragment contentFragment = pageLayoutComponent.addPortlet(contentPage, fragmentType, fragmentName);
<br>+ String addedContentFragmentId = contentFragment.getId();
<br>+
<br>+ boolean needToAdjustPositions = false;
<br>+
<br>+ ContentFragment layoutFragment = null;
<br>+ int columnCount = -1;
<br>
<br>- if (contentFragment.getLayoutColumn() == -1 || contentFragment.getLayoutRow() == -1)
<br>+ if (col == -1 && minRowsColumn)
<br> {
<br>- String addedContentFragmentId = contentFragment.getId();
<br>- ContentFragment layoutFragment = getParentFragment(pageLayoutComponent.getUnlockedRootFragment(contentPage), addedContentFragmentId);
<br>- int columnCount = getColumnCountOfLayoutFragment(layoutFragment);
<br>+ layoutFragment = getParentFragment(pageLayoutComponent.getUnlockedRootFragment(contentPage), addedContentFragmentId);
<br>+ columnCount = getColumnCountOfLayoutFragment(layoutFragment);
<br>+ col = getMinRowsColumnIndex(layoutFragment, columnCount);
<br>+ }
<br>+
<br>+ if (row != -1 || col != -1)
<br>+ {
<br>+ pageLayoutComponent.updateRowColumn(contentFragment, row, col);
<br>+ needToAdjustPositions = true;
<br>+ }
<br>+ else
<br>+ {
<br>+ needToAdjustPositions = (contentFragment.getLayoutColumn() == -1 || contentFragment.getLayoutRow() == -1);
<br>+ }
<br>+
<br>+ if (needToAdjustPositions)
<br>+ {
<br>+ if (layoutFragment == null)
<br>+ {
<br>+ layoutFragment = getParentFragment(pageLayoutComponent.getUnlockedRootFragment(contentPage), addedContentFragmentId);
<br>+ }
<br>+
<br>+ if (columnCount == -1)
<br>+ {
<br>+ columnCount = getColumnCountOfLayoutFragment(layoutFragment);
<br>+ }
<br>+
<br> adjustPositionsOfChildFragments(layoutFragment, columnCount);
<br> }
<br>
<br>@@ -407,6 +446,14 @@
<br> return new DecorationBean(decoration);
<br> }
<br>
<br>+ /**
<br>+ * Returns the content page of the current portal request context with security check.
<br>+ *
<br>+ * @param requestContext the portal request context
<br>+ * @param action the action to check the security against.
<br>+ * @return
<br>+ * @throws WebApplicationException
<br>+ */
<br> private ContentPage getContentPage(RequestContext requestContext, String action) throws WebApplicationException
<br> {
<br> try
<br>@@ -427,6 +474,12 @@
<br> }
<br> }
<br>
<br>+ /**
<br>+ * Returns the parent layout content fragment of the content fragment specified by the fragmentId.
<br>+ * @param contentFragment the seed content fragment where searching starts from.
<br>+ * @param fragmentId the fragment id of the content fragment, of which the parent fragment is looked for.
<br>+ * @return
<br>+ */
<br> private ContentFragment getParentFragment(ContentFragment contentFragment, String fragmentId)
<br> {
<br> for (ContentFragment child : (List<ContentFragment>) contentFragment.getFragments())
<br>@@ -449,6 +502,11 @@
<br> return null;
<br> }
<br>
<br>+ /**
<br>+ * Returns the column count of the layout content fragment based on the init parameters of the layout portlet.
<br>+ * @param layoutFragment
<br>+ * @return
<br>+ */
<br> private int getColumnCountOfLayoutFragment(ContentFragment layoutFragment)
<br> {
<br> int columnCount = 1;
<br>@@ -483,6 +541,12 @@
<br> return columnCount;
<br> }
<br>
<br>+ /**
<br>+ * Returns child content fragment set array ordered by the column index from the layout content fragment.
<br>+ * @param layoutFragment
<br>+ * @param columnCount
<br>+ * @return
<br>+ */
<br> private SortedSet<ContentFragment> [] getSortedChildFragmentSetArray(ContentFragment layoutFragment, int columnCount)
<br> {
<br> if (columnCount <= 0)
<br>@@ -513,6 +577,12 @@
<br> return fragmentSetArray;
<br> }
<br>
<br>+ /**
<br>+ * Adjusts the rows and cols of each content fragment contained in the layout fragment.
<br>+ * @param layoutFragment
<br>+ * @param columnCount the column count of the layout fragment.
<br>+ * @see #getColumnCountOfLayoutFragment(ContentFragment)
<br>+ */
<br> private void adjustPositionsOfChildFragments(ContentFragment layoutFragment, int columnCount)
<br> {
<br> SortedSet<ContentFragment> [] fragmentSetArray = getSortedChildFragmentSetArray(layoutFragment, columnCount);
<br>@@ -533,6 +603,31 @@
<br> }
<br> }
<br>
<br>+ private int getMinRowsColumnIndex(ContentFragment layoutFragment, int columnCount)
<br>+ {
<br>+ SortedSet<ContentFragment> [] fragmentSetArray = getSortedChildFragmentSetArray(layoutFragment, columnCount);
<br>+ int col = fragmentSetArray.length - 1;
<br>+
<br>+ int rowCount = fragmentSetArray[col].size();
<br>+
<br>+ for (int i = fragmentSetArray.length - 2; i >= 0; i--)
<br>+ {
<br>+ if (fragmentSetArray[i].size() < rowCount)
<br>+ {
<br>+ col = i;
<br>+ rowCount = fragmentSetArray[i].size();
<br>+ }
<br>+ }
<br>+
<br>+ return col;
<br>+ }
<br>+
<br>+ /**
<br>+ * ContentFragmentRowComparator
<br>+ * <P>
<br>+ * Comparator to compare content fragments by the row index in a column.
<br>+ * </P>
<br>+ */
<br> private static class ContentFragmentRowComparator implements Comparator<ContentFragment>
<br> {
<br> public int compare(ContentFragment f1, ContentFragment f2)
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811960&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811960&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26810061
svn commit: r891204 - /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
2009-12-16T04:01:26Z
2009-12-16T04:01:26Z
woonsan
Author: woonsan
<br>Date: Wed Dec 16 12:01:25 2009
<br>New Revision: 891204
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=891204&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=891204&view=rev</a><br>Log:
<br>JS2-1057: Fixing wrong column index problem when adding a portlet in /portal pipeline.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br><br>Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891204&r1=891203&r2=891204&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=891204&r1=891203&r2=891204&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original)
<br>+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Wed Dec 16 12:01:25 2009
<br>@@ -422,8 +422,14 @@
<br> groups: dropGroups
<br> });
<br> }
<br>- var columns = Y.Node.all(JetuiConfiguration.layoutStyle);
<br>- columns.item(parseInt(fragment.properties.column)).appendChild(v);
<br>+ var columns = [];
<br>+ Y.Node.all(JetuiConfiguration.layoutStyle).each(function(v, k) {
<br>+ var locked = v.getAttribute("locked");
<br>+ if (!locked || "false" == locked) {
<br>+ columns.push(v);
<br>+ }
<br>+ });
<br>+ columns[parseInt(fragment.properties.column)].appendChild(v);
<br>
<br> var uri = portal.portalContextPath + "/portlet" + portal.portalPagePath + "?entity=" + fragment.id;
<br> var request = Y.io(uri, { on: { complete: this.onPortletRenderComplete }, arguments: { complete: v } } );
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26810061&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26810061&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26808162
[jira] Created: (JS2-1090) Jetspeed 2.1 derby database becoming huge.
2009-12-16T01:02:18Z
2009-12-16T01:02:18Z
Jetspeed - Dev mailing list
Jetspeed 2.1 derby database becoming huge.
<br>------------------------------------------
<br><br> Key: JS2-1090
<br> URL: <a href="https://issues.apache.org/jira/browse/JS2-1090" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1090</a><br> Project: Jetspeed 2
<br> Issue Type: Task
<br> Affects Versions: 2.1.1-RC
<br> Environment: Windows 2003 SP2
<br> Reporter: Nishant Malviya
<br> Fix For: 2.1.1-RC
<br><br><br>The customer has 2 portlet applications. one with 36 portlets and the second one with only 1 portlet. The customer is complaining that there are a couple .dat files that are taking up a large amount of space:
<br><br> ...jetspeed\2.1\database\derby\productiondb\seg0:
<br><br>c3c0.dat (12.5 GB)
<br>c3d0.dat (8.78 GB)
<br><br>There are 283 other *.dat files in the same folder of much smaller size. Does this amount of space seem reasonable for the amount of deployed portlets? Is there any way to reduce this size?
<br><br><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26808162&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26808162&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>