portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r771544 - in /portals/applications/demo/trunk: ./ src/main/java/ src/main/resources/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/classes/ src/main/webapp/WEB-INF/demo/css/ src/main/webapp/WEB-INF/demo/customerInfo/ src/main/webapp/WEB-...
Date Tue, 05 May 2009 03:39:57 GMT
Author: ate
Date: Tue May  5 03:39:55 2009
New Revision: 771544

URL: http://svn.apache.org/viewvc?rev=771544&view=rev
Log:
JS2-972: commons-logging unsuited for cross-context webapplication invocation usage - migrating to slf4j
- adding a simple ServletContextListener for setting up relative log4j logging in the demo war
- removing invalid (pluto specific) portlet.tld and outdated c.tld and c_rt.tld and fixed up all tld uri in the JSPs
- removing jetspeed specific container servlet from web.xml (needs to be "infused" for each container)
- removed no longer used/provided (SSO demo) servlets from web.xml and jetspeed services from jetspeed-portlet.xml
- cleaning up dependencies

Added:
    portals/applications/demo/trunk/src/main/java/WebAppRootListener.java   (with props)
    portals/applications/demo/trunk/src/main/resources/log4j.properties
      - copied, changed from r771262, portals/applications/demo/trunk/src/main/webapp/WEB-INF/log4j.properties
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/classes/
Removed:
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/c-rt.tld
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/c.tld
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/log4j.properties
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.tld
Modified:
    portals/applications/demo/trunk/pom.xml
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/css/css.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-edit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-view.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/jmx/jmx-view.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/preference/pref-view.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/security/roles.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScope.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequest.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumber.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberAbout.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEditDefaults.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/userinfo/userinfo.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello-wml.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view.jsp
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml

Modified: portals/applications/demo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Tue May  5 03:39:55 2009
@@ -168,6 +168,12 @@
       <artifactId>commons-digester</artifactId>
       <version>${commons-digester.version}</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -207,6 +213,9 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+  <build>
+     <finalName>apa-demo</finalName>
+  </build>
 
   <!-- Project Information -->
 

Added: portals/applications/demo/trunk/src/main/java/WebAppRootListener.java
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/java/WebAppRootListener.java?rev=771544&view=auto
==============================================================================
--- portals/applications/demo/trunk/src/main/java/WebAppRootListener.java (added)
+++ portals/applications/demo/trunk/src/main/java/WebAppRootListener.java Tue May  5 03:39:55 2009
@@ -0,0 +1,57 @@
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/*
+ * 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.
+ */
+/**
+ * Simple ServletContextListener which sets a system property to the current webapp root folder.
+ * <p>
+ * The system property name to be used needs to be configured in web.xml with the <code>webAppRootKey</code> init parameter.
+ * If not configured, it will use as default "webapp.root".
+ * <em>beware of using this default for multiple webapps at the same time: webcontainers like Tomcat only use a single system
+ * properties space.
+ * </p>
+ * <p>
+ * The primary purpose of this listener is to allow using a webapp root folder relative path for log4j logging.
+ * </p>
+ * @version $Id$
+ *
+ */
+public class WebAppRootListener implements ServletContextListener
+{
+    private static final String WEBAPP_ROOT_KEY = "webAppRootKey";
+    private static final String DEFAULT_WEBAPP_ROOT_PROPERTY_NAME = "webapp.root";
+    
+    public void contextInitialized(ServletContextEvent sce)
+    {
+        String webAppRootPropertyName = sce.getServletContext().getInitParameter(WEBAPP_ROOT_KEY);
+        if (webAppRootPropertyName == null)
+        {
+            webAppRootPropertyName = DEFAULT_WEBAPP_ROOT_PROPERTY_NAME; 
+        }
+        String webAppRoot = sce.getServletContext().getRealPath("/");
+        if (webAppRoot == null)
+        {
+            throw new IllegalStateException("Cannot use this WebAppRootListener in a non-expanded webapplication");
+        }
+        System.setProperty(webAppRootPropertyName, webAppRoot);
+    }
+    
+    public void contextDestroyed(ServletContextEvent sce)
+    {
+    }
+}

Propchange: portals/applications/demo/trunk/src/main/java/WebAppRootListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/demo/trunk/src/main/java/WebAppRootListener.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/applications/demo/trunk/src/main/java/WebAppRootListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/applications/demo/trunk/src/main/resources/log4j.properties (from r771262, portals/applications/demo/trunk/src/main/webapp/WEB-INF/log4j.properties)
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/resources/log4j.properties?p2=portals/applications/demo/trunk/src/main/resources/log4j.properties&p1=portals/applications/demo/trunk/src/main/webapp/WEB-INF/log4j.properties&r1=771262&r2=771544&rev=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/log4j.properties (original)
+++ portals/applications/demo/trunk/src/main/resources/log4j.properties Tue May  5 03:39:55 2009
@@ -44,17 +44,17 @@
 #
 # pa.log
 #
