You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2007/12/29 18:32:18 UTC
svn commit: r607450 [24/36] - in /portals/pluto/trunk: ./
assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ pluto-ant-tasks/
pluto-ant-tasks/src/assemble/ pluto-ant-tas...
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java Sat Dec 29 09:31:56 2007
@@ -1,55 +1,55 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.services.portal;
-
-import java.util.List;
-
-/**
- * Service interface defining methods necessary for
- * a provider wishing to manage page administration.
- *
- * @since Aug 10, 2005
- */
-public interface RenderConfigService extends DriverConfigurationService {
-
- /**
- * Retrieve an ordered list of all PageConfig instances.
- * @return list of all PageConfig instances.
- */
- List getPages();
-
- /**
- * Retrieve the PageConfig for the default
- * page.
- * @return PageConfig instance of the default page.
- */
- PageConfig getDefaultPage();
-
- /**
- * Retrieve the PageConfig for the given
- * page id.
- *
- * @param id
- * @return PageConfig instance for the specified id.
- */
- PageConfig getPage(String id);
-
- //added for page admin portlet
- public void addPage(PageConfig pageConfig);
- public void removePage(PageConfig pageConfig);
-
-}
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.services.portal;
+
+import java.util.List;
+
+/**
+ * Service interface defining methods necessary for
+ * a provider wishing to manage page administration.
+ *
+ * @since Aug 10, 2005
+ */
+public interface RenderConfigService extends DriverConfigurationService {
+
+ /**
+ * Retrieve an ordered list of all PageConfig instances.
+ * @return list of all PageConfig instances.
+ */
+ List getPages();
+
+ /**
+ * Retrieve the PageConfig for the default
+ * page.
+ * @return PageConfig instance of the default page.
+ */
+ PageConfig getDefaultPage();
+
+ /**
+ * Retrieve the PageConfig for the given
+ * page id.
+ *
+ * @param id
+ * @return PageConfig instance for the specified id.
+ */
+ PageConfig getPage(String id);
+
+ //added for page admin portlet
+ public void addPage(PageConfig pageConfig);
+ public void removePage(PageConfig pageConfig);
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java Sat Dec 29 09:31:56 2007
@@ -1,41 +1,41 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.services.portal.admin;
-
-import javax.servlet.ServletException;
-
-/**
- *
- * @version 1.0
- * @since Nov 23, 2005
- */
-public class DriverAdministrationException extends ServletException {
-
- public DriverAdministrationException(String string) {
- super(string);
- }
-
- public DriverAdministrationException(String string, Throwable throwable) {
- super(string, throwable);
- }
-
- public DriverAdministrationException(Throwable cause) {
- super(cause);
- }
-
-
-}
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.services.portal.admin;
+
+import javax.servlet.ServletException;
+
+/**
+ *
+ * @version 1.0
+ * @since Nov 23, 2005
+ */
+public class DriverAdministrationException extends ServletException {
+
+ public DriverAdministrationException(String string) {
+ super(string);
+ }
+
+ public DriverAdministrationException(String string, Throwable throwable) {
+ super(string, throwable);
+ }
+
+ public DriverAdministrationException(Throwable cause) {
+ super(cause);
+ }
+
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java Sat Dec 29 09:31:56 2007
@@ -1,29 +1,29 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.services.portal.admin;
-
-/**
- *
- * @version 1.0
- * @since Nov 30, 2005
- */
-public interface PortletRegistryAdminService {
-
- public void addPortletApplication(String portletContext)
- throws DriverAdministrationException;
-
-}
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.services.portal.admin;
+
+/**
+ *
+ * @version 1.0
+ * @since Nov 30, 2005
+ */
+public interface PortletRegistryAdminService {
+
+ public void addPortletApplication(String portletContext)
+ throws DriverAdministrationException;
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java Sat Dec 29 09:31:56 2007
@@ -1,36 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.services.portal.admin;
-
-import org.apache.pluto.driver.services.portal.PageConfig;
-import org.apache.pluto.driver.config.DriverConfigurationException;
-
-/**
- *
- *
- * @version 1.0
- * @since Nov 30, 2005
- */
-public interface RenderConfigAdminService {
-
- public void addPage(PageConfig config)
- throws DriverConfigurationException;
-
- public void removePage(PageConfig config)
- throws DriverConfigurationException;
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.services.portal.admin;
+
+import org.apache.pluto.driver.services.portal.PageConfig;
+import org.apache.pluto.driver.config.DriverConfigurationException;
+
+/**
+ *
+ *
+ * @version 1.0
+ * @since Nov 30, 2005
+ */
+public interface RenderConfigAdminService {
+
+ public void addPage(PageConfig config)
+ throws DriverConfigurationException;
+
+ public void removePage(PageConfig config)
+ throws DriverConfigurationException;
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/IsMaximizedTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java Sat Dec 29 09:31:56 2007
@@ -1,122 +1,122 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.tags;
-
-import java.io.IOException;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.driver.core.PortalRequestContext;
-
-/**
- * The portlet URL tag is used to generate portal URL pointing to the current
- * portlet with specified portlet mode and window state.
- *
- * @version 1.0
- * @since Oct 4, 2004
- */
-public class PortletPortalURLTag extends BodyTagSupport {
-
- // Private Member Variables ------------------------------------------------
-
- /** The window state to be encoded in the portal URL. */
- private String windowState;
-
- /** The portlet mode to be encoded in the portal URL. */
- private String portletMode;
-
-
- // Tag Attribute Accessors -------------------------------------------------
-
- public String getWindowState() {
- return windowState;
- }
-
- public void setWindowState(String windowState) {
- this.windowState = windowState;
- }
-
- public String getPortletMode() {
- return portletMode;
- }
-
- public void setPortletMode(String portletMode) {
- this.portletMode = portletMode;
- }
-
-
- // BodyTagSupport Impl -----------------------------------------------------
-
- /**
- * Creates the portal URL pointing to the current portlet with specified
- * portlet mode and window state, and print the URL to the page.
- * @see PortletTag
- */
- public int doStartTag() throws JspException {
-
- // Ensure that the portlet render tag resides within a portlet tag.
- PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
- this, PortletTag.class);
- if (parentTag == null) {
- throw new JspException("Portlet window controls may only reside "
- + "within a pluto:portlet tag.");
- }
-
- // Create portal URL.
- HttpServletRequest request = (HttpServletRequest)
- pageContext.getRequest();
-
- HttpServletResponse response = (HttpServletResponse)
- pageContext.getResponse();
-
- PortalRequestContext ctx = (PortalRequestContext)
- request.getAttribute(PortalRequestContext.REQUEST_KEY);
-
- PortalURL portalUrl = ctx.createPortalURL();
-
- // Encode window state of the current portlet in the portal URL.
- String portletId = parentTag.getEvaluatedPortletId();
- if (windowState != null) {
- portalUrl.setWindowState(portletId, new WindowState(windowState));
- }
-
- // Encode portlet mode of the current portlet in the portal URL.
- if (portletMode != null) {
- portalUrl.setPortletMode(portletId, new PortletMode(portletMode));
- }
-
- // Print the portal URL as a string to the page.
- try {
- pageContext.getOut().print(response.encodeURL(portalUrl.toString()));
- } catch (IOException ex) {
- throw new JspException(ex);
- }
-
- // Skip the tag body.
- return SKIP_BODY;
- }
-
-
-}
-
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.tags;
+
+import java.io.IOException;
+
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.core.PortalRequestContext;
+
+/**
+ * The portlet URL tag is used to generate portal URL pointing to the current
+ * portlet with specified portlet mode and window state.
+ *
+ * @version 1.0
+ * @since Oct 4, 2004
+ */
+public class PortletPortalURLTag extends BodyTagSupport {
+
+ // Private Member Variables ------------------------------------------------
+
+ /** The window state to be encoded in the portal URL. */
+ private String windowState;
+
+ /** The portlet mode to be encoded in the portal URL. */
+ private String portletMode;
+
+
+ // Tag Attribute Accessors -------------------------------------------------
+
+ public String getWindowState() {
+ return windowState;
+ }
+
+ public void setWindowState(String windowState) {
+ this.windowState = windowState;
+ }
+
+ public String getPortletMode() {
+ return portletMode;
+ }
+
+ public void setPortletMode(String portletMode) {
+ this.portletMode = portletMode;
+ }
+
+
+ // BodyTagSupport Impl -----------------------------------------------------
+
+ /**
+ * Creates the portal URL pointing to the current portlet with specified
+ * portlet mode and window state, and print the URL to the page.
+ * @see PortletTag
+ */
+ public int doStartTag() throws JspException {
+
+ // Ensure that the portlet render tag resides within a portlet tag.
+ PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
+ this, PortletTag.class);
+ if (parentTag == null) {
+ throw new JspException("Portlet window controls may only reside "
+ + "within a pluto:portlet tag.");
+ }
+
+ // Create portal URL.
+ HttpServletRequest request = (HttpServletRequest)
+ pageContext.getRequest();
+
+ HttpServletResponse response = (HttpServletResponse)
+ pageContext.getResponse();
+
+ PortalRequestContext ctx = (PortalRequestContext)
+ request.getAttribute(PortalRequestContext.REQUEST_KEY);
+
+ PortalURL portalUrl = ctx.createPortalURL();
+
+ // Encode window state of the current portlet in the portal URL.
+ String portletId = parentTag.getEvaluatedPortletId();
+ if (windowState != null) {
+ portalUrl.setWindowState(portletId, new WindowState(windowState));
+ }
+
+ // Encode portlet mode of the current portlet in the portal URL.
+ if (portletMode != null) {
+ portalUrl.setPortletMode(portletId, new PortletMode(portletMode));
+ }
+
+ // Print the portal URL as a string to the page.
+ try {
+ pageContext.getOut().print(response.encodeURL(portalUrl.toString()));
+ } catch (IOException ex) {
+ throw new JspException(ex);
+ }
+
+ // Skip the tag body.
+ return SKIP_BODY;
+ }
+
+
+}
+
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java Sat Dec 29 09:31:56 2007
@@ -1,79 +1,79 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.tags;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-/**
- * The portlet render tag is used to print portlet rendering result (or error
- * details) to the page.
- *
- * @version 1.0
- * @since Oct 4, 2004
- */
-public class PortletRenderTag extends TagSupport {
-
- // TagSupport Impl ---------------------------------------------------------
-
- /**
- *
- * @see PortletTag
- */
- public int doEndTag() throws JspException {
-
- // Ensure that the portlet render tag resides within a portlet tag.
- PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
- this, PortletTag.class);
- if (parentTag == null) {
- throw new JspException("Portlet render tag may only reside "
- + "within a pluto:portlet tag.");
- }
-
- // If the portlet is rendered successfully, print the rendering result.
- if (parentTag.getStatus() == PortletTag.SUCCESS) {
- try {
- StringBuffer buffer = parentTag.getPortalServletResponse()
- .getInternalBuffer().getBuffer();
- pageContext.getOut().print(buffer.toString());
- } catch (IOException ex) {
- throw new JspException(ex);
- }
- }
- // Otherwise, print the error stack trace.
- else {
- try {
- pageContext.getOut().print("Error rendering portlet.");
- pageContext.getOut().print("<pre>");
- parentTag.getThrowable().printStackTrace(
- new PrintWriter(pageContext.getOut()));
- pageContext.getOut().print("</pre>");
- } catch (IOException ex) {
- throw new JspException(ex);
- }
- }
-
- // Return.
- return SKIP_BODY;
- }
-
-
-}
-
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.tags;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+/**
+ * The portlet render tag is used to print portlet rendering result (or error
+ * details) to the page.
+ *
+ * @version 1.0
+ * @since Oct 4, 2004
+ */
+public class PortletRenderTag extends TagSupport {
+
+ // TagSupport Impl ---------------------------------------------------------
+
+ /**
+ *
+ * @see PortletTag
+ */
+ public int doEndTag() throws JspException {
+
+ // Ensure that the portlet render tag resides within a portlet tag.
+ PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
+ this, PortletTag.class);
+ if (parentTag == null) {
+ throw new JspException("Portlet render tag may only reside "
+ + "within a pluto:portlet tag.");
+ }
+
+ // If the portlet is rendered successfully, print the rendering result.
+ if (parentTag.getStatus() == PortletTag.SUCCESS) {
+ try {
+ StringBuffer buffer = parentTag.getPortalServletResponse()
+ .getInternalBuffer().getBuffer();
+ pageContext.getOut().print(buffer.toString());
+ } catch (IOException ex) {
+ throw new JspException(ex);
+ }
+ }
+ // Otherwise, print the error stack trace.
+ else {
+ try {
+ pageContext.getOut().print("Error rendering portlet.");
+ pageContext.getOut().print("<pre>");
+ parentTag.getThrowable().printStackTrace(
+ new PrintWriter(pageContext.getOut()));
+ pageContext.getOut().print("</pre>");
+ } catch (IOException ex) {
+ throw new JspException(ex);
+ }
+ }
+
+ // Return.
+ return SKIP_BODY;
+ }
+
+
+}
+
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java Sat Dec 29 09:31:56 2007
@@ -1,218 +1,218 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.tags;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.WindowState;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.tags.el.ExpressionEvaluatorProxy;
-import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.driver.core.PortalRequestContext;
-import org.apache.pluto.driver.core.PortalServletRequest;
-import org.apache.pluto.driver.core.PortalServletResponse;
-import org.apache.pluto.driver.core.PortletWindowImpl;
-import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
-
-/**
- * The portlet tag is used to render a portlet specified by the portlet ID.
- *
- * @see javax.portlet.Portlet#render(javax.portlet.RenderRequest,javax.portlet.RenderResponse)
- * @see org.apache.pluto.PortletContainer#doRender(PortletWindow, HttpServletRequest, HttpServletResponse)
- *
- */
-public class PortletTag extends BodyTagSupport {
-
- /** Logger. */
- private static final Log LOG = LogFactory.getLog(PortletTag.class);
-
- /** Status constant for failed rendering. */
- public static final int FAILED = 0;
-
- /** Status constant for successful rendering. */
- public static final int SUCCESS = 1;
-
-
- // Private Member Variables ------------------------------------------------
-
- /** The portlet ID attribute passed into this tag. */
- private String portletId;
-
- /** The evaluated value of the portlet ID attribute. */
- private String evaluatedPortletId;
-
- /** The cached portal servlet response holding rendering result. */
- private PortalServletResponse response;
-
- /** The cached rendering status: SUCCESS or FAILED. */
- private int status;
-
- /** The cached Throwable instance when fail to render the portlet. */
- private Throwable throwable;
-
-
- // Tag Attribute Accessors -------------------------------------------------
-
- /**
- * Returns the portlet ID attribute.
- * @return the portlet ID attribute.
- */
- public String getPortletId() {
- return portletId;
- }
-
- /**
- * Sets the portlet ID attribute.
- * @param portletId the portlet ID attribute.
- */
- public void setPortletId(String portletId) {
- this.portletId = portletId;
- }
-
-
- // BodyTagSupport Impl -----------------------------------------------------
-
- /**
- * Method invoked when the start tag is encountered.
- * @throws JspException if an error occurs.
- */
- public int doStartTag() throws JspException {
-
- // Evaluate portlet ID attribute.
- evaluatePortletId();
-
- // Retrieve the portlet window config for the evaluated portlet ID.
- ServletContext servletContext = pageContext.getServletContext();
-
- PortletWindowConfig windowConfig =
- PortletWindowConfig.fromId(evaluatedPortletId);
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Rendering Portlet Window: " + windowConfig);
- }
-
- // Retrieve the current portal URL.
- PortalRequestContext portalEnv = PortalRequestContext.getContext(
- (HttpServletRequest) pageContext.getRequest());
- PortalURL portalURL = portalEnv.getRequestedPortalURL();
-
- // Create the portlet window to render.
- PortletWindow window = new PortletWindowImpl(windowConfig, portalURL);
-
- // Check if someone else is maximized. If yes, don't show content.
- Map windowStates = portalURL.getWindowStates();
- for (Iterator it = windowStates.keySet().iterator(); it.hasNext(); ) {
- String windowId = (String) it.next();
- WindowState windowState = (WindowState) windowStates.get(windowId);
- if (WindowState.MAXIMIZED.equals(windowState)
- && !window.getId().getStringId().equals(windowId)) {
- return SKIP_BODY;
- }
- }
-
- // Create portal servlet request and response to wrap the original
- // HTTP servlet request and response.
- PortalServletRequest portalRequest = new PortalServletRequest(
- (HttpServletRequest) pageContext.getRequest(), window);
- PortalServletResponse portalResponse = new PortalServletResponse(
- (HttpServletResponse) pageContext.getResponse());
-
- // Retrieve the portlet container from servlet context.
- PortletContainer container = (PortletContainer)
- servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
-
- // Render the portlet and cache the response.
- try {
- container.doRender(window, portalRequest, portalResponse);
- response = portalResponse;
- status = SUCCESS;
- } catch (Throwable th) {
- status = FAILED;
- throwable = th;
- }
-
- // Continue to evaluate the tag body.
- return EVAL_BODY_INCLUDE;
- }
-
-
- // Package Methods ---------------------------------------------------------
-
- /**
- * Returns the rendering status.
- * @return the rendering status.
- */
- int getStatus() {
- return status;
- }
-
- /**
- * Returns the portal servlet response holding rendering result.
- * @return the portal servlet response holding rendering result.
- */
- PortalServletResponse getPortalServletResponse() {
- return response;
- }
-
- /**
- * Returns the error that has occurred when rendering portlet.
- * @return the error that has occurred when rendering portlet.
- */
- Throwable getThrowable() {
- return throwable;
- }
-
- /**
- * Returns the evaluated portlet ID.
- * @return the evaluated portlet ID.
- */
- String getEvaluatedPortletId() {
- return evaluatedPortletId;
- }
-
-
-
- // Private Methods ---------------------------------------------------------
-
- /**
- * Evaluates the portlet ID attribute passed into this tag. This method
- * evaluates the member variable <code>portletId</code> and saves the
- * evaluated result to <code>evaluatedPortletId</code>
- * @throws JspException if an error occurs.
- */
- private void evaluatePortletId() throws JspException {
- ExpressionEvaluatorProxy proxy = ExpressionEvaluatorProxy.getProxy();
- Object obj = proxy.evaluate(portletId, pageContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Evaluated portletId to: " + obj);
- }
- evaluatedPortletId = (String) obj;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.tags;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.portlet.WindowState;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.tags.el.ExpressionEvaluatorProxy;
+import org.apache.pluto.driver.AttributeKeys;
+import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.core.PortalRequestContext;
+import org.apache.pluto.driver.core.PortalServletRequest;
+import org.apache.pluto.driver.core.PortalServletResponse;
+import org.apache.pluto.driver.core.PortletWindowImpl;
+import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
+
+/**
+ * The portlet tag is used to render a portlet specified by the portlet ID.
+ *
+ * @see javax.portlet.Portlet#render(javax.portlet.RenderRequest,javax.portlet.RenderResponse)
+ * @see org.apache.pluto.PortletContainer#doRender(PortletWindow, HttpServletRequest, HttpServletResponse)
+ *
+ */
+public class PortletTag extends BodyTagSupport {
+
+ /** Logger. */
+ private static final Log LOG = LogFactory.getLog(PortletTag.class);
+
+ /** Status constant for failed rendering. */
+ public static final int FAILED = 0;
+
+ /** Status constant for successful rendering. */
+ public static final int SUCCESS = 1;
+
+
+ // Private Member Variables ------------------------------------------------
+
+ /** The portlet ID attribute passed into this tag. */
+ private String portletId;
+
+ /** The evaluated value of the portlet ID attribute. */
+ private String evaluatedPortletId;
+
+ /** The cached portal servlet response holding rendering result. */
+ private PortalServletResponse response;
+
+ /** The cached rendering status: SUCCESS or FAILED. */
+ private int status;
+
+ /** The cached Throwable instance when fail to render the portlet. */
+ private Throwable throwable;
+
+
+ // Tag Attribute Accessors -------------------------------------------------
+
+ /**
+ * Returns the portlet ID attribute.
+ * @return the portlet ID attribute.
+ */
+ public String getPortletId() {
+ return portletId;
+ }
+
+ /**
+ * Sets the portlet ID attribute.
+ * @param portletId the portlet ID attribute.
+ */
+ public void setPortletId(String portletId) {
+ this.portletId = portletId;
+ }
+
+
+ // BodyTagSupport Impl -----------------------------------------------------
+
+ /**
+ * Method invoked when the start tag is encountered.
+ * @throws JspException if an error occurs.
+ */
+ public int doStartTag() throws JspException {
+
+ // Evaluate portlet ID attribute.
+ evaluatePortletId();
+
+ // Retrieve the portlet window config for the evaluated portlet ID.
+ ServletContext servletContext = pageContext.getServletContext();
+
+ PortletWindowConfig windowConfig =
+ PortletWindowConfig.fromId(evaluatedPortletId);
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Rendering Portlet Window: " + windowConfig);
+ }
+
+ // Retrieve the current portal URL.
+ PortalRequestContext portalEnv = PortalRequestContext.getContext(
+ (HttpServletRequest) pageContext.getRequest());
+ PortalURL portalURL = portalEnv.getRequestedPortalURL();
+
+ // Create the portlet window to render.
+ PortletWindow window = new PortletWindowImpl(windowConfig, portalURL);
+
+ // Check if someone else is maximized. If yes, don't show content.
+ Map windowStates = portalURL.getWindowStates();
+ for (Iterator it = windowStates.keySet().iterator(); it.hasNext(); ) {
+ String windowId = (String) it.next();
+ WindowState windowState = (WindowState) windowStates.get(windowId);
+ if (WindowState.MAXIMIZED.equals(windowState)
+ && !window.getId().getStringId().equals(windowId)) {
+ return SKIP_BODY;
+ }
+ }
+
+ // Create portal servlet request and response to wrap the original
+ // HTTP servlet request and response.
+ PortalServletRequest portalRequest = new PortalServletRequest(
+ (HttpServletRequest) pageContext.getRequest(), window);
+ PortalServletResponse portalResponse = new PortalServletResponse(
+ (HttpServletResponse) pageContext.getResponse());
+
+ // Retrieve the portlet container from servlet context.
+ PortletContainer container = (PortletContainer)
+ servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
+
+ // Render the portlet and cache the response.
+ try {
+ container.doRender(window, portalRequest, portalResponse);
+ response = portalResponse;
+ status = SUCCESS;
+ } catch (Throwable th) {
+ status = FAILED;
+ throwable = th;
+ }
+
+ // Continue to evaluate the tag body.
+ return EVAL_BODY_INCLUDE;
+ }
+
+
+ // Package Methods ---------------------------------------------------------
+
+ /**
+ * Returns the rendering status.
+ * @return the rendering status.
+ */
+ int getStatus() {
+ return status;
+ }
+
+ /**
+ * Returns the portal servlet response holding rendering result.
+ * @return the portal servlet response holding rendering result.
+ */
+ PortalServletResponse getPortalServletResponse() {
+ return response;
+ }
+
+ /**
+ * Returns the error that has occurred when rendering portlet.
+ * @return the error that has occurred when rendering portlet.
+ */
+ Throwable getThrowable() {
+ return throwable;
+ }
+
+ /**
+ * Returns the evaluated portlet ID.
+ * @return the evaluated portlet ID.
+ */
+ String getEvaluatedPortletId() {
+ return evaluatedPortletId;
+ }
+
+
+
+ // Private Methods ---------------------------------------------------------
+
+ /**
+ * Evaluates the portlet ID attribute passed into this tag. This method
+ * evaluates the member variable <code>portletId</code> and saves the
+ * evaluated result to <code>evaluatedPortletId</code>
+ * @throws JspException if an error occurs.
+ */
+ private void evaluatePortletId() throws JspException {
+ ExpressionEvaluatorProxy proxy = ExpressionEvaluatorProxy.getProxy();
+ Object obj = proxy.evaluate(portletId, pageContext);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Evaluated portletId to: " + obj);
+ }
+ evaluatedPortletId = (String) obj;
+ }
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java Sat Dec 29 09:31:56 2007
@@ -1,66 +1,66 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.tags;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.AttributeKeys;
-
-/**
- * The portlet title tag is used to print the dynamic portlet title to the page.
- * @version 1.0
- * @since Oct 4, 2004
- */
-public class PortletTitleTag extends TagSupport {
-
- // TagSupport Impl ---------------------------------------------------------
-
- /**
- * Method invoked when the start tag is encountered. This method retrieves
- * the portlet title and print it to the page.
- *
- * @see org.apache.pluto.services.PortalCallbackService#setTitle(HttpServletRequest, PortletWindow, String)
- * @see org.apache.pluto.driver.services.container.PortalCallbackServiceImpl#setTitle(HttpServletRequest, PortletWindow, String)
- *
- * @throws JspException
- */
- public int doStartTag() throws JspException {
-
- // Ensure that the portlet title tag resides within a portlet tag.
- PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
- this, PortletTag.class);
- if (parentTag == null) {
- throw new JspException("Portlet title tag may only reside "
- + "within a pluto:portlet tag.");
- }
-
- // Print out the portlet title to page.
- try {
- pageContext.getOut().print(pageContext.getRequest().getAttribute(
- AttributeKeys.PORTLET_TITLE));
- } catch (IOException ex) {
- throw new JspException(ex);
- }
- return SKIP_BODY;
- }
-}
-
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.tags;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.driver.AttributeKeys;
+
+/**
+ * The portlet title tag is used to print the dynamic portlet title to the page.
+ * @version 1.0
+ * @since Oct 4, 2004
+ */
+public class PortletTitleTag extends TagSupport {
+
+ // TagSupport Impl ---------------------------------------------------------
+
+ /**
+ * Method invoked when the start tag is encountered. This method retrieves
+ * the portlet title and print it to the page.
+ *
+ * @see org.apache.pluto.services.PortalCallbackService#setTitle(HttpServletRequest, PortletWindow, String)
+ * @see org.apache.pluto.driver.services.container.PortalCallbackServiceImpl#setTitle(HttpServletRequest, PortletWindow, String)
+ *
+ * @throws JspException
+ */
+ public int doStartTag() throws JspException {
+
+ // Ensure that the portlet title tag resides within a portlet tag.
+ PortletTag parentTag = (PortletTag) TagSupport.findAncestorWithClass(
+ this, PortletTag.class);
+ if (parentTag == null) {
+ throw new JspException("Portlet title tag may only reside "
+ + "within a pluto:portlet tag.");
+ }
+
+ // Print out the portlet title to page.
+ try {
+ pageContext.getOut().print(pageContext.getRequest().getAttribute(
+ AttributeKeys.PORTLET_TITLE));
+ } catch (IOException ex) {
+ throw new JspException(ex);
+ }
+ return SKIP_BODY;
+ }
+}
+
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java Sat Dec 29 09:31:56 2007
@@ -1,64 +1,64 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.url;
-
-/**
- * The portal URL parameter.
- * @version 1.0
- * @since Sep 30, 2004
- */
-public class PortalURLParameter {
-
-
- private String window;
- private String name;
- private String[] values;
-
- public PortalURLParameter(String window, String name, String value) {
- this.window = window;
- this.name = name;
- this.values = new String[]{value};
- }
-
- public PortalURLParameter(String window, String name, String[] values) {
- this.window = window;
- this.name = name;
- this.values = values;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String[] getValues() {
- return values;
- }
-
- public void setValues(String[] values) {
- this.values = values;
- }
-
- public String getWindowId() {
- return window;
- }
-
-}
-
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.url;
+
+/**
+ * The portal URL parameter.
+ * @version 1.0
+ * @since Sep 30, 2004
+ */
+public class PortalURLParameter {
+
+
+ private String window;
+ private String name;
+ private String[] values;
+
+ public PortalURLParameter(String window, String name, String value) {
+ this.window = window;
+ this.name = name;
+ this.values = new String[]{value};
+ }
+
+ public PortalURLParameter(String window, String name, String[] values) {
+ this.window = window;
+ this.name = name;
+ this.values = values;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String[] getValues() {
+ return values;
+ }
+
+ public void setValues(String[] values) {
+ this.values = values;
+ }
+
+ public String getWindowId() {
+ return window;
+ }
+
+}
+
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Sat Dec 29 09:31:56 2007
@@ -1,73 +1,73 @@
-<?xml version="1.0"?>
-<!--
+<?xml version="1.0"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
- elementFormDefault="qualified">
-
- <xs:element name="pluto-portal-driver">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="portal-name" type="xs:string"
- default="pluto-portal-driver" />
- <xs:element name="portal-version" type="xs:string" />
- <xs:element name="container-name" type="xs:string" />
-
- <xs:element name="supports">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="portlet-mode"
- type="xs:string" minOccurs="1" maxOccurs="unbounded" />
- <xs:element name="window-state"
- type="xs:string" minOccurs="1" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="render-config">
- <xs:complexType>
-
- <xs:sequence>
- <xs:element name="page" minOccurs="1"
- maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="portlet"
- minOccurs="1" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute
- name="context" type="xs:string" />
- <xs:attribute
- name="name" type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name"
- type="xs:string" />
- <xs:attribute name="uri"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="default" type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="version" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
-
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
+ elementFormDefault="qualified">
+
+ <xs:element name="pluto-portal-driver">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string"
+ default="pluto-portal-driver" />
+ <xs:element name="portal-version" type="xs:string" />
+ <xs:element name="container-name" type="xs:string" />
+
+ <xs:element name="supports">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="portlet-mode"
+ type="xs:string" minOccurs="1" maxOccurs="unbounded" />
+ <xs:element name="window-state"
+ type="xs:string" minOccurs="1" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="render-config">
+ <xs:complexType>
+
+ <xs:sequence>
+ <xs:element name="page" minOccurs="1"
+ maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="portlet"
+ minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute
+ name="context" type="xs:string" />
+ <xs:attribute
+ name="name" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name"
+ type="xs:string" />
+ <xs:attribute name="uri"
+ type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="default" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="version" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
</xs:schema>
Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/portlets/PageAdminPortletTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/portlets/PageAdminPortletTest.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/portlets/PageAdminPortletTest.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/portlets/PageAdminPortletTest.java Sat Dec 29 09:31:56 2007
@@ -1,25 +1,25 @@
-package org.apache.pluto.driver.portlets;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.pluto.driver.portlets.PageAdminPortlet;
-
-public class PageAdminPortletTest extends TestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testParseDefaultPage() {
- final String strConfig = "<render-config default=\"Test Page\">";
- String defaultPage = PageAdminPortlet.parseDefaultPage(strConfig);
-// System.out.println("Default page: " + defaultPage);
- assertEquals(defaultPage, "Test Page");
- }
-}
+package org.apache.pluto.driver.portlets;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.pluto.driver.portlets.PageAdminPortlet;
+
+public class PageAdminPortletTest extends TestCase {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testParseDefaultPage() {
+ final String strConfig = "<render-config default=\"Test Page\">";
+ String defaultPage = PageAdminPortlet.parseDefaultPage(strConfig);
+// System.out.println("Default page: " + defaultPage);
+ assertEquals(defaultPage, "Test Page");
+ }
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/portlets/PageAdminPortletTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java Sat Dec 29 09:31:56 2007
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pluto.driver.services.portal;
-
-import junit.framework.TestCase;
-
-/**
- *
- * @version 1.0
- * @since Dec 1, 2005
- */
-public class PortletWindowConfigTest extends TestCase {
-
- public void testCreatePortletId() {
- assertEquals("context.PortletName!", PortletWindowConfig.createPortletId("context", "PortletName", ""));
- assertEquals("c.PortletName!1234567", PortletWindowConfig.createPortletId("c", "PortletName", "1234567"));
- assertEquals("context.P!", PortletWindowConfig.createPortletId("context", "P", ""));
- assertEquals("c.P!", PortletWindowConfig.createPortletId("c", "P", ""));
- }
-
- public void testParsePortletName() {
- assertEquals("PortletName", PortletWindowConfig.parsePortletName("context.PortletName!1234567"));
- assertEquals("PortletName", PortletWindowConfig.parsePortletName("c.PortletName!1234567"));
- assertEquals("P", PortletWindowConfig.parsePortletName("context.P!"));
- assertEquals("P", PortletWindowConfig.parsePortletName("c.P!ABC"));
- assertEquals("PortletName", PortletWindowConfig.parsePortletName("context.PortletName"));
- }
-
- public void testParseContextPath() {
- assertEquals("context", PortletWindowConfig.parseContextPath("context.PortletName!aasdf"));
- assertEquals("c", PortletWindowConfig.parseContextPath("c.PortletName!1234"));
- assertEquals("context", PortletWindowConfig.parseContextPath("context.P"));
- assertEquals("c", PortletWindowConfig.parseContextPath("c.P"));
- }
-
- public void testParseMetaInfo() {
- assertEquals("A", PortletWindowConfig.parseMetaInfo("c.p!A"));
- assertEquals("", PortletWindowConfig.parseMetaInfo("c.p"));
- }
-
- public void testParseInvalidId() {
- testParseInvalid(".NoContext");
- testParseInvalid("Use/Slash");
- testParseInvalid("NoPortlet.");
- }
-
- private void testParseInvalid(String id) {
- try {
- PortletWindowConfig.parseContextPath(id);
- fail("Exception should have been thrown.");
- }
- catch(IllegalArgumentException iae) {
-
- }
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.driver.services.portal;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @version 1.0
+ * @since Dec 1, 2005
+ */
+public class PortletWindowConfigTest extends TestCase {
+
+ public void testCreatePortletId() {
+ assertEquals("context.PortletName!", PortletWindowConfig.createPortletId("context", "PortletName", ""));
+ assertEquals("c.PortletName!1234567", PortletWindowConfig.createPortletId("c", "PortletName", "1234567"));
+ assertEquals("context.P!", PortletWindowConfig.createPortletId("context", "P", ""));
+ assertEquals("c.P!", PortletWindowConfig.createPortletId("c", "P", ""));
+ }
+
+ public void testParsePortletName() {
+ assertEquals("PortletName", PortletWindowConfig.parsePortletName("context.PortletName!1234567"));
+ assertEquals("PortletName", PortletWindowConfig.parsePortletName("c.PortletName!1234567"));
+ assertEquals("P", PortletWindowConfig.parsePortletName("context.P!"));
+ assertEquals("P", PortletWindowConfig.parsePortletName("c.P!ABC"));
+ assertEquals("PortletName", PortletWindowConfig.parsePortletName("context.PortletName"));
+ }
+
+ public void testParseContextPath() {
+ assertEquals("context", PortletWindowConfig.parseContextPath("context.PortletName!aasdf"));
+ assertEquals("c", PortletWindowConfig.parseContextPath("c.PortletName!1234"));
+ assertEquals("context", PortletWindowConfig.parseContextPath("context.P"));
+ assertEquals("c", PortletWindowConfig.parseContextPath("c.P"));
+ }
+
+ public void testParseMetaInfo() {
+ assertEquals("A", PortletWindowConfig.parseMetaInfo("c.p!A"));
+ assertEquals("", PortletWindowConfig.parseMetaInfo("c.p"));
+ }
+
+ public void testParseInvalidId() {
+ testParseInvalid(".NoContext");
+ testParseInvalid("Use/Slash");
+ testParseInvalid("NoPortlet.");
+ }
+
+ private void testParseInvalid(String id) {
+ try {
+ PortletWindowConfig.parseContextPath(id);
+ fail("Exception should have been thrown.");
+ }
+ catch(IllegalArgumentException iae) {
+
+ }
+ }
+
+}
Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/assemble/bin.xml?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/assemble/bin.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/assemble/bin.xml Sat Dec 29 09:31:56 2007
@@ -1,57 +1,57 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
-To manually build this distribution:
- 1. Download Tomcat 5.5.9 and unpack it into the root drive of your machine.
- 2. Add pluto user in pluto role to Tomcat's conf/tomcat-users.xml
- 3. Add emptySessionPath="true" to Tomcat's conf/server.xml.
- 4. Run mvn clean followed by mvn install from the root dir.
- 5. Run mvn pluto:install -DinstallDir=/jakarta-tomcat-5.5.9 from the root dir.
- 6. Run mvn site:site to build web site from the pluto-portal dir.
- 7. Run mvn assembly:assembly from the pluto-portal dir to create the archives.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>target/tomcat</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>../pluto-site/target/site</directory>
- <outputDirectory>webapps/ROOT</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- </dependencySets>
-</assembly>
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+To manually build this distribution:
+ 1. Download Tomcat 5.5.9 and unpack it into the root drive of your machine.
+ 2. Add pluto user in pluto role to Tomcat's conf/tomcat-users.xml
+ 3. Add emptySessionPath="true" to Tomcat's conf/server.xml.
+ 4. Run mvn clean followed by mvn install from the root dir.
+ 5. Run mvn pluto:install -DinstallDir=/jakarta-tomcat-5.5.9 from the root dir.
+ 6. Run mvn site:site to build web site from the pluto-portal dir.
+ 7. Run mvn assembly:assembly from the pluto-portal dir to create the archives.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/tomcat</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../pluto-site/target/site</directory>
+ <outputDirectory>webapps/ROOT</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ </dependencySets>
+</assembly>
Propchange: portals/pluto/trunk/pluto-portal/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal/src/assemble/config/pluto-docs.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/assemble/config/pluto-docs.xml?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/assemble/config/pluto-docs.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/assemble/config/pluto-docs.xml Sat Dec 29 09:31:56 2007
@@ -1,17 +1,17 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<Context path="/" docBase="..\PlutoDomain\docs" crossContext="false"></Context>
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<Context path="/" docBase="..\PlutoDomain\docs" crossContext="false"></Context>
Propchange: portals/pluto/trunk/pluto-portal/src/assemble/config/pluto-docs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml Sat Dec 29 09:31:56 2007
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<pluto-portal-driver
- xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd
- http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
- version="1.1">
-
- <portal-name>pluto-portal-driver</portal-name>
- <portal-version>${pom.version}</portal-version>
- <container-name>Pluto Portal Driver</container-name>
-
- <supports>
- <portlet-mode>view</portlet-mode>
- <portlet-mode>edit</portlet-mode>
- <portlet-mode>help</portlet-mode>
- <portlet-mode>config</portlet-mode>
-
- <window-state>normal</window-state>
- <window-state>maximized</window-state>
- <window-state>minimized</window-state>
- </supports>
-
-
- <!-- Render configuration which defines the portal pages. -->
- <render-config default="About Apache Pluto">
- <page name="About Apache Pluto" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/pluto" name="AboutPortlet"/>
- <portlet context="/testsuite" name="TestPortlet1"/>
- </page>
- <page name="Test Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/testsuite" name="TestPortlet1"/>
- <portlet context="/testsuite" name="TestPortlet2"/>
- </page>
- <page name="Secondary Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/testsuite" name="TestPortlet1"/>
- <portlet context="/testsuite" name="TestPortlet2"/>
- </page>
- <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/pluto" name="PlutoPageAdmin"/>
- <portlet context="/pluto" name="AboutPortlet"/>
- </page>
- </render-config>
-
-</pluto-portal-driver>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<pluto-portal-driver
+ xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd
+ http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
+ version="1.1">
+
+ <portal-name>pluto-portal-driver</portal-name>
+ <portal-version>${pom.version}</portal-version>
+ <container-name>Pluto Portal Driver</container-name>
+
+ <supports>
+ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
+ <portlet-mode>help</portlet-mode>
+ <portlet-mode>config</portlet-mode>
+
+ <window-state>normal</window-state>
+ <window-state>maximized</window-state>
+ <window-state>minimized</window-state>
+ </supports>
+
+
+ <!-- Render configuration which defines the portal pages. -->
+ <render-config default="About Apache Pluto">
+ <page name="About Apache Pluto" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/pluto" name="AboutPortlet"/>
+ <portlet context="/testsuite" name="TestPortlet1"/>
+ </page>
+ <page name="Test Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/testsuite" name="TestPortlet1"/>
+ <portlet context="/testsuite" name="TestPortlet2"/>
+ </page>
+ <page name="Secondary Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/testsuite" name="TestPortlet1"/>
+ <portlet context="/testsuite" name="TestPortlet2"/>
+ </page>
+ <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/pluto" name="PlutoPageAdmin"/>
+ <portlet context="/pluto" name="AboutPortlet"/>
+ </page>
+ </render-config>
+
+</pluto-portal-driver>
+
+
Propchange: portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal/src/main/resources/pluto.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/resources/pluto.xml?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/resources/pluto.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/resources/pluto.xml Sat Dec 29 09:31:56 2007
@@ -1,20 +1,20 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<Context path="/pluto" docBase="pluto-portal.war" crossContext="true">
-</Context>
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Context path="/pluto" docBase="pluto-portal.war" crossContext="true">
+</Context>
Propchange: portals/pluto/trunk/pluto-portal/src/main/resources/pluto.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-portal/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/resources/server.xml?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/resources/server.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/resources/server.xml Sat Dec 29 09:31:56 2007
@@ -1,19 +1,19 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- Pluto ResourceConfig File -->
<Server port="8005" shutdown="SHUTDOWN">
Propchange: portals/pluto/trunk/pluto-portal/src/main/resources/server.xml
------------------------------------------------------------------------------
svn:eol-style = native