Author: shawkins Date: 2012-08-01 10:24:00 -0400 (Wed, 01 Aug 2012) New Revision: 4283 Added: trunk/client-jdk15/src/main/java/retroruntime/ trunk/client-jdk15/src/main/java/retroruntime/java/ trunk/client-jdk15/src/main/java/retroruntime/java/io/ trunk/client-jdk15/src/main/java/retroruntime/java/net/ trunk/client-jdk15/src/main/java/retroruntime/java/sql/ trunk/client-jdk15/src/main/java/retroruntime/java/util/ trunk/client-jdk15/src/main/java/retroruntime/javax/ trunk/client-jdk15/src/main/java/retroruntime/javax/net/ trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl/ trunk/client-jdk15/src/main/java/retroruntime/javax/xml/ trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream/ trunk/client-jdk15/src/main/java/retroruntime/org/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic/ trunk/client-jdk15/src/main/resources/ trunk/client-jdk15/src/main/resources/net/ trunk/client-jdk15/src/main/resources/net/sf/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties Removed: trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/io/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/net/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/util/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/javax/net/ssl/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/javax/xml/stream/ trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/org/teiid/core/types/basic/ Modified: trunk/build/pom.xml trunk/client-jdk15/src/main/java/retroruntime/java/io/_IOException.java trunk/client-jdk15/src/main/java/retroruntime/java/io/_ObjectStreamClass.java trunk/client-jdk15/src/main/java/retroruntime/java/net/_NetworkInterface.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/NClob_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowIdLifetime_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowId_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLClientInfoException_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLFeatureNotSupportedException_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLXML_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/Wrapper_.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLException.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLWarning.java trunk/client-jdk15/src/main/java/retroruntime/java/sql/_Types.java trunk/client-jdk15/src/main/java/retroruntime/java/util/_Properties.java trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl/_SSLContext.java trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream/XMLStreamException_.java trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic/StringToSQLXMLTransform_.java Log: TEIID-2126 repackaging retro overrides to differentiate between the 1.5 and 1.4 targets. Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2012-07-31 18:44:07 UTC (rev 4282) +++ trunk/build/pom.xml 2012-08-01 14:24:00 UTC (rev 4283) @@ -89,6 +89,7 @@ <version>1.1.1</version> <executions> <execution> + <id>jdbc-15</id> <phase>package</phase> <goals> <goal>java</goal> @@ -101,13 +102,34 @@ <argument>-destjar</argument> <argument>${project.basedir}/target/teiid-${project.version}-jdbc-jdk15.jar</argument> <argument>-embed</argument> - <argument>org.teiid.retroruntime</argument> + <argument>org.teiid</argument> + <argument>-target</argument> + <argument>1.5</argument> </arguments> </configuration> </execution> + <execution> + <id>jdbc-14</id> + <phase>package</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass> + <arguments> + <argument>-srcjar</argument> + <argument>${project.basedir}/target/teiid-${project.version}-jdbc.jar</argument> + <argument>-destjar</argument> + <argument>${project.basedir}/target/teiid-${project.version}-jdbc-jdk14.jar</argument> + <argument>-embed</argument> + <argument>org.teiid</argument> + <argument>-target</argument> + <argument>1.4</argument> + </arguments> + </configuration> + </execution> </executions> - </plugin> - + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -123,8 +145,13 @@ <artifact> <file>target/teiid-${project.version}-jdbc-jdk15.jar</file> <type>jar</type> - <classifier>client-jdk15</classifier> + <classifier>jdbc-jdk15</classifier> </artifact> + <artifact> + <file>target/teiid-${project.version}-jdbc-jdk14.jar</file> + <type>jar</type> + <classifier>jdbc-jdk14</classifier> + </artifact> </artifacts> </configuration> </execution> Modified: trunk/client-jdk15/src/main/java/retroruntime/java/io/_IOException.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/io/_IOException.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/io/_IOException.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.io; +package retroruntime.java.io; import java.io.IOException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/io/_ObjectStreamClass.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/io/_ObjectStreamClass.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/io/_ObjectStreamClass.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.io; +package retroruntime.java.io; import java.io.ObjectStreamClass; import java.lang.reflect.Method; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/net/_NetworkInterface.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/net/_NetworkInterface.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/net/_NetworkInterface.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package net.sf.retrotranslator.runtime.java.net; +package retroruntime.java.net; import java.net.NetworkInterface; import java.net.SocketException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/NClob_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/NClob_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/NClob_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.Clob; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowIdLifetime_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/RowIdLifetime_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowIdLifetime_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -21,7 +21,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; public enum RowIdLifetime_ { ROWID_UNSUPPORTED, Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowId_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/RowId_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/RowId_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; public interface RowId_ { boolean equals(Object obj); Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLClientInfoException_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/SQLClientInfoException_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLClientInfoException_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.SQLException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLFeatureNotSupportedException_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/SQLFeatureNotSupportedException_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLFeatureNotSupportedException_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.SQLException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLXML_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/SQLXML_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/SQLXML_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.io.InputStream; import java.io.OutputStream; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/Wrapper_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/Wrapper_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/Wrapper_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.SQLException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLException.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/_SQLException.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLException.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.SQLException; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLWarning.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/_SQLWarning.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/_SQLWarning.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; import java.sql.SQLWarning; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/sql/_Types.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/sql/_Types.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/sql/_Types.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.sql; +package retroruntime.java.sql; public class _Types { public final static int ROWID = -8; Modified: trunk/client-jdk15/src/main/java/retroruntime/java/util/_Properties.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/java/util/_Properties.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/java/util/_Properties.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.java.util; +package retroruntime.java.util; import java.util.Collections; import java.util.Enumeration; Modified: trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl/_SSLContext.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/javax/net/ssl/_SSLContext.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/javax/net/ssl/_SSLContext.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.javax.net.ssl; +package retroruntime.javax.net.ssl; import java.security.NoSuchAlgorithmException; Modified: trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream/XMLStreamException_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/javax/xml/stream/XMLStreamException_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/javax/xml/stream/XMLStreamException_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.javax.xml.stream; +package retroruntime.javax.xml.stream; public class XMLStreamException_ extends Exception { Modified: trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic/StringToSQLXMLTransform_.java =================================================================== --- trunk/client-jdk15/src/main/java/net/sf/retrotranslator/runtime/org/teiid/core/types/basic/StringToSQLXMLTransform_.java 2012-07-31 16:35:27 UTC (rev 4280) +++ trunk/client-jdk15/src/main/java/retroruntime/org/teiid/core/types/basic/StringToSQLXMLTransform_.java 2012-08-01 14:24:00 UTC (rev 4283) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package net.sf.retrotranslator.runtime.org.teiid.core.types.basic; +package retroruntime.org.teiid.core.types.basic; import java.io.Reader; Added: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties =================================================================== --- trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties (rev 0) +++ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties 2012-08-01 14:24:00 UTC (rev 4283) @@ -0,0 +1,24 @@ +retroruntime +net.sf.retrotranslator.runtime +java.util.concurrent:edu.emory.mathcs.backport.java.util.concurrent +java.lang.StringBuilder:java.lang.StringBuffer +java.util.Deque:edu.emory.mathcs.backport.java.util.Deque +java.util.ArrayDeque:edu.emory.mathcs.backport.java.util.ArrayDeque +java.util.Queue:edu.emory.mathcs.backport.java.util.Queue +java.util.AbstractQueue:edu.emory.mathcs.backport.java.util.AbstractQueue +java.util.PriorityQueue:edu.emory.mathcs.backport.java.util.PriorityQueue +java.lang.System.nanoTime:edu.emory.mathcs.backport.java.util.concurrent.helpers.Utils.nanoTime +java.util.concurrent.locks.Condition.awaitNanos:edu.emory.mathcs.backport.java.util.concurrent.helpers.Utils.awaitNanos +java.util.Collections.addAll:edu.emory.mathcs.backport.java.util.Collections.addAll +java.util.Collections.checkedCollection:edu.emory.mathcs.backport.java.util.Collections.checkedCollection +java.util.Collections.checkedList:edu.emory.mathcs.backport.java.util.Collections.checkedList +java.util.Collections.checkedMap:edu.emory.mathcs.backport.java.util.Collections.checkedMap +java.util.Collections.checkedSet:edu.emory.mathcs.backport.java.util.Collections.checkedSet +java.util.Collections.checkedSortedMap:edu.emory.mathcs.backport.java.util.Collections.checkedSortedMap +java.util.Collections.checkedSortedSet:edu.emory.mathcs.backport.java.util.Collections.checkedSortedSet +java.util.Collections.disjoint:edu.emory.mathcs.backport.java.util.Collections.disjoint +java.util.Collections.frequency:edu.emory.mathcs.backport.java.util.Collections.frequency +java.util.Collections.reverseOrder:edu.emory.mathcs.backport.java.util.Collections.reverseOrder +java.util.Collections.newSetFromMap:edu.emory.mathcs.backport.java.util.Collections.newSetFromMap +java.util.Arrays.copyOf:edu.emory.mathcs.backport.java.util.Arrays.copyOf +java.util.Arrays.copyOfRange:edu.emory.mathcs.backport.java.util.Arrays.copyOfRange Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport14.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties =================================================================== --- trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties (rev 0) +++ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties 2012-08-01 14:24:00 UTC (rev 4283) @@ -0,0 +1 @@ +retroruntime \ No newline at end of file Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/backport15.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties =================================================================== --- trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties (rev 0) +++ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties 2012-08-01 14:24:00 UTC (rev 4283) @@ -0,0 +1,3 @@ +retroruntime +net.sf.retrotranslator.runtime +edu.emory.mathcs.backport Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed14.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties =================================================================== --- trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties (rev 0) +++ trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties 2012-08-01 14:24:00 UTC (rev 4283) @@ -0,0 +1 @@ +retroruntime \ No newline at end of file Property changes on: trunk/client-jdk15/src/main/resources/net/sf/retrotranslator/registry/embed15.properties ___________________________________________________________________ Added: svn:mime-type + text/plain