-log4j.appender.pa = org.apache.log4j.FileAppender
-log4j.appender.pa.file = ${webApplicationRoot}/logs/pa.log
-log4j.appender.pa.layout = org.apache.log4j.PatternLayout
-log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.pa.append = false
-
-#
-# velocity.log
-#
-log4j.appender.velocity = org.apache.log4j.FileAppender
-log4j.appender.velocity.file = ${webApplicationRoot}/logs/velocity.log
-log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
-log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.velocity.append = false
+log4j.appender.pa = org.apache.log4j.FileAppender
+log4j.appender.pa.file = ${org.apache.portals.applications.demo.webappRoot}/logs/pa.log
+log4j.appender.pa.layout = org.apache.log4j.PatternLayout
+log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.pa.append = false
+
+#
+# velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${org.apache.portals.applications.demo.webappRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/css/css.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/css/css.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/css/css.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/css/css.jsp Tue May  5 03:39:55 2009
@@ -15,8 +15,8 @@
 limitations under the License.
 --%>
 <%@ page session="false"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.css.resources.CSSResources" />
 <portlet:defineObjects/>
 <br/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1.jsp Tue May  5 03:39:55 2009
@@ -20,9 +20,9 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="org.apache.portals.applications.demo.customerInfo.CustomerInfo" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <fmt:setBundle basename="org.apache.portals.applications.customerInfo.resources.CustomerListResources" />
 <portlet:defineObjects/>
 

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.customerInfo.resources.CustomerListResources" />
 
 <div>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.customerInfo.resources.CustomerInfoResources" />
 
 <div>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.customerInfo.resources.CustomerInfoResources" />
 
 <div>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.customerInfo.resources.CustomerDetailResources" />
 
 <div>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.customerInfo.resources.CustomerDetailResources" />
 
 <div>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-edit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-edit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-edit.jsp Tue May  5 03:39:55 2009
@@ -16,7 +16,7 @@
 --%>
 <%@ page session="false" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <portlet:defineObjects/>
 
 <form method="post" action="<portlet:actionURL/>">

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-view.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-view.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/groovy/hello-groovy-view.jsp Tue May  5 03:39:55 2009
@@ -16,7 +16,7 @@
 --%>
 <%@ page session="false" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <portlet:defineObjects/>
 
 <h1>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/jmx/jmx-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/jmx/jmx-view.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/jmx/jmx-view.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/jmx/jmx-view.jsp Tue May  5 03:39:55 2009
@@ -15,7 +15,7 @@
 limitations under the License.
 --%>
 <%@ page language="java" import="javax.portlet.*, java.util.List" session="false" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <c:set var="portletRequest" value="${request}"/>
 
 <h1>JMX Portlet Example</h1>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/preference/pref-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/preference/pref-view.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/preference/pref-view.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/preference/pref-view.jsp Tue May  5 03:39:55 2009
@@ -15,10 +15,10 @@
 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/portlet" prefix="portlet"%>
 <%@ taglib uri='/WEB-INF/veltag.tld' prefix='vel'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.preferences.resources.PreferenceResources" />
 
 <portlet:defineObjects/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/security/roles.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/security/roles.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/security/roles.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/security/roles.jsp Tue May  5 03:39:55 2009
@@ -15,9 +15,9 @@
 limitations under the License.
 --%>
 <%@page import="javax.portlet.PortletRequest" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.security.resources.RoleResources" />
 
 <portlet:defineObjects/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScope.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScope.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScope.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScope.jsp Tue May  5 03:39:55 2009
@@ -17,9 +17,9 @@
 <%@ page language="java" session="true" %>
 <%@ page import="java.util.*" %>
 <%@ page import="javax.portlet.*" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portletAPI'%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portletAPI"%>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.AttributeScopeResources" />
 
 <portletAPI:defineObjects/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp Tue May  5 03:39:55 2009
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.AttributeScopeResources" />
 <p>
   <fmt:message key="attributescopehelp.label.ThisIsHelp"/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequest.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequest.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequest.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequest.jsp Tue May  5 03:39:55 2009
