directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r546347 - in /directory/sandbox/erodriguez/kerberos-spnego: pom.xml src/main/resources/jetty-config.xml src/main/webapp/ src/webapp/
Date Tue, 12 Jun 2007 01:26:43 GMT
Author: erodriguez
Date: Mon Jun 11 18:26:43 2007
New Revision: 546347

URL: http://svn.apache.org/viewvc?view=rev&rev=546347
Log:
o  Moved the web app source directory to src/main/webapp to better follow Maven convention.
o  Corrected logging issue by changing nlog4j scope.
o  Added support to POM for 'maven-jetty-plugin'.

Added:
    directory/sandbox/erodriguez/kerberos-spnego/src/main/webapp/
      - copied from r545986, directory/sandbox/erodriguez/kerberos-spnego/src/webapp/
Removed:
    directory/sandbox/erodriguez/kerberos-spnego/src/webapp/
Modified:
    directory/sandbox/erodriguez/kerberos-spnego/pom.xml
    directory/sandbox/erodriguez/kerberos-spnego/src/main/resources/jetty-config.xml

Modified: directory/sandbox/erodriguez/kerberos-spnego/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/erodriguez/kerberos-spnego/pom.xml?view=diff&rev=546347&r1=546346&r2=546347
==============================================================================
--- directory/sandbox/erodriguez/kerberos-spnego/pom.xml (original)
+++ directory/sandbox/erodriguez/kerberos-spnego/pom.xml Mon Jun 11 18:26:43 2007
@@ -23,7 +23,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>nlog4j</artifactId>
             <version>1.2.25</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>wicket</groupId>
@@ -86,6 +85,13 @@
         </testResources>
         <plugins>
             <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <configuration>
+                    <contextPath>/spnego</contextPath>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -102,9 +108,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <webXml>${basedir}/src/webapp/WEB-INF/web.xml</webXml>
+                    <webXml>${basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
                     <warName>spnego-example</warName>
-                    <warSourceDirectory>src/webapp</warSourceDirectory>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>

Modified: directory/sandbox/erodriguez/kerberos-spnego/src/main/resources/jetty-config.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/erodriguez/kerberos-spnego/src/main/resources/jetty-config.xml?view=diff&rev=546347&r1=546346&r2=546347
==============================================================================
--- directory/sandbox/erodriguez/kerberos-spnego/src/main/resources/jetty-config.xml (original)
+++ directory/sandbox/erodriguez/kerberos-spnego/src/main/resources/jetty-config.xml Mon Jun
11 18:26:43 2007
@@ -41,7 +41,7 @@
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Call name="addWebApplication">
     <Arg>/spnego</Arg>
-    <Arg>src/webapp</Arg>
+    <Arg>src/main/webapp</Arg>
   </Call>
 
   <!-- =============================================================== -->



Mime
View raw message