[glassfish] 03/40: * Some more fixes.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.

commit 1fb0c0df291a7182c4e9434b40e76848761d4e47
Author: Varun Hiremath <varun at debian.org>
Date:   Sat Oct 27 15:29:46 2007 +0000

    * Some more fixes.
---
 debian/build.xml        | 46 +++++++++++++++++++++++-----------------------
 debian/patches/ejb.diff | 13 +++++++++++++
 debian/patches/series   |  1 +
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 0b22742..92b04f1 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -49,39 +49,39 @@
     <ant dir="../mail" target="all"/>
     <ant dir="../deployment-api" target="all"/>
     <ant dir="../transaction-api" target="all"/>
-    <!-- <ant dir="../servlet-api" target="prepare-jar"/> -->
-    <ant dir="../ejb-api" target="assemble"/>
-    <ant dir="../persistence-api" target="assemble"/>
-    <ant dir="../connector-api" target="assemble"/>
-    <ant dir="../management-api" target="assemble"/>
-    <ant dir="../appserv-api" target="assemble"/>
-    <ant dir="../jms-api" target="assemble"/>
-    <ant dir="../jmac-api" target="assemble"/>
-    <ant dir="../jacc-api" target="assemble"/>
-    <ant dir="../common-util" target="assemble"/>
-    <ant dir="../annotation-framework" target="assemble"/>
-    <ant dir="../appserv-commons" target="assemble"/>
-    <ant dir="../entity-persistence" target="assemble"/>
+    <!-- <ant dir="../servlet-api" target="all"/> -->
+    <ant dir="../jms-api" target="all"/>
+    <ant dir="../ejb-api" target="all"/>
+    <ant dir="../persistence-api" target="all"/>
+    <ant dir="../connector-api" target="all"/>
+    <ant dir="../management-api" target="all"/>
+    <ant dir="../appserv-api" target="all"/>
+    <ant dir="../jmac-api" target="all"/>
+    <ant dir="../jacc-api" target="all"/>
+    <ant dir="../common-util" target="all"/>
+    <ant dir="../annotation-framework" target="all"/>
+    <!-- <ant dir="../appserv-commons" target="all"/> -->
+    <ant dir="../entity-persistence" target="all"/>
     <!-- <ant dir="../jmx-remote" target="all"/> -->
     <!-- <ant dir="../admin-core" target="all"/> -->
-    <ant dir="../jts" target="assemble"/>
+    <!-- <ant dir="../jts" target="all"/> -->
     <!-- <ant dir="../appserv-jstl" target="all"/> -->
-    <ant dir="../pwc-commons" target="assemble"/>
+    <ant dir="../pwc-commons" target="all"/>
     <!-- <ant dir="../appserv-webtier" target="all"/> -->
     <!-- <ant dir="../webtier-extensions" target="all"/> -->
-    <ant dir="../jacc-provider" target="assemble"/>
-    <ant dir="../container-auth" target="assemble"/>
-    <ant dir="../jmac-provider" target="assemble"/>
-    <ant dir="../appserv-core" target="assemble"/>
+    <!-- <ant dir="../jacc-provider" target="all"/> -->
+    <!-- <ant dir="../container-auth" target="all"/> -->
+    <!-- <ant dir="../jmac-provider" target="all"/> -->
+    <!-- <ant dir="../appserv-core" target="all"/> -->
     <!-- <ant dir="../appserv-http-engine" target="all"/> -->
     <!-- <ant dir="../appserv-docs" target="all"/> -->
     <!-- <ant dir="../admin" target="all"/> -->
     <!-- <ant dir="../admin-cli" target="all"/> -->
     <!-- <ant dir="../appserv-addons" target="all"/> -->
-    <ant dir="../jdbcra" target="assemble"/>
-    <!-- <ant dir="../cmp" target="assemble"/> -->
-    <ant dir="../tools" target="assemble"/>
-    <ant dir="../avk" target="assemble"/>
+    <!-- <ant dir="../jdbcra" target="all"/> -->
+    <!-- <ant dir="../cmp" target="all"/> -->
+    <!-- <ant dir="../tools" target="all"/> -->
+    <!-- <ant dir="../avk" target="all"/> -->
     <!-- <ant dir="../appserv-native" target="all"/> -->
   </target>
 
diff --git a/debian/patches/ejb.diff b/debian/patches/ejb.diff
new file mode 100644
index 0000000..a90bdd0
--- /dev/null
+++ b/debian/patches/ejb.diff
@@ -0,0 +1,13 @@
+Index: glassfish-v2+b58g/ejb-api/src/share/classes/javax/ejb/SessionContext.java
+===================================================================
+--- glassfish-v2+b58g.orig/ejb-api/src/share/classes/javax/ejb/SessionContext.java	2007-10-27 19:32:56.000000000 +0530
++++ glassfish-v2+b58g/ejb-api/src/share/classes/javax/ejb/SessionContext.java	2007-10-27 19:34:41.000000000 +0530
+@@ -37,7 +37,7 @@
+ 
+ import java.util.*;
+ import java.security.Identity;
+-import javax.xml.rpc.handler.MessageContext;
++import javax.mail.MessageContext;
+ 
+ /**
+  * The SessionContext interface provides access to the runtime session context 
diff --git a/debian/patches/series b/debian/patches/series
index defc844..e637f0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 properties.diff
+ejb.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git