Blob Blame History Raw
--- commons-logging-1.2-src/build.xml	2014-07-05 20:11:36.000000000 +0200
+++ commons-logging-1.2-src/build.xml	2019-01-28 13:41:46.362796232 +0100
@@ -263,9 +263,31 @@
    description="Copy static files to build directory">
     <tstamp/>
     <copy  todir="${build.home}/conf" filtering="on">
-      <fileset dir="${conf.home}" includes="*.MF"/>
       <fileset dir="${conf.home}" includes="*.properties"/>
     </copy>
+	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/MANIFEST.MF" filtering="on">
+      <filterset>
+	    <filter token="bsn-extension" value=""/>
+      </filterset>
+	</copy>
+    <mkdir dir="${build.home}/conf/tests"/>
+	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/tests/MANIFEST.MF" filtering="on">
+      <filterset>
+	    <filter token="bsn-extension" value=".tests"/>
+      </filterset>
+	</copy>
+    <mkdir dir="${build.home}/conf/api"/>
+	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/api/MANIFEST.MF" filtering="on">
+      <filterset>
+	    <filter token="bsn-extension" value=".api"/>
+      </filterset>
+	</copy>
+    <mkdir dir="${build.home}/conf/adapters"/>
+	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/adapters/MANIFEST.MF" filtering="on">
+      <filterset>
+	    <filter token="bsn-extension" value=".adapters"/>
+      </filterset>
+	</copy>
   </target>
 
   <target name="compile" depends="static,compile-only"
@@ -478,7 +500,7 @@
 
     <jar jarfile="${build.home}/${api.jar.name}"
          basedir="${build.home}/classes"
-         manifest="${build.home}/conf/MANIFEST.MF">
+         manifest="${build.home}/conf/api/MANIFEST.MF">
       <include name="org/apache/commons/logging/*.class" />
       <include name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
       <include name="org/apache/commons/logging/impl/WeakHashtable*.class" />
@@ -492,7 +514,7 @@
 
     <jar jarfile="${build.home}/${adapters.jar.name}"
          basedir="${build.home}/classes"
-         manifest="${build.home}/conf/MANIFEST.MF">
+         manifest="${build.home}/conf/adapters/MANIFEST.MF">
       <include name="org/apache/commons/logging/impl/**.class" />
       <include name="META-INF/LICENSE.txt"/>
       <include name="META-INF/NOTICE.txt"/>
@@ -594,7 +616,7 @@
     </copy>
     <jar jarfile="${build.home}/commons-${component.name}-tests.jar"
          basedir="${build.home}/tests"
-        manifest="${build.home}/conf/MANIFEST.MF">
+        manifest="${build.home}/conf/tests/MANIFEST.MF">
       <exclude name="org/apache/commons/logging/Wrapper.class"/>
       <exclude name="org/apache/commons/logging/jdk14/TestHandler.class"
                  if="jdk.1.4.present"/>
--- commons-logging-1.2-src/src/conf/MANIFEST.MF	2014-07-05 20:11:36.000000000 +0200
+++ commons-logging-1.2-src/src/conf/MANIFEST.MF	2019-01-28 13:37:10.333359706 +0100
@@ -6,7 +6,7 @@
 Implementation-Vendor-Id: org.apache
 Specification-Title: Commons Logging
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-SymbolicName: org.apache.commons.logging
+Bundle-SymbolicName: org.apache.commons.logging@bsn-extension@
 X-Compile-Target-JDK: 1.2
 Implementation-Version: 1.2
 Specification-Vendor: The Apache Software Foundation