continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r739558 - in /continuum/trunk/continuum-webapp: pom.xml src/main/webapp/WEB-INF/jsp/error/httpError.jsp src/test/tomcat/ src/test/tomcat/tomcat-context-continuum.xml
Date Sat, 31 Jan 2009 14:03:09 GMT
Author: olamy
Date: Sat Jan 31 14:03:09 2009
New Revision: 739558

URL: http://svn.apache.org/viewvc?rev=739558&view=rev
Log:
add tomcat-maven-plugin configuration

Added:
    continuum/trunk/continuum-webapp/src/test/tomcat/   (with props)
    continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml   (with
props)
Modified:
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=739558&r1=739557&r2=739558&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Sat Jan 31 14:03:09 2009
@@ -283,6 +283,33 @@
         </dependencies>
       </plugin>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <configuration>
+          <path>/continuum</path>
+          <port>9090</port>
+          <contextFile>${basedir}/src/test/tomcat/tomcat-context-continuum.xml</contextFile>
+          <systemProperties>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+            <appserver.home>${project.build.directory}/appserver-home</appserver.home>
+            <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
+          </systemProperties>          
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.1.3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+          </dependency>
+        </dependencies>        
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -642,7 +669,7 @@
                 <configuration>
                   <tasks>
                     <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml"
todir="${basedir}/src/main/webapp/WEB-INF/classes" />
-					<copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${project.build.directory}/classes"
/>
+					          <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${project.build.directory}/classes"
/>
                   </tasks>
                 </configuration>
               </execution>
@@ -671,5 +698,25 @@
         </plugins>
       </build>      
     </profile>  
+    <profile>
+      <!-- local dev settings use a file which is ignore in svn -->
+      <id>local-tomcat-env</id>
+      <activation>
+        <file>
+          <exists>src/test/tomcat/tomcat-context-local.xml</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>tomcat-maven-plugin</artifactId>
+            <configuration>
+              <contextFile>${basedir}/src/test/tomcat/tomcat-context-local.xml</contextFile>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>      
+    </profile>    
   </profiles>
 </project>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp?rev=739558&r1=739557&r2=739558&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp Sat Jan
31 14:03:09 2009
@@ -50,14 +50,14 @@
 </head>
 
 <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
-<%@ include file="/WEB-INF/jsp/navigations/DefaultTop.jsp" %>
+<s:include value="/WEB-INF/jsp/navigations/DefaultTop.jsp"/>
 
 <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
   <tbody>
     <tr valign="top">
       <td id="leftcol" width="180">
         <br/> <br/>
-        <%@ include file="/WEB-INF/jsp/navigations/Menu.jsp" %>
+        <s:include value="/WEB-INF/jsp/navigations/Menu.jsp"/>
       </td>
       <td width="86%">
         <br/>
@@ -105,8 +105,7 @@
     </tr>
   </tbody>
 </table>
-
-<%@ include file="/WEB-INF/jsp/navigations/DefaultBottom.jsp" %>
+<s:include value="/WEB-INF/jsp/navigations/DefaultBottom.jsp"/>
 </body>
 </html>
 </s:i18n>
\ No newline at end of file

Propchange: continuum/trunk/continuum-webapp/src/test/tomcat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 31 14:03:09 2009
@@ -0,0 +1 @@
+tomcat-context-local.xml

Added: continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml?rev=739558&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml (added)
+++ continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml Sat Jan
31 14:03:09 2009
@@ -0,0 +1,37 @@
+<?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.
+  -->
+  <Context path="/continuum">
+    <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+              username="sa"
+              password=""
+              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+              url="jdbc:derby:${catalina.base}/target/database/users;create=true"
+    />
+    <Resource name="jdbc/continuum" auth="Container" type="javax.sql.DataSource"
+              username="sa"
+              password=""
+              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+              url="jdbc:derby:${catalina.base}/target/database/continuum;create=true"
+    />
+    <Resource name="mail/Session" auth="Container"
+            type="javax.mail.Session"
+            mail.smtp.host="localhost"/>
+                
+</Context>

Propchange: continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message