taylor 2004/04/06 12:56:54
Modified: portal/src/webapp/pages/pam pam-browser.jsp pam-detail.jsp
portal/src/webapp/WEB-INF/assembly jetspeed.groovy
portal/src/webapp/WEB-INF/pages pam.psml
Log:
changes to assembly
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +4 -56 jakarta-jetspeed-2/portal/src/webapp/pages/pam/pam-browser.jsp
Index: pam-browser.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/pages/pam/pam-browser.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam-browser.jsp 3 Apr 2004 01:11:27 -0000 1.2
+++ pam-browser.jsp 6 Apr 2004 19:56:54 -0000 1.3
@@ -1,57 +1,5 @@
-<%--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
---%>
-<%@ page language="java" import="javax.portlet.*, java.util.List,
java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication"
session="true" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
-
-<portlet:defineObjects/>
-<p>This page was invoked from a LOCAL portlet app</P>
-<a href='/snipet.html'>somelink</a>
-
-<p>renderURL</p>
-
-<p>
-<portlet:renderURL windowState="normal" portletMode="view" var="myView">
- <portlet:param name="invokeMsg" value="No action just render" />
-</portlet:renderURL>
-<a href="<c:out value="${myView}" />">View!</a>
-
-</p>
-
-<p>"<c:out value="${myView}" />"</p>
-
-<p>
-<a href="<portlet:actionURL windowState="normal" portletMode="view" />">My
Action!!!</a>
-<a href="<portlet:actionURL windowState="normal" portletMode="view" />">Invoke My
Action!!!</a>
-
-</p>
-
-
+<%--
Copyright 2004 The Apache Software Foundation
Licensed 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.
--%>
<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator,
org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<portlet:defineObjects/>
+<p>This page was invoked from a LOCAL portlet app</P>
<a href='/snipet.html'>somelink</a>
<p>renderURL</p>
<p>
<portlet:renderURL windowState="normal" portletMode="view" var="myView">
<portlet:param name="invokeMsg" value="No action just render" />
</portlet:renderURL>
<a href="<c:out value="${myView}" />">View!</a>
</p>
<p>"<c:out value="${myView}" />"</p>
<p>
<a href="<portlet:actionURL windowState="normal" portletMode="view" />">My
Action!!!</a>
<a href="<portlet:actionURL windowState="normal" portletMode="view" />">Invoke My
Action!!!</a>
</p>
<br>
-
-<table>
-<%
- List apps = (List) renderRequest.getAttribute("apps");
- for (Iterator i = apps.iterator(); i.hasNext();)
- {
- MutablePortletApplication pa = (MutablePortletApplication) i.next();
- out.println("<tr><td>" + pa.getName() + "</td>");
- out.println("<td>" + pa.getDescription() + "</td></tr>");
- }
-%>
-</table>
-
-
+<table>
<%
List apps = (List) renderRequest.getAttribute("apps");
for (Iterator i = apps.iterator(); i.hasNext();)
{
MutablePortletApplication pa = (MutablePortletApplication) i.next();
out.println("<tr><td>" + pa.getName() + "</td>");
out.println("<td>" + pa.getDescription() + "</td></tr>");
}
%>
</table>
+
1.2 +1 -30 jakarta-jetspeed-2/portal/src/webapp/pages/pam/pam-detail.jsp
Index: pam-detail.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/pages/pam/pam-detail.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-detail.jsp 3 Apr 2004 01:11:27 -0000 1.1
+++ pam-detail.jsp 6 Apr 2004 19:56:54 -0000 1.2
@@ -1,30 +1 @@
-<%--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
---%>
-<%@ page language="java" import="javax.portlet.*, java.util.List" session="true" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
-
-<portlet:defineObjects/>
-
-
-<br>
-<p>TODO: write me</p>
-
-
-
-
-
-
+<%--
Copyright 2004 The Apache Software Foundation
Licensed 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.
--%>
<%@ page language="java" import="javax.portlet.*, java.util.List" session="true" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<portlet:defineObjects/>
<br>
<p>TODO: write me</p>
\ No newline at end of file
1.29 +6 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
Index: jetspeed.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jetspeed.groovy 3 Apr 2004 01:02:21 -0000 1.28
+++ jetspeed.groovy 6 Apr 2004 19:56:54 -0000 1.29
@@ -129,8 +129,13 @@
navStateClass = "org.apache.jetspeed.container.session.impl.PathNavigationalState"
//navStateClass =
"org.apache.jetspeed.container.session.impl.SessionNavigationalState"
+//urlClass = "org.apache.jetspeed.container.url.impl.SessionPortalURL"
+urlClass = "org.apache.jetspeed.container.url.impl.PathPortalURL"
container.registerComponentImplementation(NavigationalStateComponent,
JetspeedNavigationalStateComponent,
- new Parameter[] {new ConstantParameter(navStateClass), new
ConstantParameter(navigationKeys)} )
+ new Parameter[] {new ConstantParameter(navStateClass),
+ new ConstantParameter(urlClass),
+ new ConstantParameter(navigationKeys)} )
+
//
// Request Context component
1.2 +2 -33 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pam.psml
Index: pam.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pam.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam.psml 3 Apr 2004 01:13:24 -0000 1.1
+++ pam.psml 6 Apr 2004 19:56:54 -0000 1.2
@@ -1,33 +1,2 @@
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<page id="pam">
- <defaults
- skin="orange"
- layout-decorator="jetspeed"
- portlet-decorator="jetspeed"
- />
- <title>Portlet Application Manager</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
- <fragment id="13" type="portlet" name="jetspeed::PortletApplicationBrowser"
decorator="minty-blue">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- <fragment id="14" type="portlet" name="jetspeed::PortletApplicationDetail"
decorator="minty-blue">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- </fragment>
-</page>
+<!--
Copyright 2004 The Apache Software Foundation
Licensed 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.
-->
+<page id="pam">
<defaults
skin="orange"
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
<title>Portlet Application Manager</title>
<fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="13" type="portlet" name="jetspeed::PortletApplicationBrowser"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
<fragment id="14" type="portlet" name="jetspeed::PortletApplicationDetail"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
</fragment>
</page>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
