geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r661518 - in /geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF: geronimo-web.xml web.xml
Date Thu, 29 May 2008 22:47:09 GMT
Author: djencks
Date: Thu May 29 15:47:09 2008
New Revision: 661518

URL: http://svn.apache.org/viewvc?rev=661518&view=rev
Log:
mostly reformatting, also include SampleDatabase dependency

Modified:
    geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=661518&r1=661517&r2=661518&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
Thu May 29 15:47:09 2008
@@ -20,15 +20,24 @@
 <web-app
         xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <environment>
-        <moduleId>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </moduleId>
-    </environment>
-
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+      <dep:artifactId>timereport-plugin</dep:artifactId>
+      <dep:version>${version}</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+        <dep:artifactId>SampleDatasource</dep:artifactId>
+        <dep:version>${version}</dep:version>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
     <context-root>/timereport</context-root>
 
     <security-realm-name>TimeReportRealm</security-realm-name>

Modified: geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml?rev=661518&r1=661517&r2=661518&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml
Thu May 29 15:47:09 2008
@@ -18,69 +18,69 @@
     under the License.
 -->
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
 	 http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	 version="2.4">	
-	 
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-  	</welcome-file-list>
-  	
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>employee</web-resource-name>
-			<url-pattern>/employee/*</url-pattern>			
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>employee</role-name>			 
-		</auth-constraint>
-	</security-constraint>
-	
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>manager</web-resource-name>
-			<url-pattern>/manager/*</url-pattern>			
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>manager</role-name>
-		</auth-constraint>
-	</security-constraint>
-	
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>TimeReportRealm</realm-name>
-		<form-login-config>
-			<form-login-page>/login/login.jsp</form-login-page>
-			<form-error-page>/login/login_error.jsp</form-error-page>
-		</form-login-config>
-	</login-config>
-	
-	<security-role>
-		<role-name>employee</role-name>		
-    	</security-role>
-	<security-role>
-		<role-name>manager</role-name>		
+         version="2.4">
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>employee</web-resource-name>
+            <url-pattern>/employee/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>employee</role-name>
+        </auth-constraint>
+    </security-constraint>
+
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>manager</web-resource-name>
+            <url-pattern>/manager/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>manager</role-name>
+        </auth-constraint>
+    </security-constraint>
+
+    <login-config>
+        <auth-method>FORM</auth-method>
+        <realm-name>TimeReportRealm</realm-name>
+        <form-login-config>
+            <form-login-page>/login/login.jsp</form-login-page>
+            <form-error-page>/login/login_error.jsp</form-error-page>
+        </form-login-config>
+    </login-config>
+
+    <security-role>
+        <role-name>employee</role-name>
     </security-role>
-    	
+    <security-role>
+        <role-name>manager</role-name>
+    </security-role>
+
+    <servlet>
+        <display-name>AddTimeRecordServlet</display-name>
+        <servlet-name>AddTimeRecordServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.timereport.web.AddTimeRecordServlet</servlet-class>
+    </servlet>
     <servlet>
-	    <display-name>AddTimeRecordServlet</display-name>
-	    <servlet-name>AddTimeRecordServlet</servlet-name>
-	    <servlet-class>org.apache.geronimo.samples.timereport.web.AddTimeRecordServlet</servlet-class>
-  	</servlet>
-  	<servlet>
-	    <display-name>AddEmployeeServlet</display-name>
-	    <servlet-name>AddEmployeeServlet</servlet-name>
-	    <servlet-class>org.apache.geronimo.samples.timereport.web.AddEmployeeServlet</servlet-class>
-  	</servlet>
-  	
-  	<servlet-mapping>
-	    <servlet-name>AddTimeRecordServlet</servlet-name>
-	    <url-pattern>/employee/add_timerecord</url-pattern>
+        <display-name>AddEmployeeServlet</display-name>
+        <servlet-name>AddEmployeeServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.timereport.web.AddEmployeeServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>AddTimeRecordServlet</servlet-name>
+        <url-pattern>/employee/add_timerecord</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-	    <servlet-name>AddEmployeeServlet</servlet-name>
-	    <url-pattern>/manager/add_employee</url-pattern>
+        <servlet-name>AddEmployeeServlet</servlet-name>
+        <url-pattern>/manager/add_employee</url-pattern>
     </servlet-mapping>
-        
+
 </web-app>
\ No newline at end of file



Mime
View raw message