Commits

Anonymous committed 094b36d

Rename artifacts from ant build to match maven artifact names

Issue Number: XW-448

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1254e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (2)

         <!-- xwork -->
         <copy file="pom.xml" tofile="/opt/repository/ibiblio.org/opensymphony/poms/${name}-${version}-SNAPSHOT.pom"/>
         <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar"/>
-        <copy file="${build}/${name}-src-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-src-${version}-SNAPSHOT.jar"/>
+        <copy file="${build}/${name}-${version}-sources.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar"/>
+        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar"/>
     </target>
 
 </project>
                 <attribute name="Implementation-Vendor" value="OpenSymphony"/>
             </manifest>
         </jar>
-        <jar basedir="${src.java}" jarfile="${build}/${name}-src-${version}.jar">
+        <jar basedir="${src.java}" jarfile="${build}/${name}-${version}-sources.jar">
             <manifest>
                 <attribute name="Implementation-Title" value="${fullname}"/>
                 <attribute name="Implementation-Version" value="${version}"/>
 
     <target name="src-jar" depends="init" description="build a jar of the project source code">
         <mkdir dir="${build}"/>
-        <jar basedir="${src.java}" jarfile="${build}/${name}-${version}-src.jar">
+        <jar basedir="${src.java}" jarfile="${build}/${name}-${version}-sources.jar">
+            <manifest>
+                <attribute name="Implementation-Title" value="${fullname}"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="javadoc-jar" depends="javadocs" description="build a jar of the project javadocs">
+        <mkdir dir="${build}"/>
+        <jar basedir="${dist.docs}/api" jarfile="${build}/${name}-${version}-javadoc.jar">
             <manifest>
                 <attribute name="Implementation-Title" value="${fullname}"/>
                 <attribute name="Implementation-Version" value="${version}"/>
     <target name="javadocs" description="generate javadocs" depends="init">
         <mkdir dir="${dist.docs}/api"/>
         <javadoc sourcepath="${src.java}"
-                defaultexcludes="**/package-info.java"
                  destdir="${dist.docs}/api"
                  packagenames="${docs.packages}"
                  classpathref="cp"
             <link href="http://jakarta.apache.org/commons/logging/apidocs"/>
             <link href="http://logging.apache.org/log4j/docs/api"/>
         </javadoc>
+        <jar basedir="${dist.docs}/api" jarfile="${build}/${name}-${version}-javadoc.jar">
+            <manifest>
+                <attribute name="Implementation-Title" value="${fullname}"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
+            </manifest>
+        </jar>
+
         <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> -->
     </target>
 
         <!-- delete the old timestamped builds and commit -->
         <fileset dir="${ivyrep.path}/opensymphony/${name}" id="filesref">
             <include name="${name}-${version}-*"/>
-            <include name="${name}-src-${version}-*"/>
             <include name="ivy-${version}-*"/>
         </fileset>
         <pathconvert property="files" refid="filesref" pathsep=" "/>
         <!-- copy over the new build and source -->
         <copy file="${build}/${name}-${version}.jar"
               tofile="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}.jar"/>
-        <copy file="${build}/${name}-src-${version}.jar"
-              tofile="${ivyrep.path}/opensymphony/${name}/${name}-src-${version}-${TIME}.jar"/>
+        <copy file="${build}/${name}-${version}-sources.jar"
+              tofile="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}-sources.jar"/>
+        <copy file="${build}/${name}-${version}-javadoc.jar"
+              tofile="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}-javadoc.jar"/>
         <echo>svn add (jar)</echo>
         <exec executable="svn">
             <arg value="add"/>
         </exec>
         <exec executable="svn">
             <arg value="add"/>
-            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-src-${version}-${TIME}.jar"/>
+            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}-sources.jar"/>
+        </exec>
+        <exec executable="svn">
+            <arg value="add"/>
+            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}-javadoc.jar"/>
         </exec>
 
         <antcall target="ivyrep.copy-ivy"/>