[SCM] hibernate-jbosscache: Integration of Hibernate with JBossCache branch, master, updated. debian/3.6.8-2

Miguel Landaeta miguel at miguel.cc
Tue Mar 20 00:20:45 UTC 2012


The following commit has been merged in the master branch:
commit 911d79f03d0006bdc1d17900d147abd12e70d7a9
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Mar 18 18:49:48 2012 -0430

    Revert "Reintroduce upstream release 3.3.2.GA"
    
    This reverts commit de930d59c801afaebcd38bda2691f80235606d6a.

diff --git a/debian/changelog b/debian/changelog
index 0121da2..e208d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-libhibernate-jbosscache-java (1:3.3.2.GA-1) unstable; urgency=low
-
-  * Reintroduce upstream release 3.3.2.GA in the archive. (Closes: #655775).
-  * Revert almost all changes introduced with last upload.
-
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 30 Jan 2012 21:57:14 -0430
-
 libhibernate-jbosscache-java (3.6.8-1) unstable; urgency=low
 
   * First upload to Debian.
diff --git a/debian/classpath b/debian/classpath
index 761afcd..8cd647e 100644
--- a/debian/classpath
+++ b/debian/classpath
@@ -1 +1 @@
-hibernate-jbosscache.jar /usr/share/java/hibernate3.jar /usr/share/java/slf4j-api.jar /usr/share/java/geronimo-jta-1.0.1b-spec.jar /usr/share/java/jboss-cache1.jar /usr/share/java/jboss-system.jar /usr/share/java/jboss-jmx.jar
+hibernate-jbosscache.jar /usr/share/java/hibernate3.jar /usr/share/java/slf4j-api.jar /usr/share/java/geronimo-jta-1.0.1b-spec.jar /usr/share/java/jboss-cache3.jar /usr/share/java/jboss-system.jar /usr/share/java/jboss-jmx.jar /usr/share/java/jgroups.jar
diff --git a/debian/control b/debian/control
index 57e73df..7253c99 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Section: java
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper,
  libhibernate3-java, libslf4j-java, libgeronimo-jta-1.0.1b-spec-java,
- libjboss-cache1-java, libjboss-system-java, libjboss-jmx-java
+ libjboss-cache3-java, libjboss-system-java, libjboss-jmx-java,
+ libjgroups-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/libhibernate-jbosscache-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libhibernate-jbosscache-java.git
@@ -15,7 +16,8 @@ DM-Upload-Allowed: yes
 Package: libhibernate-jbosscache-java
 Architecture: all
 Depends: libhibernate3-java, libslf4j-java, libgeronimo-jta-1.0.1b-spec-java,
- libjboss-cache1-java, libjboss-system-java, libjboss-jmx-java, ${misc:Depends}
+ libjboss-cache1-java, libjboss-system-java, libjboss-jmx-java, ${misc:Depends},
+ libjgroups-java
 Description: Java library for integration of Hibernate with JBossCache
  This Java library provides support in Hibernate for JBossCache 1.x APIs.
  . 
diff --git a/debian/copyright b/debian/copyright
index 0058dca..ab1c169 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-The sources where downloaded from http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.2.GA/cache-jbosscache/.
+The sources where downloaded from https://repository.jboss.org/nexus/content/groups/public-jboss/org/hibernate/hibernate-jbosscache/3.6.8.Final/
 
 Files: *
 Copyright: © 2007 Red Hat Middleware LLC
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 633d462..b5f4764 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,15 +3,20 @@
 set -e
 
 # called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
 package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
 version=$2
 tarball=$3
-TAR=${package}_${version}.orig.tar.gz
+
+unzip $tarball
+rm -rf META-INF
+
+TAR=../${package}_${version}.orig.tar.gz
 DIR=${package}-${version}.orig
-REPO="http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-${version}/cache-jbosscache/"
 
-svn export $REPO $DIR
+mkdir -p $DIR/src/main/java
+mv org/* $DIR/src/main/java
+rmdir org
+
 GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR $DIR
 
 rm -rf $tarball $DIR
diff --git a/debian/patches/create-pom-file.patch b/debian/patches/create-pom-file.patch
new file mode 100644
index 0000000..3af68e8
--- /dev/null
+++ b/debian/patches/create-pom-file.patch
@@ -0,0 +1,190 @@
+Description: Create POM file for project
+
+--- /dev/null
++++ libhibernate-jbosscache-java-3.6.8.Final/pom.xml
+@@ -0,0 +1,185 @@
++<?xml version="1.0"?>
++<!--
++  ~ Hibernate, Relational Persistence for Idiomatic Java
++  ~
++  ~ Copyright (c) 2011, Red Hat Inc. or third-party contributors as
++  ~ indicated by the @author tags or express copyright attribution
++  ~ statements applied by the authors.  All third-party contributions are
++  ~ distributed under license by Red Hat Inc.
++  ~
++  ~ This copyrighted material is made available to anyone wishing to use, modify,
++  ~ copy, or redistribute it subject to the terms and conditions of the GNU
++  ~ Lesser General Public License, as published by the Free Software Foundation.
++  ~
++  ~ This program is distributed in the hope that it will be useful,
++  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
++  ~ for more details.
++  ~
++  ~ You should have received a copy of the GNU Lesser General Public License
++  ~ along with this distribution; if not, write to:
++  ~ Free Software Foundation, Inc.
++  ~ 51 Franklin Street, Fifth Floor
++  ~ Boston, MA  02110-1301  USA
++  -->
++<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>
++
++    <parent>
++        <groupId>org.hibernate</groupId>
++        <artifactId>hibernate-parent</artifactId>
++        <version>3.6.8.Final</version>
++        <relativePath>../hibernate-parent/pom.xml</relativePath>
++    </parent>
++    
++    <groupId>org.hibernate</groupId>
++    <artifactId>hibernate-jbosscache</artifactId>
++    <packaging>jar</packaging>
++
++    <name>Hibernate JBossCache Integration</name>
++    <description>Integration of Hibernate with JBossCache 3.x (though 2.x sould work as well)</description>
++
++    <dependencies>
++        <dependency>
++            <groupId>${project.groupId}</groupId>
++            <artifactId>hibernate-core</artifactId>
++            <version>${project.version}</version>
++        </dependency>
++        <dependency>
++            <groupId>org.jboss.cache</groupId>
++            <artifactId>jbosscache-core</artifactId>
++            <version>3.2.1.GA</version> 
++        </dependency>
++        
++        <!-- test dependencies -->
++        <dependency>
++            <groupId>${project.groupId}</groupId>
++            <artifactId>hibernate-testing</artifactId>
++            <version>${project.version}</version>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
++            <groupId>hsqldb</groupId>
++            <artifactId>hsqldb</artifactId>
++            <version>1.8.0.2</version>
++            <scope>test</scope>
++        </dependency>
++        <!-- this is optional on core :( and needed for testing -->
++        <dependency>
++            <groupId>cglib</groupId>
++            <artifactId>cglib</artifactId>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
++            <groupId>javassist</groupId>
++            <artifactId>javassist</artifactId>
++            <scope>test</scope>
++        </dependency>
++    </dependencies>
++
++    <build>
++        <testResources>
++            <testResource>
++                <filtering>false</filtering>
++                <directory>src/test/java</directory>
++                <includes>
++                    <include>**/*.xml</include>
++                </includes>
++            </testResource>
++            <testResource>
++                <filtering>true</filtering>
++                <directory>src/test/resources</directory>
++            </testResource>
++        </testResources>
++        
++        <plugins>
++            <plugin>
++                <groupId>org.apache.maven.plugins</groupId>
++                <artifactId>maven-compiler-plugin</artifactId>
++                <configuration>
++                    <source>1.5</source>
++                    <target>1.5</target>
++                </configuration>
++            </plugin>
++            <plugin>
++                <groupId>org.apache.maven.plugins</groupId>
++                <artifactId>maven-surefire-plugin</artifactId>
++                <configuration>
++                    <excludes>
++                        <!-- Skip a long-running test of a prototype class -->
++                        <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
++                    </excludes>
++                    <systemProperties>
++                        <property>
++                            <name>hibernate.test.validatefailureexpected</name>
++                            <value>true</value>
++                        </property>
++                        <property>
++                            <name>jgroups.bind_addr</name>
++                            <value>${jgroups.bind_addr}</value>
++                        </property>
++                        <!-- There are problems with multicast and IPv6 on some
++                             OS/JDK combos, so we tell Java to use IPv4. If you
++                             have problems with multicast when running the tests
++                             you can try setting this to 'false', although typically
++                             that won't be helpful.
++                        -->
++                        <property>
++                            <name>java.net.preferIPv4Stack</name>
++                            <value>true</value>
++                        </property>
++                        <!-- Tell JGroups to only wait a short time for PING 
++                             responses before determining coordinator. Speeds cluster
++                             formation during integration tests. (This is too
++                             low a value for a real system; only use for tests.)
++                        -->
++                        <property>
++                            <name>jgroups.ping.timeout</name>
++                            <value>500</value>
++                        </property>
++                        <!-- Tell JGroups to only require one PING response
++                             before determining coordinator. Speeds cluster
++                             formation during integration tests. (This is too
++                             low a value for a real system; only use for tests.)
++                        -->
++                        <property>
++                            <name>jgroups.ping.num_initial_members</name>
++                            <value>1</value>
++                        </property>
++                        <!-- Disable the JGroups message bundling feature
++                             to speed tests and avoid FLUSH issue -->
++                        <property>
++                            <name>jgroups.udp.enable_bundling</name>
++                            <value>false</value>
++                        </property>
++                    </systemProperties>
++                    <skipExec>${skipUnitTests}</skipExec>
++                </configuration>
++            </plugin>
++        </plugins>
++    </build>
++
++    <properties>
++        <skipUnitTests>true</skipUnitTests>
++        <!-- 
++            Following is the default jgroups mcast address.  If you find the testsuite runs very slowly, there
++            may be problems with multicast on the interface JGroups uses by default on your machine. You can
++            try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
++            setting the value to an interface where you know multicast works
++        -->
++        <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
++    </properties>
++
++    <profiles>
++        <profile>
++            <id>test</id>
++            <activation>
++                <activeByDefault>false</activeByDefault>
++            </activation>
++            <properties>
++                <skipUnitTests>false</skipUnitTests>
++            </properties>
++        </profile>
++     </profiles>
++</project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..16d7264
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+create-pom-file.patch
diff --git a/debian/rules b/debian/rules
index f6a439b..bd6d0a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,10 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=$(shell for jar in `cat debian/classpath`; do echo -n "$${jar}:"; done)
+export DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog |grep Version|awk -F": " '{print $$2}'|sed -e 's/-.*//')
 
 %:
-	dh $@ --with javahelper
+	dh --with javahelper $@
 
 override_jh_build:
 	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5" \
@@ -17,4 +18,9 @@ get-orig-source:
 		--no-symlink \
 		--destdir $(CURDIR)      \
 		--watchfile debian/watch \
-		--force-download
+		--force-download \
+		--debug \
+		--download-version $(DEB_UPSTREAM_VERSION) \
+		--rename
+
+
diff --git a/debian/watch b/debian/watch
index 20bcd8a..19a71ed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-http://anonsvn.jboss.org/repos/hibernate/core/tags/ \
-hibernate-(3.3.[0-9]+.GA)/ debian debian/orig-tar.sh
+# This watch file is not perfect. Better ideas are welcome.
+https://repository.jboss.org/nexus/content/groups/public-jboss/org/hibernate/hibernate-jbosscache/3.6.8.Final/ \
+hibernate-jbosscache-(.+)-sources.jar debian debian/orig-tar.sh

-- 
hibernate-jbosscache: Integration of Hibernate with JBossCache



More information about the pkg-java-commits mailing list