You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by vk...@apache.org on 2009/04/15 23:30:03 UTC
svn commit: r765367 [6/6] - in /portals/applications/demo/trunk: ./
src/main/java/org/apache/jetspeed/demo/css/resources/
src/main/java/org/apache/jetspeed/demo/customerInfo/
src/main/java/org/apache/jetspeed/demo/customerInfo/resources/
src/main/java/...
Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties?rev=765367&r1=765366&r2=765367&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties Wed Apr 15 21:29:55 2009
@@ -29,7 +29,7 @@
runtime.log = velocity.log
# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
-runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+runtime.log.logsystem.class =org.apache.portals.applications.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
# Log4J Category used (default is "velocity")
runtime.log.logsystem.log4j.category = velocity
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=765367&r1=765366&r2=765367&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 Wed Apr 15 21:29:55 2009
@@ -1,30 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-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.
+ 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.
-->
<!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>
- <display-name>HelloWorld-DN</display-name>
- <description>Hello World Description</description>
+ <display-name>Demoportlets</display-name>
+ <description>Demo Portlets Applications</description>
<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>
<display-name>Jetspeed Container</display-name>
@@ -33,105 +31,105 @@
<init-param>
<param-name>contextName</param-name>
<param-value>demo</param-value>
- </init-param>
- <load-on-startup>100</load-on-startup>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+
+ <!-- Define Velocity Servlet -->
+ <servlet>
+ <servlet-name>velocity</servlet-name>
+ <servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.velocity.toolbox</param-name>
+ <param-value>/WEB-INF/velocity/toolbox.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.velocity.properties</param-name>
+ <param-value>/WEB-INF/velocity/velocity.properties</param-value>
+ </init-param>
+ <load-on-startup>10</load-on-startup>
</servlet>
- <!-- Define Velocity Servlet -->
- <servlet>
- <servlet-name>velocity</servlet-name>
- <servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
- <init-param>
- <param-name>org.apache.velocity.toolbox</param-name>
- <param-value>/WEB-INF/velocity/toolbox.xml</param-value>
- </init-param>
- <init-param>
- <param-name>org.apache.velocity.properties</param-name>
- <param-value>/WEB-INF/velocity/velocity.properties</param-value>
- </init-param>
- <load-on-startup>10</load-on-startup>
- </servlet>
-
- <!-- Define Groovlet Servlet -->
- <servlet>
- <servlet-name>Groovlet</servlet-name>
- <servlet-class>groovy.servlet.GroovyServlet</servlet-class>
- </servlet>
-
- <!-- Define Groovy Template Servlet -->
- <servlet>
- <servlet-name>Template</servlet-name>
- <servlet-class>groovy.servlet.TemplateServlet</servlet-class>
- </servlet>
+ <!-- Define Groovlet Servlet -->
+ <servlet>
+ <servlet-name>Groovlet</servlet-name>
+ <servlet-class>groovy.servlet.GroovyServlet</servlet-class>
+ </servlet>
+
+ <!-- Define Groovy Template Servlet -->
+ <servlet>
+ <servlet-name>Template</servlet-name>
+ <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.jetspeed.demo.servlet.SSODemoServlet</servlet-class>
- </servlet>
+ <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.jetspeed.demo.servlet.SSOBasicDemoServlet</servlet-class>
- </servlet>
+ <servlet-class>org.apache.portals.applications.demo.servlet.SSOBasicDemoServlet</servlet-class>
+ </servlet>
- <!-- jdp YahooGeocodeProxyServlet -->
- <servlet>
+ <!-- jdp YahooGeocodeProxyServlet -->
+ <servlet>
<servlet-name>YahooGeocodeProxyServlet</servlet-name>
<servlet-class>org.apache.portals.gems.googlemaps.YahooGeocodeProxyServlet</servlet-class>
- </servlet>
- <!-- jdp Map /yahoogecode files to YahooGeocodeProxy -->
- <servlet-mapping>
+ </servlet>
+ <!-- jdp Map /yahoogecode files to YahooGeocodeProxy -->
+ <servlet-mapping>
<servlet-name>YahooGeocodeProxyServlet</servlet-name>
<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>
- <url-pattern>*.vm</url-pattern>
- </servlet-mapping>
-
- <!-- Map *.groovy to Groovlet -->
- <servlet-mapping>
- <servlet-name>Groovlet</servlet-name>
- <url-pattern>*.groovy</url-pattern>
- </servlet-mapping>
-
- <!-- Map *.gsp to Groovy Template -->
- <servlet-mapping>
- <servlet-name>Template</servlet-name>
- <url-pattern>*.gsp</url-pattern>
- </servlet-mapping>
+ </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>
+ <url-pattern>*.vm</url-pattern>
+ </servlet-mapping>
+
+ <!-- Map *.groovy to Groovlet -->
+ <servlet-mapping>
+ <servlet-name>Groovlet</servlet-name>
+ <url-pattern>*.groovy</url-pattern>
+ </servlet-mapping>
+
+ <!-- Map *.gsp to Groovy Template -->
+ <servlet-mapping>
+ <servlet-name>Template</servlet-name>
+ <url-pattern>*.gsp</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
- <servlet-name>
+ <servlet-name>
JetspeedContainer
</servlet-name>
- <url-pattern>
+ <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>
@@ -141,32 +139,36 @@
<taglib-uri>c.tld</taglib-uri>
<taglib-location>/WEB-INF/c.tld</taglib-location>
</taglib>
-
+
<!-- JNDI Db resource -->
- <resource-ref>
- <description>DB Connection</description>
- <res-ref-name>jdbc/demo</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
+ <resource-ref>
+ <description>DB Connection</description>
+ <res-ref-name>jdbc/demo</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
</resource-ref>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>HTTPBasicDemo</web-resource-name>
<url-pattern>/sso-basic/*</url-pattern>
</web-resource-collection>
<auth-constraint>
- <role-name>tomcat</role-name>
+ <role-name>tomcat</role-name>
</auth-constraint>
</security-constraint>
+ <security-role>
+ <role-name>tomat</role-name>
+ </security-role>
+
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>Jetspeed</realm-name>
</login-config>
<security-role>
- <description>The role that is required to log in to the Agent</description>
+ <description>The role that is required to log in to the Agent</description>
<role-name>agent</role-name>
</security-role>
@@ -175,15 +177,15 @@
<description>The admin role</description>
<role-name>admin</role-name>
</security-role>
-
+
<security-role>
<description>The manager role</description>
<role-name>manager</role-name>
</security-role>
-
+
<security-role>
<description>The user role</description>
<role-name>user</role-name>
</security-role>
-
+
</web-app>