Author: ate
Date: Mon Feb 26 12:50:39 2007
New Revision: 512004

URL: http://svn.apache.org/viewvc?view=rev&rev=512004
Log:
Removing the harcoded jetspeed-2 portal container integration from the bridges 
demo wars.
This makes them jetspeed-2 independent and they can now again be deployed to 
other portal containers.

Removed:
    
portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/tags/portlet.tld
Modified:
    portals/bridges/trunk/applications/jpetstore/src/webapp/WEB-INF/web.xml
    portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml
    portals/bridges/trunk/applications/perl/src/webapp/WEB-INF/web.xml
    portals/bridges/trunk/applications/php/src/webapp/WEB-INF/web.xml
    portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml

Modified: 
portals/bridges/trunk/applications/jpetstore/src/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jpetstore/src/webapp/WEB-INF/web.xml?view=diff&rev=512004&r1=512003&r2=512004
==============================================================================
--- portals/bridges/trunk/applications/jpetstore/src/webapp/WEB-INF/web.xml 
(original)
+++ portals/bridges/trunk/applications/jpetstore/src/webapp/WEB-INF/web.xml Mon 
Feb 26 12:50:39 2007
@@ -46,27 +46,6 @@
     <load-on-startup>2</load-on-startup>
   </servlet>
         
-  <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>jpetstore</param-value>
-    </init-param>                          
-    <load-on-startup>100</load-on-startup>      
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-    
   <servlet-mapping>
     <servlet-name>action</servlet-name>
     <url-pattern>*.shtml</url-pattern>

Modified: portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml?view=diff&rev=512004&r1=512003&r2=512004
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml 
(original)
+++ portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml Mon 
Feb 26 12:50:39 2007
@@ -167,27 +167,6 @@
        <load-on-startup>1</load-on-startup>
        </servlet>
     
-  <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>jsf-demo</param-value>
-    </init-param>                          
-    <load-on-startup>100</load-on-startup>      
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-    
        <!-- extension mapping -->
        <servlet-mapping>
                <servlet-name>Faces Servlet</servlet-name>

Modified: portals/bridges/trunk/applications/perl/src/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/perl/src/webapp/WEB-INF/web.xml?view=diff&rev=512004&r1=512003&r2=512004
==============================================================================
--- portals/bridges/trunk/applications/perl/src/webapp/WEB-INF/web.xml 
(original)
+++ portals/bridges/trunk/applications/perl/src/webapp/WEB-INF/web.xml Mon Feb 
26 12:50:39 2007
@@ -19,28 +19,6 @@
 <web-app>
   <display-name>Perl Portlets</display-name>
   <description>Perl Portlets Running Perlscripts in a frame</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>perl</param-value>
-    </init-param>                          
-    <load-on-startup>100</load-on-startup>      
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-    
 </web-app>
 
 

Modified: portals/bridges/trunk/applications/php/src/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/php/src/webapp/WEB-INF/web.xml?view=diff&rev=512004&r1=512003&r2=512004
==============================================================================
--- portals/bridges/trunk/applications/php/src/webapp/WEB-INF/web.xml (original)
+++ portals/bridges/trunk/applications/php/src/webapp/WEB-INF/web.xml Mon Feb 
26 12:50:39 2007
@@ -19,26 +19,4 @@
 <web-app>
         <display-name>PHP Portlets</display-name>
         <description>PHP Demo Portlet</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>php</param-value>
-    </init-param>                          
-    <load-on-startup>100</load-on-startup>      
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-    
  </web-app>

Modified: 
portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml?view=diff&rev=512004&r1=512003&r2=512004
==============================================================================
--- portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml 
(original)
+++ portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml Mon 
Feb 26 12:50:39 2007
@@ -40,27 +40,6 @@
                <load-on-startup>1</load-on-startup>
        </servlet>
 
-  <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>springmvc</param-value>
-    </init-param>                          
-    <load-on-startup>100</load-on-startup>      
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>
-       /container/*
-     </url-pattern>
-  </servlet-mapping>
-    
        <servlet-mapping>
                <servlet-name>ViewRendererServlet</servlet-name>
                <url-pattern>/WEB-INF/servlet/view</url-pattern>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to