geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r586099 - in /geronimo/samples/trunk/samples/dbtester: dbtester-ear/ dbtester-war/pom.xml dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml pom.xml
Date Thu, 18 Oct 2007 19:34:26 GMT
Author: gawor
Date: Thu Oct 18 12:34:25 2007
New Revision: 586099

URL: http://svn.apache.org/viewvc?rev=586099&view=rev
Log:
build war only to match what the wiki says

Added:
    geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
Removed:
    geronimo/samples/trunk/samples/dbtester/dbtester-ear/
Modified:
    geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/trunk/samples/dbtester/pom.xml

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml?rev=586099&r1=586098&r2=586099&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml Thu Oct 18 12:34:25 2007
@@ -41,19 +41,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -82,6 +82,19 @@
                                 <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>install</phase>
+                        <id>copy-parent-target</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying ${pom.build.finalName}.war file to parent</echo>
+                                <copy file ="${project.build.directory}/${pom.artifactId}-${version}.war"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
                             </tasks>
                         </configuration>
                     </execution>

Added: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=586099&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
Thu Oct 18 12:34:25 2007
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        
+    <environment>
+        <moduleId>
+            <groupId>org.apache.geronimo.samples.dbtester</groupId>
+            <artifactId>dbtester</artifactId>
+            <version>2.0</version>
+        </moduleId>
+    </environment>
+                
+    <context-root>/dbtester</context-root>
+
+</web-app>
+

Propchange: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/samples/trunk/samples/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/pom.xml?rev=586099&r1=586098&r2=586099&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/pom.xml Thu Oct 18 12:34:25 2007
@@ -41,7 +41,6 @@
     
    <modules>
         <module>dbtester-war</module>
-        <module>dbtester-ear</module>
     </modules>
 
 



Mime
View raw message