svn commit: r765700 - in /portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF: portlet.xml web.xml

[wo...@apache.org]

Author: woonsan
Date: Thu Apr 16 17:40:38 2009
New Revision: 765700

URL: http://svn.apache.org/viewvc?rev=765700&view=rev
Log:
Some house working:
 - Temporarily commenting out the jetspeed logging listener.
 - fixing the IFramePortlet class FQN in portlet.xml

Modified:
    portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/portlet.xml
    portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml

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=765700&r1=765699&r2=765700&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 17:40:38 2009
@@ -20,11 +20,11 @@
     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 id="tmtt-main">
+    <portlet>
         <description>Places an HTML IFrame inside a portlet for easily hosting other web application within a portlet. Sizes of both normal and maximized modes are configurable in edit mode.</description>
         <portlet-name>IFramePortlet</portlet-name>
         <display-name>IFrame Portlet</display-name>
-        <portlet-class>org.apache.jetspeed.portlet.IFrameGenericPortlet</portlet-class>        
+        <portlet-class>org.apache.portals.applications.webcontent.portlet.IFrameGenericPortlet</portlet-class>        
         <init-param>
             <name>EditPage</name>
             <value>/WEB-INF/view/edit-prefs.vm</value>
@@ -82,7 +82,7 @@
         </portlet-preferences>
     </portlet>
 
-    <portlet id="web-cont-demo">
+    <portlet>
         <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>
@@ -114,7 +114,6 @@
             </preference>
         </portlet-preferences>        
     </portlet>
-
-        
+    
 </portlet-app>
 

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=765700&r1=765699&r2=765700&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 17:40:38 2009
@@ -21,9 +21,12 @@
   <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>
+  -->
   
   <servlet>
     <servlet-name>JetspeedContainer</servlet-name>