moved to JDK1.4

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@473448 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2006-11-10 19:44:47 +00:00
parent fb770599b0
commit de3f43a5cd
10 changed files with 14 additions and 134 deletions

View File

@ -91,11 +91,6 @@
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-4</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-5</artifactId>

View File

@ -33,8 +33,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
</plugins>

View File

@ -1,36 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-4</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Kernel 1.4</name>
<description>OpenJPA Kernel 1.4</description>
<url>http://incubator.apache.org/projects/openjpa</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>0.9.7-incubating-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,60 +0,0 @@
package org.apache.openjpa.util;
import java.util.Locale;
import java.util.TimeZone;
/**
* {@link ProxyGregorianCalendar} subclass that overrides the mutating
* {@link #set} method, which is final in Java 1.3 but public in Java 1.4
* and higher.
*
* @author Marc Prud'hommeaux
* @nojavadoc
*/
public class ProxyGregorianCalendar4
extends ProxyGregorianCalendar {
public ProxyGregorianCalendar4() {
super();
}
public ProxyGregorianCalendar4(int year, int month, int dayOfMonth) {
super(year, month, dayOfMonth);
}
public ProxyGregorianCalendar4(int year, int month, int dayOfMonth,
int hourOfDay, int minute) {
super(year, month, dayOfMonth, hourOfDay, minute);
}
public ProxyGregorianCalendar4(int year, int month, int dayOfMonth,
int hourOfDay, int minute, int second) {
super(year, month, dayOfMonth, hourOfDay, minute, second);
}
public ProxyGregorianCalendar4(Locale aLocale) {
super(aLocale);
}
public ProxyGregorianCalendar4(TimeZone zone) {
super(zone);
}
public ProxyGregorianCalendar4(TimeZone zone, Locale aLocale) {
super(zone, aLocale);
}
public void set(int field, int value) {
if (get(field) != value) {
Proxies.dirty(this);
super.set(field, value);
}
}
public ProxyCalendar newInstance(TimeZone timeZone) {
if (timeZone == null)
return new ProxyGregorianCalendar4();
else
return new ProxyGregorianCalendar4(timeZone);
}
}

View File

@ -51,8 +51,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
<plugin>

View File

@ -123,16 +123,12 @@ public class ProxyGregorianCalendar
}
}
/* This is "final" in JDK 1.3 (not in 1.4 or 1.5)
public void set (int field, int value)
{
if (get (field) != value)
{
Proxies.dirty (this);
super.set (field, value);
}
}
*/
public void set(int field, int value) {
if (get(field) != value) {
Proxies.dirty(this);
super.set(field, value);
}
}
public void add(int field, int amount) {
if (amount != 0) {

View File

@ -63,8 +63,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
<!--

View File

@ -288,11 +288,6 @@
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-4</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-5</artifactId>

View File

@ -27,8 +27,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
</plugins>

10
pom.xml
View File

@ -90,15 +90,6 @@
<module>openjpa-project</module>
</modules>
<profiles>
<profile>
<id>jdk1.4</id>
<activation>
<jdk>1.4</jdk>
</activation>
<modules>
<module>openjpa-kernel-4</module>
</modules>
</profile>
<profile>
<id>jdk1.5</id>
<activation>
@ -107,7 +98,6 @@
<modules>
<module>openjpa-persistence</module>
<module>openjpa-persistence-jdbc</module>
<module>openjpa-kernel-4</module>
<module>openjpa-kernel-5</module>
<module>openjpa-jdbc-5</module>
<module>openjpa-examples</module>