Author: varun-guest
Date: 2007-11-07 18:07:06 +0000 (Wed, 07 Nov 2007)
New Revision: 4658
Added:
trunk/jbossas4/debian/libjboss-security-java.install
trunk/jbossas4/debian/libjboss-transaction-java.install
trunk/jbossas4/debian/patches/SunConfigParser.diff
Modified:
trunk/jbossas4/debian/build.xml
trunk/jbossas4/debian/control
trunk/jbossas4/debian/patches/series
trunk/jbossas4/debian/rules
Log:
* Add jboss-transaction and jboss-security binary packages -> Builds now!
Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml 2007-11-07 11:06:29 UTC (rev 4657)
+++ trunk/jbossas4/debian/build.xml 2007-11-07 18:07:06 UTC (rev 4658)
@@ -3,7 +3,6 @@
<project default="jar" name="${project.name}" basedir="..">
<target name="clean">
- <delete dir="all-sources" quiet="true"/>
<delete dir="${test.dir}/${class.dir}" quiet="true"/>
<delete dir="${jmx.dir}/${class.dir}" quiet="true"/>
<delete dir="${j2ee.dir}/${class.dir}" quiet="true"/>
@@ -11,13 +10,20 @@
<delete dir="${ejb3x.dir}/${class.dir}" quiet="true"/>
<delete dir="${jaxrpc.dir}/${class.dir}" quiet="true"/>
<delete dir="${naming.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${deployment.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${transaction.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${security.dir}/${class.dir}" quiet="true"/>
<delete file="${test.jar}" quiet="true"/>
<delete file="${ejb3x.jar}" quiet="true"/>
<delete file="${jmx.jar}" quiet="true"/>
<delete file="${system.jar}" quiet="true"/>
<delete file="${j2ee.jar}" quiet="true"/>
<delete file="${jaxrpc.jar}" quiet="true"/>
- <delete file="${naming.jar}" quiet="true"/>
+ <delete file="${jnpserver.jar}" quiet="true"/>
+ <delete file="${jnpclient.jar}" quiet="true"/>
+ <delete file="${deployment.jar}" quiet="true"/>
+ <delete file="${transaction.jar}" quiet="true"/>
+ <delete file="${security.jar}" quiet="true"/>
</target>
<target name="jar">
@@ -116,8 +122,7 @@
debug="true">
<classpath>
<fileset dir=".">
- <include name='*.jar'>
- </include>
+ <include name='*.jar'/>
</fileset>
</classpath>
</javac>
@@ -126,9 +131,39 @@
<fileset dir="${deployment.dir}/${class.dir}">
<include name="**"/>
</fileset>
+ </jar>
+ <mkdir dir="${transaction.dir}/${class.dir}"/>
+ <javac srcdir="${transaction.dir}/${source.dir}"
destdir="${transaction.dir}/${class.dir}"
+ debug="true">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${transaction.jar}">
+ <fileset dir="${transaction.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
</jar>
+ <mkdir dir="${security.dir}/${class.dir}"/>
+ <javac srcdir="${security.dir}/${source.dir}"
destdir="${security.dir}/${class.dir}"
+ debug="true" source="1.5">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${security.jar}">
+ <fileset dir="${security.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
</target>
-
</project>
Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control 2007-11-07 11:06:29 UTC (rev 4657)
+++ trunk/jbossas4/debian/control 2007-11-07 18:07:06 UTC (rev 4658)
@@ -111,3 +111,33 @@
Java programming model.
.
This package ships the jboss-deployment libraries.
+
+Package: libjboss-transaction-java
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime |
java2-runtime
+Description: JBoss System
+ A J2EE certified platform for developing and deploying enterprise Java
+ applications, Web applications, and Portals, JBoss Application Server
+ provides the full range of J2EE 1.4 features as well as extended
+ enterprise services including clustering, caching, and persistence.
+ .
+ JBoss Application Server includes support for Enterprise Java Beans
+ (EJB) 3.0 which is designed to dramatically simplify the enterprise
+ Java programming model.
+ .
+ This package ships the jboss-transaction libraries.
+
+Package: libjboss-security-java
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime |
java2-runtime
+Description: JBoss System
+ A J2EE certified platform for developing and deploying enterprise Java
+ applications, Web applications, and Portals, JBoss Application Server
+ provides the full range of J2EE 1.4 features as well as extended
+ enterprise services including clustering, caching, and persistence.
+ .
+ JBoss Application Server includes support for Enterprise Java Beans
+ (EJB) 3.0 which is designed to dramatically simplify the enterprise
+ Java programming model.
+ .
+ This package ships the jboss-security libraries.
Copied: trunk/jbossas4/debian/libjboss-security-java.install (from rev 4657,
trunk/jbossas4/debian/libjboss-jmx-java.install)
===================================================================
--- trunk/jbossas4/debian/libjboss-security-java.install
(rev 0)
+++ trunk/jbossas4/debian/libjboss-security-java.install 2007-11-07
18:07:06 UTC (rev 4658)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/jboss-security*
Copied: trunk/jbossas4/debian/libjboss-transaction-java.install (from rev 4657,
trunk/jbossas4/debian/libjboss-deployment-java.install)
===================================================================
--- trunk/jbossas4/debian/libjboss-transaction-java.install
(rev 0)
+++ trunk/jbossas4/debian/libjboss-transaction-java.install 2007-11-07
18:07:06 UTC (rev 4658)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/jboss-transaction*
Added: trunk/jbossas4/debian/patches/SunConfigParser.diff
===================================================================
--- trunk/jbossas4/debian/patches/SunConfigParser.diff
(rev 0)
+++ trunk/jbossas4/debian/patches/SunConfigParser.diff 2007-11-07 18:07:06 UTC
(rev 4658)
@@ -0,0 +1,49 @@
+Index:
jbossas4-4.2.2.GA/security/src/main/org/jboss/security/auth/login/SunConfigParser.jj
+===================================================================
+---
jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/auth/login/SunConfigParser.jj
2007-11-07 21:55:47.000000000 +0530
++++
jbossas4-4.2.2.GA/security/src/main/org/jboss/security/auth/login/SunConfigParser.jj
2007-11-07 21:56:54.000000000 +0530
+@@ -205,17 +205,17 @@
+ {
+ Token t = null;
+ String loginModuleClassName;
+- HashMap options = new HashMap();
++ HashMap hashmap = new HashMap();
+ LoginModuleControlFlag controlFlag;
+ AppConfigurationEntry entry;
+ }
+ {
+ t=<CLASSNAME> { loginModuleClassName = t.image; }
+ controlFlag = controlFlag()
+- ( moduleOptions(options) )*
++ ( moduleOptions(hashmap) )*
+ <SEMI_COLON>
+ {
+- entry = new AppConfigurationEntry(loginModuleClassName, controlFlag,
options);
++ entry = new AppConfigurationEntry(loginModuleClassName, controlFlag,
hashmap);
+ return entry;
+ }
+ }
+@@ -240,7 +240,7 @@
+ }
+ }
+
+-void moduleOptions(HashMap options) :
++void moduleOptions(HashMap hashmap) :
+ {
+ Token t;
+ String name, value;
+@@ -253,12 +253,12 @@
+ ( t=<IDENTIFIER> | t=<CLASSNAME> | t=<DOUBLE> | t=<LONG> | t=<ANY> )
+ {
+ value = t.image;
+- options.put(name, value);
++ hashmap.put(name, value);
+ }
+ | t=<STRING>
+ {
+ value = stripQuotes(t.image);
+- options.put(name, value);
++ hashmap.put(name, value);
+ }
+ )
+ }
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2007-11-07 11:06:29 UTC (rev
4657)
+++ trunk/jbossas4/debian/patches/series 2007-11-07 18:07:06 UTC (rev
4658)
@@ -1,3 +1,4 @@
+SunConfigParser.diff
dom4j.diff
collection.diff
concurrent.diff
Modified: trunk/jbossas4/debian/rules
===================================================================
--- trunk/jbossas4/debian/rules 2007-11-07 11:06:29 UTC (rev 4657)
+++ trunk/jbossas4/debian/rules 2007-11-07 18:07:06 UTC (rev 4658)
@@ -9,8 +9,19 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := jboss-common junit log4j-1.2 jboss-profiler
ant-junit commons-httpclient \
bcel concurrent dom4j jboss-xml-binding servlet-api
gnu-getopt glassfish-javaee \
- glassfish-activation glassfish-ejb-api jaxrpc
+ glassfish-activation glassfish-ejb-api jaxrpc
javassist
+clean::
+ $(RM) debian/build-javacc
+
+post-patches:: debian/build-javacc
+debian/build-javacc::
+ (cd messaging/src/main/org/jboss/mq/selectors;\
+ javacc -STATIC=false -debug_parser SelectorParser.jj)
+ (cd security/src/main/org/jboss/security/auth/login;\
+ javacc -STATIC=false -debug_parser SunConfigParser.jj)
+ touch $@
+
ALL_JARS = $(wildcard *.jar)
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
