This is an automated email from the git hooks/post-receive script. rockclimb-guest pushed a commit to branch master in repository eclipselink.
commit 41bba3190ac257101d658cdcdb42e7646b25918a Author: Andrew Ross <[email protected]> Date: Sun Oct 27 22:03:41 2013 +0000 Further packaging updates --- debian/build.xml | 21 +++++++++++ debian/classpath-debian | 4 +-- debian/control | 8 ++--- debian/excludesfiles/build | 3 ++ debian/libeclipselink-java.doc-base | 8 +++++ debian/libeclipselink-java.jlibs | 1 + debian/libeclipselink-java.manifest | 14 ++++++-- debian/patches/cast.patch | 68 ----------------------------------- debian/patches/charset.patch | 2 ++ debian/patches/explicitcast.patch | 3 ++ debian/patches/typeparameters.patch | 2 ++ 11 files changed, 57 insertions(+), 77 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 120f947..ea5b39a 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -8,6 +8,7 @@ <target name="init"> <mkdir dir="${dir.build}/classes"/> + <mkdir dir="${dir.build}/jpql"/> <mkdir dir="${dir.build}/modelgen"/> </target> @@ -36,6 +37,22 @@ <exclude name="**/*.java"/> </fileset> </copy> + <javac + srcdir="${dir.src}" + destdir="${dir.build}/jpql" + debug="${debug}" + source="${source}" + target="${target}" + includeantruntime="false"> + <include name="org/eclipse/persistence/jpa/jpql/**"/> + </javac> + <copy todir="${dir.build}/jpql"> + <fileset dir="."> + <include name="*.html"/> + <include name="org/eclipse/persistence/jpa/jpql/*.properties"/> + <exclude name="**/*.java"/> + </fileset> + </copy> </target> <target name="jar" depends="compile"> @@ -47,6 +64,10 @@ provider="org.eclipse.persistence.jpa.PersistenceProvider"/> </jar> <jar + destfile="${dir.build}/org.eclipse.persistence.jpa.jpql.jar" + basedir="${dir.build}/jpql"> + </jar> + <jar destfile="${dir.build}/org.eclipse.persistence.jpa.modelgen.processor.jar" basedir="${dir.build}/modelgen"> <fileset dir="."> diff --git a/debian/classpath-debian b/debian/classpath-debian index 8025470..97667bf 100644 --- a/debian/classpath-debian +++ b/debian/classpath-debian @@ -1,8 +1,8 @@ -usr/share/java/javax.persistence-api.jar +usr/share/java/eclipselink-jpa-2.1-spec.jar usr/share/java/geronimo-jta_1.1_spec.jar usr/share/java/geronimo-validation.jar usr/share/java/geronimo-javamail-1.4-spec.jar -usr/share/java/geronimo-jms-1.1-spec.jar +usr/share/java/geronimo-jms_1.1_spec.jar usr/share/java/geronimo-j2ee-connector-1.5-spec.jar usr/share/java/aspectjtools.jar usr/share/java/ant.jar diff --git a/debian/control b/debian/control index f216107..a982b17 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Miguel Landaeta <[email protected]>, Section: java Priority: optional Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, - libjavax.persistence-java (>= 2.1.0), + libjpa-2.1-spec-java, libgeronimo-jta-1.1-spec-java, libgeronimo-validation-1.0-spec-java, libgeronimo-javamail-1.4-spec-java, @@ -17,13 +17,13 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, libasm3-java, antlr3 (>= 3.2), default-jdk-doc Standards-Version: 3.9.4 Homepage: http://www.eclipse.org/eclipselink/ -Vcs-Git: git://git.debian.org/git/pkg-java/eclipselink.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipselink.git +Vcs-Git: git://anonscm.debian.org/pkg-java/eclipselink.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/eclipselink.git Package: libeclipselink-java Architecture: all Depends: - libjavax.persistence-java (>= 2.1.0), + libjpa-2.1-spec-java, libgeronimo-jta-1.1-spec-java, libgeronimo-validation-1.0-spec-java, libgeronimo-javamail-1.4-spec-java, diff --git a/debian/excludesfiles/build b/debian/excludesfiles/build index 34a3678..dc9a06c 100644 --- a/debian/excludesfiles/build +++ b/debian/excludesfiles/build @@ -13,3 +13,6 @@ org/eclipse/persistence/internal/libraries/** # Jaxb-XJC org/eclipse/persistence/jaxb/dynamic/metadata/SchemaMetadata.java org/eclipse/persistence/jaxb/javamodel/xjc/** + +# JPQL Tools +org/eclipse/persistence/jpa/jpql/tools/** diff --git a/debian/libeclipselink-java.doc-base b/debian/libeclipselink-java.doc-base new file mode 100644 index 0000000..643bd22 --- /dev/null +++ b/debian/libeclipselink-java.doc-base @@ -0,0 +1,8 @@ +Document: libeclipselink-java +Title: Eclipselink Documentation +Author: Oracle +Section: Programming + +Format: HTML +Index: /usr/share/doc/libeclipselink-java/readme.html +Files: /usr/share/doc/libeclipselink-java/*.html diff --git a/debian/libeclipselink-java.jlibs b/debian/libeclipselink-java.jlibs index 9bd2c5e..06ac6e2 100644 --- a/debian/libeclipselink-java.jlibs +++ b/debian/libeclipselink-java.jlibs @@ -1,2 +1,3 @@ target/eclipselink.jar +target/org.eclipse.persistence.jpa.jpql.jar target/org.eclipse.persistence.jpa.modelgen.processor.jar diff --git a/debian/libeclipselink-java.manifest b/debian/libeclipselink-java.manifest index e8012cb..e7df476 100644 --- a/debian/libeclipselink-java.manifest +++ b/debian/libeclipselink-java.manifest @@ -1,11 +1,19 @@ usr/share/java/eclipselink.jar: - Release-Designation: EclipseLink 2.5.0 + Release-Designation: EclipseLink 2.5.1 Implementation-Vendor: Eclipse.org - EclipseLink Project Implementation-Title: org.eclipse.persistence - Implementation-Version: 2.5.0.v20130507-3faac2b + Implementation-Version: 2.5.1.v20130918-f2b9fc5 Specification-Vendor: Eclipse.org - EclipseLink Project Premain-Class: org.eclipse.persistence.internal.jpa.deployment.JavaSECMPInitializerAgent Specification-Title: Eclipse Persistence Services - Specification-Version: 2.5.0 + Specification-Version: 2.5.1 Main-Class: org.eclipse.persistence.Version Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/asm3-all.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /u [...] + +usr/share/java/org.eclipse.persistence.jpa.jpql.jar: + Bundle-Name: EclipseLink Hermes Parser + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.jpa.jpql + Bundle-Vendor: Eclipse.org - EclipseLink Project + Bundle-Version: 2.5.1.v20130918-f2b9fc5 + Bundle-SymbolicName: org.eclipse.persistence.jpa.jpql diff --git a/debian/patches/cast.patch b/debian/patches/cast.patch deleted file mode 100644 index 6baa1ce..0000000 --- a/debian/patches/cast.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/org/eclipse/persistence/internal/xr/QueryOperation.java -+++ b/org/eclipse/persistence/internal/xr/QueryOperation.java -@@ -593,8 +593,8 @@ - Class oracleSQLXML; - Method getStringMethod; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- oracleSQLXML = AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader())); -- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {})); -+ oracleSQLXML = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader())); -+ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {})); - fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {})); - } else { - oracleSQLXML = PrivilegedAccessHelper.getClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader()); -@@ -613,11 +613,11 @@ - Object xmlTypeFactory; - Method getStringMethod; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- oracleOPAQUE = AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader())); -- xmlTypeFactoryClass = AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader())); -- xmlTypeFactoryConstructor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true)); -+ oracleOPAQUE = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader())); -+ xmlTypeFactoryClass = (Class)AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader())); -+ xmlTypeFactoryConstructor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true)); - xmlTypeFactory = AccessController.doPrivileged(new PrivilegedInvokeConstructor(xmlTypeFactoryConstructor, new Object[0])); -- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE})); -+ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE})); - fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {})); - } else { - oracleOPAQUE = PrivilegedAccessHelper.getClassForName(ORACLEOPAQUE_STR, false, this.getClass().getClassLoader()); ---- a/org/eclipse/persistence/jpa/rs/PersistenceContext.java -+++ b/org/eclipse/persistence/jpa/rs/PersistenceContext.java -@@ -527,7 +527,7 @@ - } - Field[] fields = null; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- fields = AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); -+ fields = (Field[])AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); - } else { - fields = PrivilegedAccessHelper.getDeclaredFields(clazz); - } ---- a/org/eclipse/persistence/internal/jpa/metadata/converters/ConverterClass.java -+++ b/org/eclipse/persistence/internal/jpa/metadata/converters/ConverterClass.java -@@ -110,12 +110,12 @@ - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){ - try { - attributeConverterClass = (Class) AccessController.doPrivileged(new PrivilegedClassForName(attributeConverterClassName, true, loader)); -- attributeConverter = AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); -+ attributeConverter = (AttributeConverter)AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); - } catch (PrivilegedActionException exception) { - throw ValidationException.classNotFoundWhileConvertingClassNames(attributeConverterClassName, exception.getException()); - } - } else { -- attributeConverterClass = PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, loader); -+ attributeConverterClass = (Class)PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, loader); - attributeConverter = (AttributeConverter) PrivilegedAccessHelper.newInstanceFromClass(attributeConverterClass); - } - } catch (ClassNotFoundException exception) { ---- a/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java -+++ b/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java -@@ -271,7 +271,7 @@ - } catch (IllegalAccessException e) { - Constructor ctor = null; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- ctor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); -+ ctor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); - } else { - ctor = PrivilegedAccessHelper.getDeclaredConstructorFor(xmlAdapterClass, new Class[0], true); - } diff --git a/debian/patches/charset.patch b/debian/patches/charset.patch index 9128576..06d3e66 100644 --- a/debian/patches/charset.patch +++ b/debian/patches/charset.patch @@ -1,3 +1,5 @@ +Fix a line containing a bad character which causes unknown charset failures. + --- a/org/eclipse/persistence/internal/jpa/transaction/JTATransactionWrapper.java +++ b/org/eclipse/persistence/internal/jpa/transaction/JTATransactionWrapper.java @@ -114,7 +114,7 @@ diff --git a/debian/patches/explicitcast.patch b/debian/patches/explicitcast.patch index 92be9b7..c2530b1 100644 --- a/debian/patches/explicitcast.patch +++ b/debian/patches/explicitcast.patch @@ -1,3 +1,6 @@ +Add in explicit casts where required to meet Java spec, so that the package compiles with +OpenJDK as well as ECJ. + --- a/org/eclipse/persistence/mappings/converters/ConverterClass.java +++ b/org/eclipse/persistence/mappings/converters/ConverterClass.java @@ -83,12 +83,12 @@ diff --git a/debian/patches/typeparameters.patch b/debian/patches/typeparameters.patch index 3781a7a..26048bc 100644 --- a/debian/patches/typeparameters.patch +++ b/debian/patches/typeparameters.patch @@ -1,3 +1,5 @@ +Fix parameters to meet the java spec, so that the build works in OpenJDK as well as ECJ. + --- a/org/eclipse/persistence/internal/oxm/XMLMarshaller.java +++ b/org/eclipse/persistence/internal/oxm/XMLMarshaller.java @@ -68,7 +68,7 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipselink.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
