[pkg-java] r4478 - in trunk/glassfish/debian: . patches

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-10-27 15:29:46 +0000 (Sat, 27 Oct 2007)
New Revision: 4478

Added:
   trunk/glassfish/debian/patches/ejb.diff
Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/patches/series
Log:
* Some more fixes.


Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2007-10-27 15:25:39 UTC (rev 4477)
+++ trunk/glassfish/debian/build.xml	2007-10-27 15:29:46 UTC (rev 4478)
@@ -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>
 

Added: trunk/glassfish/debian/patches/ejb.diff
===================================================================
--- trunk/glassfish/debian/patches/ejb.diff	                        (rev 0)
+++ trunk/glassfish/debian/patches/ejb.diff	2007-10-27 15:29:46 UTC (rev 4478)
@@ -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 

Modified: trunk/glassfish/debian/patches/series
===================================================================
--- trunk/glassfish/debian/patches/series	2007-10-27 15:25:39 UTC (rev 4477)
+++ trunk/glassfish/debian/patches/series	2007-10-27 15:29:46 UTC (rev 4478)
@@ -1 +1,2 @@
 properties.diff
+ejb.diff