ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r791626 - in /incubator/ace/trunk: core/build.xml core/lib/bnd.jar webui/build.xml
Date Mon, 06 Jul 2009 22:05:31 GMT
Author: marrs
Date: Mon Jul  6 22:05:31 2009
New Revision: 791626

URL: http://svn.apache.org/viewvc?rev=791626&view=rev
Log:
ACE-23 Applied the (updated) patch from Angelo and added the bnd.jar to our lib directory.

Added:
    incubator/ace/trunk/core/lib/bnd.jar   (with props)
Modified:
    incubator/ace/trunk/core/build.xml
    incubator/ace/trunk/webui/build.xml

Modified: incubator/ace/trunk/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/build.xml?rev=791626&r1=791625&r2=791626&view=diff
==============================================================================
--- incubator/ace/trunk/core/build.xml (original)
+++ incubator/ace/trunk/core/build.xml Mon Jul  6 22:05:31 2009
@@ -57,6 +57,10 @@
 
     <taskdef resource="tasks.properties" classpathref="cobertura.classpath" />
 
+    <taskdef name="bnd-wrap" 
+         classname="aQute.bnd.ant.WrapTask"
+         classpath="lib/bnd.jar"/>
+
     <taskdef name="bundle"
         classname="net.luminis.build.plugin.bnd.BuildTask"
         classpath="lib/net.luminis.build.plugin.jar" />
@@ -232,7 +236,9 @@
         <if>
             <equals arg1="${webui.uptodate}" arg2="true"/>
             <else>
-                <subant buildpath="../webui" antfile="build.xml" target="war"/>
+                <subant buildpath="../webui" target="war">
+                    <reference refid="bnd.classpath"/>
+                </subant>
             </else>
         </if>
         <antcall target="package-webui" />
@@ -520,8 +526,15 @@
     </target>
     
     <target name="package-webui" unless="webui.uptodate">
-    	<!-- TODO put this in a usable bundle -->
-        <copy file="../webui/webui.war" todir="deploy"/>
+    	<!-- TODO add an activator to bridge between OSGi and GWT -->
+        <copy file="../webui/webui.war" tofile="deploy/bundle/org.apache.ace.webui-1.0.0.jar"/>
+    	<echo file="org.apache.ace.webui-1.0.0.bnd">Import-Package: junit.framework;resolution:=optional,
com.google.gwt.benchmarks;resolution:=optional, *
+Bundle-Name: Web UI
+Bundle-ClassPath: WEB-INF/classes, WEB-INF/lib/gwt-servlet.jar
+Bundle-SymbolicName: org.apache.ace.webui"/>
+        </echo>
+        <bnd-wrap jars="deploy/bundle/org.apache.ace.webui-1.0.0.jar" output="deploy/bundle/org.apache.ace.webui-1.0.0.jar"/>
+    	<delete file="org.apache.ace.webui-1.0.0.bnd"/>
     </target>
 
     <target name="package-test" unless="test.uptodate">

Added: incubator/ace/trunk/core/lib/bnd.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/lib/bnd.jar?rev=791626&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/core/lib/bnd.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/ace/trunk/webui/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/build.xml?rev=791626&r1=791625&r2=791626&view=diff
==============================================================================
--- incubator/ace/trunk/webui/build.xml (original)
+++ incubator/ace/trunk/webui/build.xml Mon Jul  6 22:05:31 2009
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="webui" default="build" basedir=".">
-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="../liq/lib/ant-contrib-1.0b3.jar"
/>
+    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="../core/lib/ant-contrib-1.0b3.jar"
/>
   <!-- Configure path to GWT SDK -->
     <property name="gwt.sdk" location="../webui/lib/gwt" />
 
   <path id="project.class.path">
     <pathelement location="war/WEB-INF/classes"/>
     <pathelement location="${gwt.sdk}/gwt-user.jar"/>
+    <path refid="bnd.classpath" />
     <fileset dir="${gwt.sdk}" includes="gwt-dev*.jar"/>
     <!-- Add any additional non-server libs (such as JUnit) -->
     <fileset dir="war/WEB-INF/lib" includes="**/*.jar"/>



Mime
View raw message