Author: vkumar
Date: Thu Apr 16 21:23:07 2009
New Revision: 765763
URL: http://svn.apache.org/viewvc?rev=765763&view=rev
Log:
Adding common-digester as project dependency required by rewriter
correcting portlet class for webcontent portlet
adding required velocity template and macros
Running webapp-logging listener again
Added:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-prefs.vm
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-wcprefs.vm
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html
(with props)
Modified:
portals/applications/webcontent/trunk/webcontent-war/pom.xml
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity-macros.vm
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=765763&r1=765762&r2=765763&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Thu Apr 16
21:23:07 2009
@@ -40,6 +40,8 @@
<commons-collections.version>3.2</commons-collections.version>
<log4j.version>1.2.14</log4j.version>
<oro.version>2.0.8</oro.version>
+ <commons-digester.version>1.8</commons-digester.version>
+
<portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
</properties>
<dependencies>
@@ -59,14 +61,19 @@
<dependency>
<groupId>org.apache.portals.applications</groupId>
<artifactId>apa-webapp-logging</artifactId>
- <version>1.0-SNAPSHOT</version>
+
<version>${portals.applications.apa-webapp-logging.version}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons-digester.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml?rev=765763&r1=765762&r2=765763&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml
Thu Apr 16 21:23:07 2009
@@ -86,7 +86,7 @@
<description>Includes the content of another website inside the portal
without using frames. All links are rewritten back to the portal to attempt to
proxy all content through the portal.</description>
<portlet-name>WebContentPortlet</portlet-name>
<display-name>WebContent Portlet</display-name>
-
<portlet-class>org.apache.jetspeed.portlet.WebContentPortlet</portlet-class>
+
<portlet-class>org.apache.portals.applications.webcontent.portlet.WebContentPortlet</portlet-class>
<init-param>
<name>EditPage</name>
<value>/WEB-INF/view/edit-wcprefs.vm</value>
Modified:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity-macros.vm
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity-macros.vm?rev=765763&r1=765762&r2=765763&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity-macros.vm
(original)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity-macros.vm
Thu Apr 16 21:23:07 2009
@@ -14,3 +14,30 @@
See the License for the specific language governing permissions and
limitations under the License.
*#
+
+#macro (prefField $key $values $size)
+#if ($ERRORS)
+#set ($eflag = "$!ERRORS.get($id)")
+#else
+#set ($eflag = "")
+#end
+#set ($pv = $pf.Value)
+#foreach ($x in $pv)
+#set ($extr = $x)
+#end
+#foreach ($x in $values)
+#set ($extr = $x)
+#end
+ <tr colspan="4" align="right">
+ #if ($!eflag == "")
+ <td width="5%" align="left"> </td>
+ #else
+ <td width="5%" class="portlet-msg-error" align="left"> </td>
+ #end
+ <td nowrap class="portlet-section-alternate"
align="right">$!key: </td>
+ <td class="portlet-section-body" align="left">
+ <input id="$!id" type="text" name="$!key" size="$!size" value="$!extr"
class="portlet-form-field-label">
+ </td>
+ <td width="5%" class="portlet-form-label" align="left"> </td>
+ </tr>
+#end
\ No newline at end of file
Added:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-prefs.vm
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-prefs.vm?rev=765763&view=auto
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-prefs.vm
(added)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-prefs.vm
Thu Apr 16 21:23:07 2009
@@ -0,0 +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.
+*#
+<h2 class="portlet-section-header">Edit Preferences</h2>
+
+<form action="$renderResponse.createActionURL()" method="post">
+<table>
+#foreach ($pref in $prefs)
+#prefField($pref.Key $pref.Value "40")
+#end
+</table>
+<input type="submit" name="Save" value="Save" />
+</form>
+
+
Added:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-wcprefs.vm
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-wcprefs.vm?rev=765763&view=auto
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-wcprefs.vm
(added)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/edit-wcprefs.vm
Thu Apr 16 21:23:07 2009
@@ -0,0 +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.
+*#
+<h2 class="portlet-section-header">Edit Preferences</h2>
+
+<form action="$renderResponse.createActionURL()" method="post">
+<table>
+#foreach ($pref in $prefs)
+#prefField($pref.Key $pref.Value "40")
+#end
+</table>
+<input type="submit" name="Save" value="Save" />
+</form>
+
+
Added:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html?rev=765763&view=auto
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html
(added)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html
Thu Apr 16 21:23:07 2009
@@ -0,0 +1,48 @@
+<!--
+ 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.
+-->
+<h1>SSO IFrame Help</h1>
+<p>
+The following preferences can be used with the SSO IFrame Portlet in addition
to the standard IFrame preferences
+</p>
+<p>
+<table border="1" cellspacing="1" cellpadding="3">
+<tr>
+<th class="portlet-section-body">Preference</th>
+<th class="portlet-section-body">Usage</th>
+</tr>
+<tr>
+<td class='portlet-section-body'>sso.type</td>
+<td class='portlet-section-body'>The type of Single signon authentication.
Valid values: form | basic | basic.preemptive | url | url.base64</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>sso.url.Credential</td>
+<td class='portlet-section-body'>The name of the credential input field or
parameter</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>sso.url.Principal</td>
+<td class='portlet-section-body'>The name of the user name input field or
parameter</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>SSO Principal</td>
+<td class='portlet-section-body'>The actual user name</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>SSO Credential</td>
+<td class='portlet-section-body'>The actual crendential value</td>
+</tr>
+</table>
+</p>
Propchange:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/view/iframe-help.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml?rev=765763&r1=765762&r2=765763&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
(original)
+++
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
Thu Apr 16 21:23:07 2009
@@ -21,12 +21,9 @@
<display-name>Webcontent Portlet Application</display-name>
<description>Apache Portals Applications: Webcontent PA</description>
- <!-- TODO: This listener cannot start correctly. Why? -->
- <!--
<listener>
-
<listener-class>org.apache.jetspeed.webapp.logging.Log4JConfigurator</listener-class>
+
<listener-class>org.apache.portals.applications.webapp.logging.Log4JConfigurator</listener-class>
</listener>
- -->
<servlet>
<servlet-name>JetspeedContainer</servlet-name>
