geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r369684 - in /geronimo/branches/1.0/applications/daytrader: streamer/ streamer/src/client/META-INF/ wsappclient/ wsappclient/src/client/META-INF/
Date Tue, 17 Jan 2006 04:52:25 GMT
Author: hogstrom
Date: Mon Jan 16 20:52:21 2006
New Revision: 369684

URL: http://svn.apache.org/viewcvs?rev=369684&view=rev
Log:
Additional changes to remove hardcoded dependencies

Modified:
    geronimo/branches/1.0/applications/daytrader/streamer/maven.xml
    geronimo/branches/1.0/applications/daytrader/streamer/project.properties
    geronimo/branches/1.0/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
    geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml
    geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties
    geronimo/branches/1.0/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF

Modified: geronimo/branches/1.0/applications/daytrader/streamer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/streamer/maven.xml?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/streamer/maven.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/streamer/maven.xml Mon Jan 16 20:52:21 2006
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="jar:install">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="jar:jar">
+
   <preGoal name="java:compile">
   </preGoal>
+
+  <preGoal name="jar:jar">
+      <ant:echo>Generating Manifest file for Streamer Application</ant:echo>
+      <ant:mkdir dir="${maven.build.dir}/tmp"/>
+      <ant:echo>And this is found in ${maven.jar.source.path}/client/META-INF</ant:echo>
+     <velocity:merge basedir="${basedir}/src/client/META-INF" template="MANIFEST.MF" name="${maven.build.dir}/tmp/MANIFEST.MF"/>
+  </preGoal>
+
 </project>
 

Modified: geronimo/branches/1.0/applications/daytrader/streamer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/streamer/project.properties?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/streamer/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/streamer/project.properties Mon Jan 16 20:52:21
2006
@@ -1,2 +1,2 @@
 maven.multiproject.type=jar
-maven.jar.manifest=src/client/META-INF/MANIFEST.MF
+maven.jar.manifest=${maven.build.dir}/tmp/MANIFEST.MF

Modified: geronimo/branches/1.0/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
(original)
+++ geronimo/branches/1.0/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
Mon Jan 16 20:52:21 2006
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path:  daytrader-ejb-1.1-SNAPSHOT.jar
+Class-Path:  daytrader-ejb-${daytrader_version}.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.TradeClient

Modified: geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml Mon Jan 16 20:52:21
2006
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="jar:install">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="jar:jar">
+
   <preGoal name="java:compile">
   </preGoal>
+
+  <preGoal name="jar:jar">
+      <ant:echo>Generating Manifest file for Streamer Application</ant:echo>
+      <ant:mkdir dir="${maven.build.dir}/tmp"/>
+      <ant:echo>And this is found in ${maven.jar.source.path}/client/META-INF</ant:echo>
+     <velocity:merge basedir="${basedir}/src/client/META-INF" template="MANIFEST.MF" name="${maven.build.dir}/tmp/MANIFEST.MF"/>
+  </preGoal>
+
 </project>
 

Modified: geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties Mon Jan 16
20:52:21 2006
@@ -1,2 +1,2 @@
 maven.multiproject.type=jar
-maven.jar.manifest=src/client/META-INF/MANIFEST.MF
+maven.jar.manifest=${maven.build.dir}/tmp/MANIFEST.MF

Modified: geronimo/branches/1.0/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF?rev=369684&r1=369683&r2=369684&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
(original)
+++ geronimo/branches/1.0/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
Mon Jan 16 20:52:21 2006
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path: daytrader-ejb-1.1-SNAPSHOT.jar
+Class-Path: daytrader-ejb-${daytrader_version}.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp



Mime
View raw message