commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r557855 - in /jakarta/commons/proper/beanutils/trunk: build-other-jars.xml build.xml maven.xml pom.xml src/conf/
Date Fri, 20 Jul 2007 03:00:50 GMT
Author: niallp
Date: Thu Jul 19 20:00:49 2007
New Revision: 557855

URL: http://svn.apache.org/viewvc?view=rev&rev=557855
Log:
BEANUTILS-290 - add ant script to re-create the "core" and "bean-collections" jars

Added:
    jakarta/commons/proper/beanutils/trunk/build-other-jars.xml   (with props)
Removed:
    jakarta/commons/proper/beanutils/trunk/src/conf/
Modified:
    jakarta/commons/proper/beanutils/trunk/build.xml
    jakarta/commons/proper/beanutils/trunk/maven.xml
    jakarta/commons/proper/beanutils/trunk/pom.xml

Added: jakarta/commons/proper/beanutils/trunk/build-other-jars.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build-other-jars.xml?view=auto&rev=557855
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build-other-jars.xml (added)
+++ jakarta/commons/proper/beanutils/trunk/build-other-jars.xml Thu Jul 19 20:00:49 2007
@@ -0,0 +1,108 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="Bean Utilities (Other jars)" default="other-jars" basedir=".">
+
+
+<!--
+        $Id$
+-->
+
+
+<!-- ========== Component Declarations ==================================== -->
+
+
+  <!-- The current version number of this component -->
+  <property name="component.version"       value=""/>
+
+  <!-- The base directory for compilation targets -->
+  <property name="build.home"              value="target"/>
+
+  <!-- The base directory for distribution targets -->
+  <property name="dist.home"               value="dist"/>
+
+  <!-- JDK versions -->
+  <property name="maven.compile.source"    value=""/>
+  <property name="maven.compile.target"    value=""/>
+
+
+<!-- ========== Executable Targets ======================================== -->
+
+  <target name="other-jars" depends="core-jar,bean-collections-jar">
+  </target>
+
+  <target name="core-jar" description="Create BeanUtils Core jar">
+    <mkdir      dir="${dist.home}"/>
+    <mkdir      dir="${build.home}/classes/META-INF"/>
+    <copy      file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+    <copy      file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+    <jar    jarfile="${dist.home}/commons-beanutils-core-${component.version}.jar">
+        <manifest>
+            <attribute name="Specification-Title" value="Commons BeanUtils Core"/>
+            <attribute name="Specification-Version" value="${component.version}"/>
+            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Title" value="Commons BeanUtils Core"/>
+            <attribute name="Implementation-Version" value="${component.version}"/>

+            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}"/>
+            <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}"/>
+        </manifest>
+        <fileset dir="${build.home}/classes">
+            <include name="**/*.class"/>
+            <include name="**/LICENSE.txt"/>
+            <include name="**/NOTICE.txt"/>
+            <exclude name="**/BeanComparator*.class"/>
+            <exclude name="**/BeanMap*.class"/>
+            <exclude name="**/BeanPredicate*.class"/>
+            <exclude name="**/BeanPropertyValueChangeClosure*.class"/>
+            <exclude name="**/BeanPropertyValueEqualsPredicate*.class"/>
+            <exclude name="**/BeanToPropertyValueTransformer*.class"/>
+        </fileset>
+    </jar>
+  </target>
+
+  <target name="bean-collections-jar" description="Create Bean Collections jar">
+    <mkdir      dir="${dist.home}"/>
+    <mkdir      dir="${build.home}/classes/META-INF"/>
+    <copy      file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+    <copy      file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+    <jar    jarfile="${dist.home}/commons-beanutils-bean-collections-${component.version}.jar">
+        <manifest>
+            <attribute name="Specification-Title" value="Commons BeanUtils Bean Collections"/>
+            <attribute name="Specification-Version" value="${component.version}"/>
+            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Title" value="Commons BeanUtils Bean Collections"/>
+            <attribute name="Implementation-Version" value="${component.version}"/>

+            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}"/>
+            <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}"/>
+        </manifest>
+        <fileset dir="${build.home}/classes">
+            <include name="**/LICENSE.txt"/>
+            <include name="**/NOTICE.txt"/>
+            <include name="**/BeanComparator*.class"/>
+            <include name="**/BeanMap*.class"/>
+            <include name="**/BeanPredicate*.class"/>
+            <include name="**/BeanPropertyValueChangeClosure*.class"/>
+            <include name="**/BeanPropertyValueEqualsPredicate*.class"/>
+            <include name="**/BeanToPropertyValueTransformer*.class"/>
+        </fileset>
+    </jar>
+  </target>
+
+</project>

