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 cd...@apache.org on 2006/12/03 17:37:11 UTC
svn commit: r481799 - in
/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF:
pluto-portal-driver-config.xml portlet.xml web.xml
Author: cdoremus
Date: Sun Dec 3 08:37:10 2006
New Revision: 481799
URL: http://svn.apache.org/viewvc?view=rev&rev=481799
Log:
Updates to support PLUTO-215. There needs to be some resolution of the conflicts produced by David's recent additions. I'm not sure what PlutoPageAdmin is doing compared to AdminDeploymentPortlet?
Modified:
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml?view=diff&rev=481799&r1=481798&r2=481799
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml Sun Dec 3 08:37:10 2006
@@ -51,6 +51,7 @@
<portlets>
<portlet name="AboutPortlet"/>
<portlet name="AdminPortlet"/>
+ <portlet name="AdminDeploymentPortlet"/>
<portlet name="PlutoPageAdmin"/>
</portlets>
</portlet-app>
@@ -77,6 +78,7 @@
<portlet context="/pluto" name="AboutPortlet"/>
</page>
<page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/pluto" name="AdminDeploymentPortlet"/>
<portlet context="/pluto" name="AdminPortlet"/>
<portlet context="/pluto" name="PlutoPageAdmin"/>
</page>
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=481799&r1=481798&r2=481799
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml Sun Dec 3 08:37:10 2006
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-
+
<portlet>
<description>AboutPortletDescription</description>
<portlet-name>AboutPortlet</portlet-name>
@@ -54,6 +54,24 @@
</portlet-info>
</portlet>
+ <portlet>
+ <description>Admin portlet to deploy admin war files</description>
+ <portlet-name>AdminDeploymentPortlet</portlet-name>
+ <display-name>Admin Deploy Portlet</display-name>
+ <portlet-class>org.apache.pluto.driver.portlets.AdminDeploymentPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <resource-bundle>AdminDeploymentPortlet</resource-bundle>
+ <portlet-info>
+ <title>Admin Deploy Portlet</title>
+ </portlet-info>
+ </portlet>
+
<portlet>
<description>Used to administer pluto pages</description>
<portlet-name>PlutoPageAdmin</portlet-name>
@@ -69,6 +87,7 @@
<title>Pluto Page Administrator</title>
</portlet-info>
</portlet>
+>>>>>>> .r481784
</portlet-app>
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?view=diff&rev=481799&r1=481798&r2=481799
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Sun Dec 3 08:37:10 2006
@@ -86,6 +86,16 @@
</servlet>
<servlet>
+ <servlet-name>AdminDeploymentPortlet</servlet-name>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>AdminDeploymentPortlet</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
<servlet-name>PlutoPageAdmin</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
<init-param>
@@ -126,9 +136,15 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>AdminDeploymentPortlet</servlet-name>
+ <url-pattern>/PlutoInvoker/AdminDeploymentPortlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>PlutoPageAdmin</servlet-name>
<url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
</servlet-mapping>
+
<taglib>
<taglib-uri>http://java.sun.com/portlet</taglib-uri>
<taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
Re: svn commit: r481799 - in
/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF:
pluto-portal-driver-config.xml portlet.xml web.xml
Posted by cdoremus <CD...@hannaford.com>.
Hi David,
Sorry, conflict was a bad term. What I meant was we need to resolve and
merge the differences between your and my admin portlet implementations.
Yes, we should rollback my updates for now to avoid confusion. Please
explain to me (and everyone else) the functionality and architecture of your
recent commits.
Unless we incorporate the Tomcat manager app into the portal driver, which
could be confusing to folks (and technically difficult), there needs to be
some way to upload portlet application war files to the portal.
/Craig
David H. DeWolf wrote:
>
> Craig,
>
> Please explain your comment. What are the conflicts and what needs to
> be done?
>
> I'm not convinced we should check things in that "are in conflict".
> Since your series of checkins, pluto will no longer startup. This looks
> to be an issue with several libraries that should be in shared/lib now
> being packaged in the war. Do you think we can roll back your changes
> until everything is resolved? Let's walk through the problems you have
> on the dev list and then commit them. if we need to, we can create a
> branch for you to flush this stuff out, and then merge it back into the
> trunk.
>
> Also, I'm not sure I understand the commits at all. There's no reason
> we need to support "uploading a war" now. The whole purpose of the
> auto-deployment/publish features I've been working on was to prevent
> this from being necessary. Please explain!
>
> Thanks,
>
>
> David
>
> cdoremus@apache.org wrote:
>> Author: cdoremus
>> Date: Sun Dec 3 08:37:10 2006
>> New Revision: 481799
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=481799
>> Log:
>> Updates to support PLUTO-215. There needs to be some resolution of the
>> conflicts produced by David's recent additions. I'm not sure what
>> PlutoPageAdmin is doing compared to AdminDeploymentPortlet?
>>
>> Modified:
>>
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
>>
>> Modified:
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml?view=diff&rev=481799&r1=481798&r2=481799
>> ==============================================================================
>> ---
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
>> (original)
>> +++
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
>> Sun Dec 3 08:37:10 2006
>> @@ -51,6 +51,7 @@
>> <portlets>
>> <portlet name="AboutPortlet"/>
>> <portlet name="AdminPortlet"/>
>> + <portlet name="AdminDeploymentPortlet"/>
>> <portlet name="PlutoPageAdmin"/>
>> </portlets>
>> </portlet-app>
>> @@ -77,6 +78,7 @@
>> <portlet context="/pluto" name="AboutPortlet"/>
>> </page>
>> <page name="Pluto Admin"
>> uri="/WEB-INF/themes/pluto-default-theme.jsp">
>> + <portlet context="/pluto" name="AdminDeploymentPortlet"/>
>> <portlet context="/pluto" name="AdminPortlet"/>
>> <portlet context="/pluto" name="PlutoPageAdmin"/>
>> </page>
>>
>> Modified:
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=481799&r1=481798&r2=481799
>> ==============================================================================
>> --- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
>> (original)
>> +++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
>> Sun Dec 3 08:37:10 2006
>> @@ -21,7 +21,7 @@
>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>
>> xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
>>
>> http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
>> -
>> +
>> <portlet>
>> <description>AboutPortletDescription</description>
>> <portlet-name>AboutPortlet</portlet-name>
>> @@ -54,6 +54,24 @@
>> </portlet-info>
>> </portlet>
>>
>> + <portlet>
>> + <description>Admin portlet to deploy admin war files</description>
>> + <portlet-name>AdminDeploymentPortlet</portlet-name>
>> + <display-name>Admin Deploy Portlet</display-name>
>> +
>> <portlet-class>org.apache.pluto.driver.portlets.AdminDeploymentPortlet</portlet-class>
>> + <supports>
>> + <mime-type>text/html</mime-type>
>> + <portlet-mode>VIEW</portlet-mode>
>> + <portlet-mode>EDIT</portlet-mode>
>> + <portlet-mode>HELP</portlet-mode>
>> + </supports>
>> + <supported-locale>en</supported-locale>
>> + <resource-bundle>AdminDeploymentPortlet</resource-bundle>
>> + <portlet-info>
>> + <title>Admin Deploy Portlet</title>
>> + </portlet-info>
>> + </portlet>
>> +
>> <portlet>
>> <description>Used to administer pluto pages</description>
>> <portlet-name>PlutoPageAdmin</portlet-name>
>> @@ -69,6 +87,7 @@
>> <title>Pluto Page Administrator</title>
>> </portlet-info>
>> </portlet>
>> +>>>>>>> .r481784
>> </portlet-app>
>>
>>
>>
>> Modified:
>> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
>> URL:
>> http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?view=diff&rev=481799&r1=481798&r2=481799
>> ==============================================================================
>> --- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
>> (original)
>> +++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Sun
>> Dec 3 08:37:10 2006
>> @@ -86,6 +86,16 @@
>> </servlet>
>>
>> <servlet>
>> + <servlet-name>AdminDeploymentPortlet</servlet-name>
>> +
>> <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
>> + <init-param>
>> + <param-name>portlet-name</param-name>
>> + <param-value>AdminDeploymentPortlet</param-value>
>> + </init-param>
>> + <load-on-startup>1</load-on-startup>
>> + </servlet>
>> +
>> + <servlet>
>> <servlet-name>PlutoPageAdmin</servlet-name>
>>
>> <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
>> <init-param>
>> @@ -126,9 +136,15 @@
>> </servlet-mapping>
>>
>> <servlet-mapping>
>> + <servlet-name>AdminDeploymentPortlet</servlet-name>
>> + <url-pattern>/PlutoInvoker/AdminDeploymentPortlet</url-pattern>
>> + </servlet-mapping>
>> +
>> + <servlet-mapping>
>> <servlet-name>PlutoPageAdmin</servlet-name>
>> <url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
>> </servlet-mapping>
>> +
>> <taglib>
>> <taglib-uri>http://java.sun.com/portlet</taglib-uri>
>> <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
>>
>>
>>
>
>
--
View this message in context: http://www.nabble.com/Re%3A-svn-commit%3A-r481799---in--portals-pluto-trunk-pluto-portal-src-main-webapp-WEB-INF%3A-pluto-portal-driver-config.xml-portlet.xml-web.xml-tf2747579.html#a7670638
Sent from the Pluto - Dev mailing list archive at Nabble.com.
Re: svn commit: r481799 - in /portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF:
pluto-portal-driver-config.xml portlet.xml web.xml
Posted by "David H. DeWolf" <dd...@apache.org>.
Craig,
Please explain your comment. What are the conflicts and what needs to
be done?
I'm not convinced we should check things in that "are in conflict".
Since your series of checkins, pluto will no longer startup. This looks
to be an issue with several libraries that should be in shared/lib now
being packaged in the war. Do you think we can roll back your changes
until everything is resolved? Let's walk through the problems you have
on the dev list and then commit them. if we need to, we can create a
branch for you to flush this stuff out, and then merge it back into the
trunk.
Also, I'm not sure I understand the commits at all. There's no reason
we need to support "uploading a war" now. The whole purpose of the
auto-deployment/publish features I've been working on was to prevent
this from being necessary. Please explain!
Thanks,
David
cdoremus@apache.org wrote:
> Author: cdoremus
> Date: Sun Dec 3 08:37:10 2006
> New Revision: 481799
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=481799
> Log:
> Updates to support PLUTO-215. There needs to be some resolution of the conflicts produced by David's recent additions. I'm not sure what PlutoPageAdmin is doing compared to AdminDeploymentPortlet?
>
> Modified:
> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
> portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
>
> Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
> URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml?view=diff&rev=481799&r1=481798&r2=481799
> ==============================================================================
> --- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
> +++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml Sun Dec 3 08:37:10 2006
> @@ -51,6 +51,7 @@
> <portlets>
> <portlet name="AboutPortlet"/>
> <portlet name="AdminPortlet"/>
> + <portlet name="AdminDeploymentPortlet"/>
> <portlet name="PlutoPageAdmin"/>
> </portlets>
> </portlet-app>
> @@ -77,6 +78,7 @@
> <portlet context="/pluto" name="AboutPortlet"/>
> </page>
> <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
> + <portlet context="/pluto" name="AdminDeploymentPortlet"/>
> <portlet context="/pluto" name="AdminPortlet"/>
> <portlet context="/pluto" name="PlutoPageAdmin"/>
> </page>
>
> Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
> URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=481799&r1=481798&r2=481799
> ==============================================================================
> --- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml (original)
> +++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/portlet.xml Sun Dec 3 08:37:10 2006
> @@ -21,7 +21,7 @@
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
> http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
> -
> +
> <portlet>
> <description>AboutPortletDescription</description>
> <portlet-name>AboutPortlet</portlet-name>
> @@ -54,6 +54,24 @@
> </portlet-info>
> </portlet>
>
> + <portlet>
> + <description>Admin portlet to deploy admin war files</description>
> + <portlet-name>AdminDeploymentPortlet</portlet-name>
> + <display-name>Admin Deploy Portlet</display-name>
> + <portlet-class>org.apache.pluto.driver.portlets.AdminDeploymentPortlet</portlet-class>
> + <supports>
> + <mime-type>text/html</mime-type>
> + <portlet-mode>VIEW</portlet-mode>
> + <portlet-mode>EDIT</portlet-mode>
> + <portlet-mode>HELP</portlet-mode>
> + </supports>
> + <supported-locale>en</supported-locale>
> + <resource-bundle>AdminDeploymentPortlet</resource-bundle>
> + <portlet-info>
> + <title>Admin Deploy Portlet</title>
> + </portlet-info>
> + </portlet>
> +
> <portlet>
> <description>Used to administer pluto pages</description>
> <portlet-name>PlutoPageAdmin</portlet-name>
> @@ -69,6 +87,7 @@
> <title>Pluto Page Administrator</title>
> </portlet-info>
> </portlet>
> +>>>>>>> .r481784
> </portlet-app>
>
>
>
> Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?view=diff&rev=481799&r1=481798&r2=481799
> ==============================================================================
> --- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
> +++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Sun Dec 3 08:37:10 2006
> @@ -86,6 +86,16 @@
> </servlet>
>
> <servlet>
> + <servlet-name>AdminDeploymentPortlet</servlet-name>
> + <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> + <init-param>
> + <param-name>portlet-name</param-name>
> + <param-value>AdminDeploymentPortlet</param-value>
> + </init-param>
> + <load-on-startup>1</load-on-startup>
> + </servlet>
> +
> + <servlet>
> <servlet-name>PlutoPageAdmin</servlet-name>
> <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
> <init-param>
> @@ -126,9 +136,15 @@
> </servlet-mapping>
>
> <servlet-mapping>
> + <servlet-name>AdminDeploymentPortlet</servlet-name>
> + <url-pattern>/PlutoInvoker/AdminDeploymentPortlet</url-pattern>
> + </servlet-mapping>
> +
> + <servlet-mapping>
> <servlet-name>PlutoPageAdmin</servlet-name>
> <url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
> </servlet-mapping>
> +
> <taglib>
> <taglib-uri>http://java.sun.com/portlet</taglib-uri>
> <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
>
>
>