james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r718425 - in /james/protocols/imap/trunk: build-tools/common-build.xml build-tools/module-build.xml include.properties
Date Mon, 17 Nov 2008 22:51:12 GMT
Author: rdonkin
Date: Mon Nov 17 14:51:12 2008
New Revision: 718425

URL: http://svn.apache.org/viewvc?rev=718425&view=rev
Log:
Enable OSGi

Modified:
    james/protocols/imap/trunk/build-tools/common-build.xml
    james/protocols/imap/trunk/build-tools/module-build.xml
    james/protocols/imap/trunk/include.properties

Modified: james/protocols/imap/trunk/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/common-build.xml?rev=718425&r1=718424&r2=718425&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/common-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/common-build.xml Mon Nov 17 14:51:12 2008
@@ -371,10 +371,40 @@
                     <attribute name='Implementation-Vendor' value='@{vendor.impl}'/>
                     <attribute name="Implementation-Vendor-Id" value="@{vendor.id}"/>
  
                 </manifest>  
-            </jar>   
+            </jar>  
         </sequential>   
     </macrodef>
  
+	   <macrodef name="CreateOSGiJar">
+	        <attribute name='name'/>
+	        <attribute name='bin'/>  
+	        <attribute name='lib'/>
+	        <attribute name='prefix' default='${jars-prefix}'/>
+	        <attribute name='version' default='${version}'/>   
+	        <attribute name='vendor.impl' default='${vendor.impl}'/> 
+	        <attribute name='vendor.spec' default='${vendor.spec}'/>   
+	        <attribute name='vendor.id' default='${vendor.id}'/>   
+	        <attribute name='vendor.impl.title' default='${vendor.impl.title}'/>   
+	        <sequential>
+	        	<CreateJar 
+	        		name='@{name}' 
+	        		bin='@{bin}' 
+	        		lib='@{lib}'
+	        		prefix='@{prefix}'
+	        		version='@{version}'
+	        		vendor.impl='@{vendor.impl}'
+	        		vendor.spec='@{vendor.spec}'
+	        		vendor.id='@{vendor.id}'
+	        		vendor.impl.title='@{vendor.impl.title}'/>
+	        	<!-- OSGi Enable -->
+	            <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bnd.jar}"
/>
+	            <bndwrap 
+	                jars='@{lib}/@{prefix}@{name}-@{version}.jar' 
+	                output='@{lib}/@{prefix}@{name}-@{version}.jar' 
+	                definitions="." />
+	        </sequential>   
+	    </macrodef>
+	
     <macrodef name='CreateJavaDocs'>
         <attribute name='bin' default='${build.javadocs}'/> 
         <attribute name='src' default='${dir.src.java}'/> 

Modified: james/protocols/imap/trunk/build-tools/module-build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/module-build.xml?rev=718425&r1=718424&r2=718425&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/module-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/module-build.xml Mon Nov 17 14:51:12 2008
@@ -98,7 +98,7 @@
         description='Builds and creates distribution without cleaning'
         depends='build, check-environment, conditional-clean, test'
         unless='dont.build.module'>
-        <CreateJar 
+        <CreateOSGiJar 
             name='${name.module}'   
             bin='${dir.build.bin}'
             lib='${dir.stage.james}'/>  

Modified: james/protocols/imap/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/include.properties?rev=718425&r1=718424&r2=718425&view=diff
==============================================================================
--- james/protocols/imap/trunk/include.properties (original)
+++ james/protocols/imap/trunk/include.properties Mon Nov 17 14:51:12 2008
@@ -140,3 +140,7 @@
 jmock.jar=${path.lib.jmock}/${jarname.jmock.jar}
 jarname.junit.jar=junit-3.8.1.jar
 junit.jar=${path.lib.junit}/${jarname.junit.jar}
+
+#------ BND used to OSGi enable build
+bnd.jar=${lib.dir}/biz.aQute/jars/bnd-0.0.249.jar
+



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message