[pkg-java] r17730 - in trunk/jdas: . debian debian/source
Timothy Booth
tbooth-guest at moszumanska.debian.org
Sun Feb 2 16:41:16 UTC 2014
Author: tbooth-guest
Date: 2014-02-02 16:41:16 +0000 (Sun, 02 Feb 2014)
New Revision: 17730
Added:
trunk/jdas/debian/
trunk/jdas/debian/.poms
trunk/jdas/debian/README.source
trunk/jdas/debian/changelog
trunk/jdas/debian/compat
trunk/jdas/debian/control
trunk/jdas/debian/copyright
trunk/jdas/debian/libjdas-java.classpath
trunk/jdas/debian/libjdas-java.poms
trunk/jdas/debian/maven.cleanIgnoreRules
trunk/jdas/debian/maven.ignoreRules
trunk/jdas/debian/maven.properties
trunk/jdas/debian/maven.publishedRules
trunk/jdas/debian/maven.rules
trunk/jdas/debian/pom.xml
trunk/jdas/debian/rules
trunk/jdas/debian/source/
trunk/jdas/debian/source/format
Log:
First cut of JDAS to compile on Ubunt 12.04. Patch for Debian Sid to follow.
Added: trunk/jdas/debian/.poms
===================================================================
--- trunk/jdas/debian/.poms (rev 0)
+++ trunk/jdas/debian/.poms 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version
Added: trunk/jdas/debian/README.source
===================================================================
--- trunk/jdas/debian/README.source (rev 0)
+++ trunk/jdas/debian/README.source 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,17 @@
+Information about jdas
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
+
+One might think the build should remake auto-generated files like
+src/main/java/org/biodas/jdas/schema/entryPoints/ENTRYPOINTS.java
+but I'm told this is not a good idea and the autogenerated files
+should be considered the source. Maybe some Java guru will think
+otherwise.
+
+-- Tim Booth
Added: trunk/jdas/debian/changelog
===================================================================
--- trunk/jdas/debian/changelog (rev 0)
+++ trunk/jdas/debian/changelog 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,13 @@
+jdas (1.0.4+svn20130704-0biolinux3) precise; urgency=low
+
+ * Initial release for Bio-Linux
+ * Make it build against Tomcat with POM patch
+ * Avoid use of either quilt or mh_patchpoms and just supply a
+ modified pom.xml as I can't make it work any other way
+ * Linked jar into /usr/share/java/
+ * Fix Lintian CLASSPATH problem with jh_classpath as advised
+ at http://javacruft.wordpress.com/2011/06/03/avoiding-\
+ missing-classpath-lintian-warnings-with-maven-based-packages/
+ * Set package version to reflect internal version
+
+ -- Tim Booth <tbooth at ceh.ac.uk> Thu, 09 Jan 2014 15:39:59 +0000
Added: trunk/jdas/debian/compat
===================================================================
--- trunk/jdas/debian/compat (rev 0)
+++ trunk/jdas/debian/compat 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1 @@
+7
Added: trunk/jdas/debian/control
===================================================================
--- trunk/jdas/debian/control (rev 0)
+++ trunk/jdas/debian/control 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,27 @@
+Source: jdas
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Tim Booth <tbooth at ceh.ac.uk>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5), javahelper (>= 0.40)
+Build-Depends-Indep: junit4, libcommons-httpclient-java, libjackson-json-java, liblog4j1.2-java (>= 1.2.16),
+ libspring-web-java, libservlet3.0-java
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jdas
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jdas
+Homepage: https://code.google.com/p/jdas
+
+Package: libjdas-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Description: JDAS - JAXB DAS Client Library
+ JDAS is a Java DAS client library which simplifies DAS queries and maps Java
+ classes to DAS XML representations. JDAS includes JAVA classes generated from
+ DAS RNG schemas. These Java classes are used through the JAXB API to store and
+ retrieve data in memory without the need to implement a specific set of XML
+ loading and saving routines. JAXB provides two main features: the ability to
+ marshal Java objects into XML and the inverse, to unmarshal XML into Java
+ objects. JDAS additionally implements adaptor classes which are used to
+ refactor generated classes with a complex structure. Finally JDAS implements
+ client classes to facilitate querying DAS information.
Added: trunk/jdas/debian/copyright
===================================================================
--- trunk/jdas/debian/copyright (rev 0)
+++ trunk/jdas/debian/copyright 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,24 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: JDAS - JAXB DAS Client Library
+Source: https://code.google.com/p/jdas/
+
+Files: *
+Copyright: 2013, Rafael C. Jimenez <rajido at gmail.com>
+ gustavoa... at gmail.com
+ leylaj... at gmail.com
+ warren.j... at gmail.com
+ andy.jen... at gmail.com
+ macias... at gmail.com
+ forevere... at gmail.com
+ christin... at gmail.com
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2013, Tim Booth <tbooth at ceh.ac.uk>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+
+
Added: trunk/jdas/debian/libjdas-java.classpath
===================================================================
--- trunk/jdas/debian/libjdas-java.classpath (rev 0)
+++ trunk/jdas/debian/libjdas-java.classpath 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1 @@
+usr/share/maven-repo/uk/ac/ebi/das/jdas/1.x/jdas-1.x.jar /usr/share/java/commons-httpclient.jar /usr/share/java/log4j-1.2.jar /usr/share/java/tomcat-servlet-api-3.0.jar /usr/share/java/spring3-web.jar /usr/share/java/jackson-core-lgpl.jar
Added: trunk/jdas/debian/libjdas-java.poms
===================================================================
--- trunk/jdas/debian/libjdas-java.poms (rev 0)
+++ trunk/jdas/debian/libjdas-java.poms 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version
Added: trunk/jdas/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/jdas/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/jdas/debian/maven.cleanIgnoreRules 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+# junit junit jar s/3\..*/3.x/
+
Added: trunk/jdas/debian/maven.ignoreRules
===================================================================
--- trunk/jdas/debian/maven.ignoreRules (rev 0)
+++ trunk/jdas/debian/maven.ignoreRules 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,19 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\..*/3.x/
+
+javax.servlet javax.servlet-api * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
Added: trunk/jdas/debian/maven.properties
===================================================================
--- trunk/jdas/debian/maven.properties (rev 0)
+++ trunk/jdas/debian/maven.properties 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
Added: trunk/jdas/debian/maven.publishedRules
===================================================================
--- trunk/jdas/debian/maven.publishedRules (rev 0)
+++ trunk/jdas/debian/maven.publishedRules 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\..*/3.x/
+
Added: trunk/jdas/debian/maven.rules
===================================================================
--- trunk/jdas/debian/maven.rules (rev 0)
+++ trunk/jdas/debian/maven.rules 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,24 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\..*/3.x/
+
+commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+uk.ac.ebi.das jdas jar s/1\..*/1.x/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
+org.springframework * * s/3\..*/3.x/ * *
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/3.0/ * *
Added: trunk/jdas/debian/pom.xml
===================================================================
--- trunk/jdas/debian/pom.xml (rev 0)
+++ trunk/jdas/debian/pom.xml 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>uk.ac.ebi.das</groupId>
+ <artifactId>jdas</artifactId>
+ <version>1.0.4</version>
+ <packaging>jar</packaging>
+ <properties>
+ <debian.hasPackageVersion/>
+ <debian.mavenRules>uk.ac.ebi.das jdas jar 1.0.4 * *</debian.mavenRules>
+ <debian.originalVersion>1.0.4</debian.originalVersion>
+ <debian.package>libjdas-java</debian.package>
+ </properties>
+
+ <name>JDAS - JAXB DAS Client Library</name>
+ <build>
+ <plugins>
+ <!-- To compile with JDK5.0 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <version>2.0.2</version>
+ </plugin>
+ <!-- This plugin creates a javadoc jar -->
+ <!-- Plugin used during the test phase of the build lifecycle -->
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.x</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.x</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.x</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.x</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>debian</version>
+ <type>jar</type>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.springframework</groupId> -->
+ <!-- <artifactId>spring-jdbc</artifactId> -->
+ <!-- <version>3.0.5.RELEASE</version> -->
+ <!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.springframework</groupId> -->
+ <!-- <artifactId>spring-webmvc</artifactId> -->
+ <!-- <version>3.0.5.RELEASE</version> -->
+ <!-- </dependency> -->
+ </dependencies>
+</project>
Added: trunk/jdas/debian/rules
===================================================================
--- trunk/jdas/debian/rules (rev 0)
+++ trunk/jdas/debian/rules 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+#Quilt and mh_patchpoms don't play ball, so after editing pom.xml
+#rather than saving a quilt patch I just bunged the full new version under /debian.
+#If the upstream build changes you'll need to change this file too.
+debian/stamp-poms-patched: debian/maven-repo
+ [ -e pom.xml.save ] || cp -b --suffix=.save debian/pom.xml .
+ touch debian/stamp-poms-patched
+
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+common-binary-fixup-indep::
+ #Bung the jar into /usr/share/java where normal people want to see it.
+ mkdir -p debian/libjdas-java/usr/share/java
+ ( cd debian/libjdas-java/usr/share/java ; ln -s ../maven-repo/uk/ac/ebi/das/jdas/1.[0-9]*/jdas-*.jar )
+ ( cd debian/libjdas-java/usr/share/java ; ln -s *.jar jdas.jar )
Property changes on: trunk/jdas/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/jdas/debian/source/format
===================================================================
--- trunk/jdas/debian/source/format (rev 0)
+++ trunk/jdas/debian/source/format 2014-02-02 16:41:16 UTC (rev 17730)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list