@@ -17,8 +17,8 @@
 <%@ page language="java"
          session="false"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib uri="http://jakarta.apache.org/taglibs/request-1.0" prefix="req" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.DisplayRequestResources" />
 

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp Tue May  5 03:39:55 2009
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.DisplayRequestResources" />
 <p>
   <fmt:message key="displayrequesthelp.label.ThisIsHelp"/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumber.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumber.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumber.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumber.jsp Tue May  5 03:39:55 2009
@@ -15,9 +15,9 @@
 limitations under the License.
 --%>
 <%@ page language="java" session="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ page import="javax.portlet.PortletSession"%>
 <portlet:defineObjects/>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.PickANumberResources" />

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberAbout.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberAbout.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberAbout.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberAbout.jsp Tue May  5 03:39:55 2009
@@ -14,8 +14,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
 <h1>About PickANumber</h1>
 <hr/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp Tue May  5 03:39:55 2009
@@ -15,9 +15,9 @@
 limitations under the License.
 --%>
 <%@ page language="java" session="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ page import="javax.portlet.PortletSession"%>
 <portlet:defineObjects/>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.PickANumberResources" />

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEditDefaults.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEditDefaults.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEditDefaults.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberEditDefaults.jsp Tue May  5 03:39:55 2009
@@ -15,9 +15,9 @@
 limitations under the License.
 --%>
 <%@ page language="java" session="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ page import="javax.portlet.PortletSession"%>
 <portlet:defineObjects/>
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.PickANumberResources" />

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp Tue May  5 03:39:55 2009
@@ -14,8 +14,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
 <fmt:setBundle basename="org.apache.portals.applications.demo.simple.resources.PickANumberResources" />
 <hr/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/userinfo/userinfo.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/userinfo/userinfo.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/userinfo/userinfo.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/demo/userinfo/userinfo.jsp Tue May  5 03:39:55 2009
@@ -15,10 +15,10 @@
 limitations under the License.
 --%>
 <%@page import="javax.portlet.PortletRequest" %>
-<%@ taglib uri="portlet.tld" prefix='portlet'%>
-<%@ taglib uri="c.tld" prefix="c" %>
-<%@ taglib uri="c-rt.tld" prefix="c-rt" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core_rt" prefix="c-rt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.userinfo.resources.UserInfoResources" />
 
 <portlet:defineObjects/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello-wml.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello-wml.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello-wml.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello-wml.jsp Tue May  5 03:39:55 2009
@@ -15,11 +15,11 @@
 limitations under the License.
 --%>
 <%@ page session="false"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ page import="org.apache.jetspeed.request.RequestContext"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core_rt" prefix="c_rt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <fmt:setBundle basename="org.apache.portals.applications.demo.helloworld.resources.HelloWorldResources" />
 <portlet:defineObjects/>
 <c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/hello.jsp Tue May  5 03:39:55 2009
@@ -15,8 +15,8 @@
 limitations under the License.
 --%>
 <%@ page session="false"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <fmt:setBundle basename="org.apache.portals.applications.demo.helloworld.resources.HelloWorldResources" />
 <portlet:defineObjects/>
 <p><fmt:message key="hello.label.ThisIsATestLine"/></p>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml Tue May  5 03:39:55 2009
@@ -223,26 +223,4 @@
         -->
     </portlet>
 
-    <portlet>
-        <portlet-name>WebContentPortlet</portlet-name>
-        <!--  this portlet was wrongly coded to submit actions when it should be submitting renders
-              to compensate, I have changed its action behavior to non-standard so that other
-              cached portlets are not required to refresh while navigating around -->
-        <js:metadata name="nonStandardAction">true</js:metadata>
-    </portlet>
-
-    <portlet>
-        <portlet-name>SSOWebContent</portlet-name>
-        <!--  this portlet was wrongly coded to submit actions when it should be submitting renders
-              to compensate, I have changed its action behavior to non-standard so that other
-              cached portlets are not required to refresh while navigating around -->
-        <js:metadata name="nonStandardAction">true</js:metadata>
-    </portlet>
-    
-    <js:services>
-        <js:service name='PortalConfiguration'/>
-        <js:service name='SSO'/>
-        <js:service name='UserManager'/>
-    </js:services>
-    
 </portlet-app>
\ No newline at end of file

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml Tue May  5 03:39:55 2009
@@ -13,10 +13,11 @@
   KIND, either express or implied. See the License for the specific language
   governing permissions and limitations under the License.
 -->
-<portlet-app id="demo"
-  xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"
-  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-app id='demo'
+              xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" 
+              version="2.0" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
 
   <portlet id="HelloPortlet">
     <description>This is the hello world of portlets, it doesn't do much</description>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp Tue May  5 03:39:55 2009
