You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2003/12/07 00:22:18 UTC
cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout columns.jsp
raphael 2003/12/06 15:22:18
Modified: portal/src/webapp/WEB-INF Tag: aggregation_1-branch web.xml
Added: portal/src/webapp/WEB-INF Tag: aggregation_1-branch
portlet.tld portlet.xml
portal/src/webapp/WEB-INF/layout Tag: aggregation_1-branch
columns.jsp
Log:
add a layout portlet application to jetspeed webapp
Revision Changes Path
No revision
No revision
1.2.2.1 +26 -13 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- web.xml 10 Aug 2003 11:25:45 -0000 1.2
+++ web.xml 6 Dec 2003 23:22:18 -0000 1.2.2.1
@@ -2,7 +2,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
@@ -24,6 +24,14 @@
<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>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
<servlet-name>
jetspeed
@@ -39,28 +47,33 @@
<url-pattern>
/jetspeed/*
</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Login</web-resource-name>
- <url-pattern>/LogInRedirector.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
+ <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Login</web-resource-name>
+ <url-pattern>/LogInRedirector.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
<!-- Login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
- <realm-name>Intranet</realm-name>
+ <realm-name>Intranet</realm-name>
<form-login-config>
<form-login-page>/login.jsp</form-login-page>
<form-error-page>/error.jsp</form-error-page>
No revision
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- web.xml 10 Aug 2003 11:25:45 -0000 1.2
+++ web.xml 6 Dec 2003 23:22:18 -0000 1.2.2.1
@@ -2,7 +2,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
@@ -24,6 +24,14 @@
<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>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
<servlet-name>
jetspeed
@@ -39,28 +47,33 @@
<url-pattern>
/jetspeed/*
</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Login</web-resource-name>
- <url-pattern>/LogInRedirector.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
+ <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Login</web-resource-name>
+ <url-pattern>/LogInRedirector.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
<!-- Login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
- <realm-name>Intranet</realm-name>
+ <realm-name>Intranet</realm-name>
<form-login-config>
<form-login-page>/login.jsp</form-login-page>
<form-error-page>/error.jsp</form-error-page>
No revision
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- web.xml 10 Aug 2003 11:25:45 -0000 1.2
+++ web.xml 6 Dec 2003 23:22:18 -0000 1.2.2.1
@@ -2,7 +2,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
@@ -24,6 +24,14 @@
<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>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
<servlet-name>
jetspeed
@@ -39,28 +47,33 @@
<url-pattern>
/jetspeed/*
</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Login</web-resource-name>
- <url-pattern>/LogInRedirector.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
+ <!-- Protect LogInRedirectory.jsp. This will require a login when called -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Login</web-resource-name>
+ <url-pattern>/LogInRedirector.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
<!-- Login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
- <realm-name>Intranet</realm-name>
+ <realm-name>Intranet</realm-name>
<form-login-config>
<form-login-page>/login.jsp</form-login-page>
<form-error-page>/error.jsp</form-error-page>
1.1.2.1 +87 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/Attic/portlet.tld
1.1.2.1 +32 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/Attic/portlet.xml
No revision
No revision
1.1.2.1 +38 -0 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/Attic/columns.jsp
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org