geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r793721 - in /geronimo/daytrader/trunk: ./ daytrader-webonly/src/main/webapp/WEB-INF/classes/ modules/dojo-ui-web/ modules/json-proxy/ modules/web/ modules/web/src/main/webapp/WEB-INF/classes/
Date Mon, 13 Jul 2009 21:36:27 GMT
Author: jbohn
Date: Mon Jul 13 21:36:26 2009
New Revision: 793721

URL: http://svn.apache.org/viewvc?rev=793721&view=rev
Log:
update to genesis 2.0 - also remove some filtering and related files from maven-war-plugin
references as they appear to be no longer necessary and cause problems with the 2.1-alpha-1
maven-war-plugin

Removed:
    geronimo/daytrader/trunk/daytrader-webonly/src/main/webapp/WEB-INF/classes/build.properties
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties
Modified:
    geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml
    geronimo/daytrader/trunk/modules/json-proxy/pom.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml?rev=793721&r1=793720&r2=793721&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml Mon Jul 13 21:36:26 2009
@@ -77,11 +77,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>
-                            ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
-                        </filter>
-                    </filters>
                     <archive>
                         <manifestEntries>
                             <Class-Path/>

Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=793721&r1=793720&r2=793721&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Mon Jul 13 21:36:26 2009
@@ -63,11 +63,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
-                        <filter>
-                            ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
-                        </filter>
-                    </filters>
                     <archive>
                         <manifestEntries>
                             <Class-Path/>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=793721&r1=793720&r2=793721&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Mon Jul 13 21:36:26 2009
@@ -115,11 +115,6 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <!-- <webXml>${basedir}/target/jspweb.xml</webXml> Removed
per DATRADER-7 due to interop issues on commercial AppServers -->
-                    <filters>
-                        <filter>
-                            ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
-                        </filter>
-                    </filters>
                     <archive>
                         <manifestEntries>
                             <Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=793721&r1=793720&r2=793721&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Mon Jul 13 21:36:26 2009
@@ -20,9 +20,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>
@@ -380,36 +380,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-
-        <!-- Apache Nexus Snapshot repo -->
-        <repository>
-            <id>apache.nexus.snapshots</id>
-            <name>Apache Nexus Repository</name>
-            <url>https://repository.apache.org/content/repositories/snapshots</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <profiles>
         <profile>
             <id>jboss-db2</id>



Mime
View raw message