@@ -17,7 +17,7 @@
 <%@ page session="false" %>
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.*"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:actionURL var="myAction">
 <portlet:param name="add" value="add"/>
 </portlet:actionURL>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-edit.jsp Tue May  5 03:39:55 2009
@@ -17,7 +17,7 @@
 <%@ page session="false" %>
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.*"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
 <portlet:actionURL var="myAction">
 	<portlet:param name="add" value="add"/>

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp Tue May  5 03:39:55 2009
@@ -17,7 +17,7 @@
 <%@ page session="false" %>
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.*"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:actionURL portletMode="view" var="myCancel"/>
 <portlet:defineObjects/>
 <%

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-help.jsp Tue May  5 03:39:55 2009
@@ -17,7 +17,7 @@
 <%@ page session="false" %>
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.*"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
 <portlet:actionURL portletMode="view" var="myCancel"/>
 

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp Tue May  5 03:39:55 2009
@@ -18,7 +18,7 @@
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.Enumeration"%>
 <%@ page import="java.util.ResourceBundle"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>                            
 <%
 ResourceBundle myText = portletConfig.getResourceBundle(renderRequest.getLocale());         

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view.jsp?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view.jsp (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/view/bookmark-view.jsp Tue May  5 03:39:55 2009
@@ -18,7 +18,7 @@
 <%@ page import="javax.portlet.*"%>
 <%@ page import="java.util.Enumeration"%>
 <%@ page import="java.util.ResourceBundle"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>                            
 
 <%

Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml?rev=771544&r1=771543&r2=771544&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml Tue May  5 03:39:55 2009
@@ -13,24 +13,20 @@
   KIND, either express or implied. See the License for the specific language
   governing permissions and limitations under the License.
 -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    
   <display-name>Demoportlets</display-name>
   <description>Demo Portlets Applications</description>
 
-  <servlet>
-    <servlet-name>JetspeedContainer</servlet-name>
-    <display-name>Jetspeed Container</display-name>
-    <description>MVC Servlet for Jetspeed Portlet Applications</description>
-    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-    <init-param>
-      <param-name>contextName</param-name>
-      <param-value>demo</param-value>
-    </init-param>
-    <load-on-startup>100</load-on-startup>
-  </servlet>
-
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>org.apache.portals.applications.demo.webappRoot</param-value>
+    </context-param>
+    <listener>
+        <listener-class>WebAppRootListener</listener-class>
+    </listener>
+    
   <!-- Define Velocity Servlet -->
   <servlet>
     <servlet-name>velocity</servlet-name>
@@ -58,20 +54,6 @@
     <servlet-class>groovy.servlet.TemplateServlet</servlet-class>
   </servlet>
 
-  <servlet>
-    <servlet-name>SSODemo</servlet-name>
-    <display-name>SSODemo Servlet</display-name>
-    <description>Servlet for Testing SSO</description>
-    <servlet-class>org.apache.portals.applications.demo.servlet.SSODemoServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>SSOBasicDemo</servlet-name>
-    <display-name>SSOBasicDemo Servlet</display-name>
-    <description>Servlet for Testing HTTP Basic Authentication SSO</description>
-    <servlet-class>org.apache.portals.applications.demo.servlet.SSOBasicDemoServlet</servlet-class>
-  </servlet>
-
   <!-- jdp YahooGeocodeProxyServlet -->
   <servlet>
     <servlet-name>YahooGeocodeProxyServlet</servlet-name>
@@ -83,16 +65,6 @@
     <url-pattern>/yahoogeocode</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>SSODemo</servlet-name>
-    <url-pattern>/sso-demo</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>SSOBasicDemo</servlet-name>
-    <url-pattern>/sso-basic</url-pattern>
-  </servlet-mapping>
-
   <!-- Map *.vm files to Velocity  -->
   <servlet-mapping>
     <servlet-name>velocity</servlet-name>
@@ -111,31 +83,6 @@
     <url-pattern>*.gsp</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-    <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-
-  <!-- Portlet tag library TLD -->
-  <taglib>
-    <taglib-uri>portlet.tld</taglib-uri>
-    <taglib-location>/WEB-INF/portlet.tld</taglib-location>
-  </taglib>
-
-  <!-- JSTL tag library TLDs -->
-  <taglib>
-    <taglib-uri>c-rt.tld</taglib-uri>
-    <taglib-location>/WEB-INF/c-rt.tld</taglib-location>
-  </taglib>
-  <taglib>
-    <taglib-uri>c.tld</taglib-uri>
-    <taglib-location>/WEB-INF/c.tld</taglib-location>
-  </taglib>
-
   <!-- JNDI Db resource -->
   <resource-ref>
     <description>DB Connection</description>



Mime
View raw message