List:Commits« Previous MessageNext Message »
From:mark.matthews Date:November 30 2010 2:36am
Subject:bzr push into connector-j/branches/branch_5_1 branch (mark.matthews:1015 to
1016)
View as plain text  
 1016 mark.matthews@stripped	2010-11-29
      Remove OSGI imports of log4j, apache-commons

    modified:
      build.xml
 1015 mark.matthews@stripped	2010-11-29
      Removing log4j and commons logging, new logging integration bridge to come...

    removed:
      src/com/mysql/jdbc/log/CommonsLogger.java
      src/com/mysql/jdbc/log/Log4JLogger.java
      src/lib/Commons-Logging-LICENSE.txt
      src/lib/LICENSE-AspectJ.html
      src/lib/commons-logging.jar
      src/lib/log4j-1.2.9.jar
    modified:
      .classpath
      README
=== modified file 'build.xml'
--- a/build.xml	2010-08-19 20:51:43 +0000
+++ b/build.xml	2010-11-30 02:36:20 +0000
@@ -388,7 +388,6 @@ and the full path to the rt.jar from Jav
 		<property name="jee-imports" value="javax.naming,javax.naming.spi,javax.sql,javax.transaction.xa;version=&quot;[1.0.1, 2.0.0)&quot;;resolution:=optional" />
 		<property name="crypto-imports" value="javax.net,javax.net.ssl;version=&quot;[1.0.1, 2.0.0)&quot;;resolution:=optional" />
 		<property name="jdbc4-imports" value="javax.xml.parsers, javax.xml.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,org.w3c.dom,org.xml.sax,org.xml.sax.helpers;resolution:=optional" />
-		<property name="logging-imports" value="org.apache.commons.logging;version=&quot;[1.1.1,2.0.0)&quot;;resolution:=optional,org.apache.log4j;version=&quot;[1.2.15, 2.0.0)&quot;;resolution:=optional" />
 		<property name="integration-imports" value="com.mchange.v2.c3p0;version=&quot;[0.9.1.2, 1.0.0)&quot;;resolution:=optional,org.jboss.resource.adapter.jdbc;resolution:=optional,org.jboss.resource.adapter.jdbc.vendor;resolution:=optional" />
 
 		<property name="driver-exports" value="com.mysql.jdbc;version=&quot;${osgid-version}&quot;;uses:=&quot;com.mysql.jdbc.log,javax.naming,javax.net.ssl,javax.xml.transform,org.xml.sax&quot;" />
@@ -426,7 +425,7 @@ and the full path to the rt.jar from Jav
 			<attribute name="Bundle-ManifestVersion" value="2" />
 			<attribute name="Bundle-SymbolicName" value="com.mysql.jdbc" />
 			<attribute name="Export-Package" value="${driver-exports},${jee-exports},${logging-exports},${profiling-exports},${util-exports},${exceptions-exports},${jdbc4-exceptions-exports},${interceptors-exports},${integration-exports},${configs-exports},${legacy-exports}" />
-			<attribute name="Import-Package" value="${crypto-imports},${jdbc4-imports},${jee-imports},${logging-imports},${integration-imports}" />
+			<attribute name="Import-Package" value="${crypto-imports},${jdbc4-imports},${jee-imports},${integration-imports}" />
 		</manifest>
 
 		<jar jarfile="${buildDir}/${fullProdName}/${fullProdName}-bin.jar" 


Attachment: [text/bzr-bundle] bzr/mark.matthews@oracle.com-20101130023620-b89qzhj26a1w5i18.bundle
Thread
bzr push into connector-j/branches/branch_5_1 branch (mark.matthews:1015 to1016) mark.matthews30 Nov