Propchange: jakarta/commons/proper/beanutils/trunk/build-other-jars.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/beanutils/trunk/build-other-jars.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/beanutils/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build.xml?view=diff&rev=557855&r1=557854&r2=557855
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/build.xml Thu Jul 19 20:00:49 2007
@@ -27,7 +27,7 @@
 
 
   <property file="build.properties"/>                <!-- Component local   -->
-  <property file="../build.properties"/>             <!-- Commons local     -->
+  <property file="project.properties"/>              <!-- Project local     -->
   <property file="${user.home}/build.properties"/>   <!-- User local        -->
 
 
@@ -150,6 +150,8 @@
    description="Compile shareable components">
     <javac  srcdir="${source.home}"
            destdir="${build.home}/classes"
+            source="${maven.compile.source}"
+            target="${maven.compile.target}"
              debug="${compile.debug}"
        deprecation="${compile.deprecation}"
           optimize="${compile.optimize}">
@@ -230,9 +232,34 @@
              tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
     <copy      file="NOTICE.txt"
              tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-    <jar    jarfile="${dist.home}/commons-beanutils-${component.version}.jar"
-            basedir="${build.home}/classes"
-           manifest="${build.home}/conf/MANIFEST.MF"/>
+
+    <jar    jarfile="${dist.home}/commons-beanutils-${component.version}.jar">
+        <manifest>
+            <attribute name="Built-By" value="${user.name}"/>
+            <attribute name="Specification-Title" value="Commons BeanUtils"/>
+            <attribute name="Specification-Version" value="${component.version}"/>
+            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Title" value="Commons BeanUtils"/>
+            <attribute name="Implementation-Version" value="${component.version}"/>

+            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}"/>
+            <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}"/>
+        </manifest>
+        <fileset dir="${build.home}/classes">
+            <include name="**/*.class"/>
+            <include name="**/LICENSE.txt"/>
+            <include name="**/NOTICE.txt"/>
+        </fileset>
+    </jar>
+
+    <ant antfile="build-other-jars.xml" target="other-jars">
+      <property name="dist.dir"             value="${dist.home}"/>
+      <property name="build.dir"            value="${build.home}"/>
+      <property name="component.version"    value="${component.version}"/>
+      <property name="maven.compile.source" value="${maven.compile.source}"/>
+      <property name="maven.compile.target" value="${maven.compile.target}"/>
+    </ant>
   </target>
 
 

Modified: jakarta/commons/proper/beanutils/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/maven.xml?view=diff&rev=557855&r1=557854&r2=557855
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/maven.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/maven.xml Thu Jul 19 20:00:49 2007
@@ -26,6 +26,14 @@
             <fileset dir="${basedir}/src/site/resources/images"/>
         </copy>
     </preGoal>
+
+    <preGoal name="jar:jar">
+        <ant:ant antfile="build-other-jars.xml" target="other-jars">
+            <property name="component.version" value="${pom.currentVersion}"/>
+            <property name="build.home"        value="${maven.build.dir}"/>
+            <property name="dist.home"         value="${maven.build.dir}"/>
+        </ant:ant>
+    </preGoal>
   
     <!-- ================================================================== -->
     <!-- Copy into the binary distribution                                  -->

Modified: jakarta/commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/pom.xml?view=diff&rev=557855&r1=557854&r2=557855
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/pom.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/pom.xml Thu Jul 19 20:00:49 2007
@@ -28,7 +28,7 @@
   <groupId>commons-beanutils</groupId>
   <artifactId>commons-beanutils</artifactId>
   <version>1.8.0-SNAPSHOT</version>
-  <name>BeanUtils</name>
+  <name>Commons BeanUtils</name>
 
   <inceptionYear>2000</inceptionYear>
   <description>BeanUtils provides an easy-to-use but flexible wrapper around reflection
and introspection.</description>
@@ -190,6 +190,28 @@
                 <exclude>**/*MemoryTestCase.java</exclude>
               </excludes>
           </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <configuration>
+                <tasks>
+                  <ant antfile="build-other-jars.xml" target="other-jars">
+                    <property name="component.version"    value="${project.version}"/>
+                    <property name="build.home"           value="${project.build.directory}"/>
+                    <property name="dist.home"            value="${project.build.directory}"/>
+                    <property name="maven.compile.source" value="${maven.compile.source}"/>
+                    <property name="maven.compile.target" value="${maven.compile.target}"/>
+                  </ant>
+                </tasks>
+              </configuration>
+              <goals>
+                <goal>run</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
             <artifactId>maven-assembly-plugin</artifactId>



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


Mime
View raw message