Return-Path: 
 <scm-return-10090-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 44522 invoked from network); 22 Jan 2006 04:32:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Jan 2006 04:32:06 -0000
Received: (qmail 35499 invoked by uid 500); 22 Jan 2006 04:32:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 35488 invoked by uid 500); 22 Jan 2006 04:32:05 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 35477 invoked by uid 99); 22 Jan 2006 04:32:05 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jan 2006 20:32:05 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 21 Jan 2006 20:32:04 -0800
Received: (qmail 44458 invoked by uid 65534); 22 Jan 2006 04:31:44 -0000
Message-ID: <20060122043144.44457.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r371179 - in /geronimo/branches/1.0/modules/deploy-jsr88:
 maven.xml project.properties src/conf/manifest.mf
Date: Sun, 22 Jan 2006 04:31:43 -0000
To: scm@geronimo.apache.org
From: hogstrom@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: hogstrom
Date: Sat Jan 21 20:31:41 2006
New Revision: 371179

URL: http://svn.apache.org/viewcvs?rev=371179&view=rev
Log:
Corrected hardcoded dependencies in jsr88 deployer

Modified:
    geronimo/branches/1.0/modules/deploy-jsr88/maven.xml
    geronimo/branches/1.0/modules/deploy-jsr88/project.properties
    geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf

Modified: geronimo/branches/1.0/modules/deploy-jsr88/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-jsr88/maven.xml?rev=371179&r1=371178&r2=371179&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-jsr88/maven.xml (original)
+++ geronimo/branches/1.0/modules/deploy-jsr88/maven.xml Sat Jan 21 20:31:41 2006
@@ -19,6 +19,17 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="default">
+
+  <preGoal name="jar:jar">
+      <ant:echo>Generating Manifest file for JSR88-Deployer</ant:echo>
+      <ant:mkdir dir="${maven.build.dir}/tmp"/>
+     <velocity:merge basedir="${basedir}/src/conf" template="manifest.mf" name="${maven.build.dir}/tmp/MANIFEST.MF"/>
+  </preGoal>
 
 </project>

Modified: geronimo/branches/1.0/modules/deploy-jsr88/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-jsr88/project.properties?rev=371179&r1=371178&r2=371179&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-jsr88/project.properties (original)
+++ geronimo/branches/1.0/modules/deploy-jsr88/project.properties Sat Jan 21 20:31:41 2006
@@ -1,4 +1,4 @@
 ##
 ## $Rev$ $Date$
 ##
-maven.jar.manifest=${basedir}/src/conf/manifest.mf
+maven.jar.manifest=${maven.build.dir}/tmp/MANIFEST.MF

Modified: geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf?rev=371179&r1=371178&r2=371179&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf (original)
+++ geronimo/branches/1.0/modules/deploy-jsr88/src/conf/manifest.mf Sat Jan 21 20:31:41 2006
@@ -1,6 +1,2 @@
-Class-Path:  ../lib/geronimo-common-1.0.jar ../lib/geronimo-deployment
- -1.0.jar ../lib/geronimo-deploy-jsr88-1.0.jar ../lib/geronimo-kernel-
- 1.0.jar ../lib/geronimo-system-1.0.jar  ../lib/geronimo-j2ee-deployme
- nt_1.1_spec-1.0.jar ../lib/cglib-nodep-2.1_3.jar ../lib/mx4j-3.0.1.ja
- r ../lib/mx4j-remote-3.0.1.jar
+Class-Path:  ../lib/geronimo-common-${geronimo_version}.jar ../lib/geronimo-deployment-${geronimo_version}.jar ../lib/geronimo-deploy-jsr88-${geronimo_version}.jar ../lib/geronimo-kernel-${geronimo_version}.jar ../lib/geronimo-system-${geronimo_version}.jar  ../lib/geronimo-j2ee-deployment_1.1_spec-${geronimo_spec_j2ee_deployment_version}.jar ../lib/cglib-nodep-${cglib_version}.jar ../lib/mx4j-${mx4j_version}.jar ../lib/mx4j-remote-${mx4j_version}.jar
 J2EE-DeploymentFactory-Implementation-Class: org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl