You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/07/14 23:16:34 UTC
svn commit: r676741 - in
/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp:
WEB-INF/web.xml index.jsp
Author: jbohn
Date: Mon Jul 14 14:16:34 2008
New Revision: 676741
URL: http://svn.apache.org/viewvc?rev=676741&view=rev
Log:
merge 676738 from branches/2.1 - GERONIMO-4208 Eliminate individual sample references from Geronimo Welcome Page
Modified:
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/web.xml?rev=676741&r1=676740&r2=676741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/web.xml Mon Jul 14 14:16:34 2008
@@ -26,46 +26,46 @@
Welcome to Geronimo
</description>
- <servlet>
- <servlet-name>jsp_sample_installer</servlet-name>
- <servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>
- <init-param>
- <param-name>moduleId</param-name>
- <param-value>org.apache.geronimo.samples/jsp-examples-SERVER//car</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>servlet_sample_installer</servlet-name>
- <servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>
- <init-param>
- <param-name>moduleId</param-name>
- <param-value>org.apache.geronimo.samples/servlet-examples-SERVER//car</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>ldap_sample_installer</servlet-name>
- <servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>
- <init-param>
- <param-name>moduleId</param-name>
- <param-value>org.apache.geronimo.samples/ldap-sample-app-SERVER//car</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>jsp_sample_installer</servlet-name>
- <url-pattern>/jsp-examples/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>servlet_sample_installer</servlet-name>
- <url-pattern>/servlets-examples/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ldap_sample_installer</servlet-name>
- <url-pattern>/ldap-demo/*</url-pattern>
- </servlet-mapping>
+ <!--<servlet>-->
+ <!--<servlet-name>jsp_sample_installer</servlet-name>-->
+ <!--<servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>-->
+ <!--<init-param>-->
+ <!--<param-name>moduleId</param-name>-->
+ <!--<param-value>org.apache.geronimo.samples/jsp-examples-SERVER//car</param-value>-->
+ <!--</init-param>-->
+ <!--</servlet>-->
+
+ <!--<servlet>-->
+ <!--<servlet-name>servlet_sample_installer</servlet-name>-->
+ <!--<servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>-->
+ <!--<init-param>-->
+ <!--<param-name>moduleId</param-name>-->
+ <!--<param-value>org.apache.geronimo.samples/servlet-examples-SERVER//car</param-value>-->
+ <!--</init-param>-->
+ <!--</servlet>-->
+
+ <!--<servlet>-->
+ <!--<servlet-name>ldap_sample_installer</servlet-name>-->
+ <!--<servlet-class>org.apache.geronimo.welcome.AbsentSampleServlet</servlet-class>-->
+ <!--<init-param>-->
+ <!--<param-name>moduleId</param-name>-->
+ <!--<param-value>org.apache.geronimo.samples/ldap-sample-app-SERVER//car</param-value>-->
+ <!--</init-param>-->
+ <!--</servlet>-->
+
+ <!--<servlet-mapping>-->
+ <!--<servlet-name>jsp_sample_installer</servlet-name>-->
+ <!--<url-pattern>/jsp-examples/*</url-pattern>-->
+ <!--</servlet-mapping>-->
+
+ <!--<servlet-mapping>-->
+ <!--<servlet-name>servlet_sample_installer</servlet-name>-->
+ <!--<url-pattern>/servlets-examples/*</url-pattern>-->
+ <!--</servlet-mapping>-->
+
+ <!---<servlet-mapping>-->
+ <!--<servlet-name>ldap_sample_installer</servlet-name>-->
+ <!--<url-pattern>/ldap-demo/*</url-pattern>-->
+ <!--</servlet-mapping>-->
</web-app>
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=676741&r1=676740&r2=676741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Mon Jul 14 14:16:34 2008
@@ -111,10 +111,10 @@
</tr>
<tr>
<td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
- <a href="/servlets-examples/">Servlet Examples </a><br />
- <a href="/jsp-examples/">JSP Examples </a><br />
- <a href="/ldap-demo/">LDAP Demo</a><br />
- <a href="http://geronimo.apache.org/redirects/additionalSamples.html">Additional Samples</a><br />
+ <!--<a href="/servlets-examples/">Servlet Examples </a><br />-->
+ <!--<a href="/jsp-examples/">JSP Examples </a><br />-->
+ <!--<a href="/ldap-demo/">LDAP Demo</a><br />-->
+ <a href="http://geronimo.apache.org/redirects/additionalSamples.html">Geronimo Sample Applications</a><br />
</td>
</tr>
</table>