Author: rhillegas
Date: Fri Jan 16 08:33:45 2009
New Revision: 735048

URL: http://svn.apache.org/viewvc?rev=735048&view=rev
Log:
DERBY-1670: Remove vacuous conditional code which checks for the presence of the felix jar before building EmbeddedActivator and putting it in derby.jar--felix.jar is always present now.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=735048&r1=735047&r2=735048&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Jan 16 08:33:45 2009
@@ -1218,9 +1218,6 @@
       </classpath>
     </java>
 
-    <!-- filter out EmbeddedActivator if osgi.jar is not available -->
-    <antcall target="filteractivator"/>
-
     <echo level="info" message=" creating derby.jar class list "/>
     <java classname="org.apache.derbyBuild.classlister" fork="yes">
       <jvmarg value="-DcloudscapeOnly=true"/>
@@ -1257,10 +1254,7 @@
       <param name="driver.name" value="org.apache.derby.jdbc.AutoloadedDriver"/>
     </antcall>
 
-    <!-- the next two targets are orthogonal. Only one will be executed, -->
-    <!-- depending on whether or not osgi.jar is available.              -->
     <antcall target="derbyjarwithosgi"/>
-    <antcall target="derbyjarwithoutosgi"/>
 
     <!-- add non-class files to jar -->
 
@@ -1283,30 +1277,7 @@
 
   </target>
 
-  <target name="filteractivator" depends="checkosgijar" if="osgijar.unavailable">
-
-    <replaceregexp file="${derby.jar.dir}/lists/otherDerbyClasses.properties"
-                   match="derby.module.osgi.activator=org.apache.derby.osgi.EmbeddedActivator"
-                   replace=""/>
-
-  </target>
-
-  <target name="derbyjarwithoutosgi" depends="checkosgijar" if="osgijar.unavailable">
-
-    <antcall target="make-core-derbyjar-manifest">
-      <param name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
-    </antcall>
-
-    <jar destfile="${derby.jar.dir}/derby.jar"
-         basedir="${out.dir}"
-	 includesfile="${derby.jar.dir}/lists/derby.list"
-         compress="true"
-         filesonly="true"
-         manifest="${derby.jar.dir}/lists/smf.mf"/>
-
-  </target>
-
-  <target name="derbyjarwithosgi" depends="checkosgijar" if="osgijar.available">
+  <target name="derbyjarwithosgi">
 
     <antcall target="make-core-derbyjar-manifest">
       <param name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
@@ -1733,19 +1704,6 @@
     <property name="sanity.name" value="insane"/>
   </target>
 
-  <target name="checkosgijar" depends="setosgiavailable,setosgiunavailable"/>
-  <target name="setosgiavailable">
-    <condition property="osgijar.available">
-      <available file="${osgi}"/>
-    </condition>
-  </target>
-  <target name="setosgiunavailable">
-    <condition property="osgijar.unavailable">
-      <not>
-        <available file="${osgi}"/>
-      </not>
-    </condition>
-  </target>
 
    <target name="getsvnversion">
      <exec executable="svnversion"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml?rev=735048&r1=735047&r2=735048&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml Fri Jan 16 08:33:45 2009
@@ -35,7 +35,7 @@
 <!-- Targets -->
   <target name="osgi" depends="compile_osgi"/>
 
-  <target name="compile_osgi" depends="checkosgijar" if="osgijar.available">
+  <target name="compile_osgi">
     <javac
       source="1.4"
       target="1.4"
@@ -57,9 +57,6 @@
     </javac>
   </target>
 
-  <target name="checkosgijar">
-    <available property="osgijar.available" file="${osgi}"/>
-  </target>
 
 </project>