Commits

jrosenberg  committed ed9d176

Issue number: QUARTZ-349, QUARTZ-344, QUARTZ-324
Create a quartz-all.jar that includes the complete contents of build.java
Build the weblogic jar based on presence of weblogic class actually used
Fix location of osbuild.xml to look under opensymphony/common
Also fixed some properties to be location rather than value (because they are), and added explicit check that osbuild.xml is present.

git-svn-id: http://svn.opensymphony.com/svn/quartz/branches/b_quartz_1-5-x@37469f7d36a-ea1c-0410-88ea-9fd03e4c9665

  • Participants
  • Parent commits 949c041
  • Branches b_quartz_1-5-x

Comments (0)

Files changed (1)

 
     <property file="build.properties"/>
 
-	
+    <property name="opensymphony.project.dir" location="../opensymphony"/>
+   
 	<copy todir="${basedir}" failonerror="false" overwrite="true">
-        <fileset file="../opensymphony/osbuild.xml" />
-        <fileset file="../opensymphony/EMPTY.MF" />
+        <fileset file="${opensymphony.project.dir}/common/osbuild.xml" />
+        <fileset file="${opensymphony.project.dir}/common/EMPTY.MF" />
     </copy>
 
-    <property name="common.build" value="./osbuild.xml"/>
+    <property name="common.build" location="./osbuild.xml"/>
 
+    <available file="${common.build}" property="common.build.present"/>
+    <fail unless="common.build.present">
+        Unable to find common build file: ${common.build}
+        Please get the "opensymphony" project from cvs to location: ${opensymphony.project.dir}
+    </fail>   
+   
 	<import file="${common.build}"/>
 
-	<property name="src.jboss" value="${src}/jboss"/>
-	<property name="src.oracle" value="${src}/oracle"/>
-	<property name="src.weblogic" value="${src}/weblogic"/>
+	<property name="src.jboss" location="${src}/jboss"/>
+	<property name="src.oracle" location="${src}/oracle"/>
+	<property name="src.weblogic" location="${src}/weblogic"/>
 		
     <available property="oracle.present" classname="oracle.sql.BLOB" classpathref="cp"/>
-    <available property="weblogic.present" classname="weblogic.logging.NonCatalogLogger" classpathref="cp"/>
+    <available property="weblogic.present" classname="weblogic.jdbc.jts.Driver" classpathref="cp"/>
   	<available property="jboss.present" classname="org.jboss.system.ServiceMBeanSupport" classpathref="cp"/>
 
     <condition property="skip.compile.features.jboss">
 	</target>
 	
     <target name="jar" depends="common.jar">
+        <antcall target="jar.features.jboss" />
+        <antcall target="jar.features.oracle" />
+        <antcall target="jar.features.weblogic" />
 
-	  <antcall target="jar.features.jboss" />
-      <antcall target="jar.features.oracle" />
-	  <antcall target="jar.features.weblogic" />
-
+        <!-- Build one jar to rule them all. -->   
+        <jar basedir="${build.java}" jarfile="${build}/${name}-all-${version}.jar" manifest="${jar.manifest}">
+            <manifest>
+                <attribute name="Implementation-Title" value="${fullname} ALL"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="jar.features.jboss"  unless="skip.compile.features.jboss" >