r2456 - in branches/jaxme/feature/debian: . ant debian
src/jaxme/org/apache/ws/jaxme/util
Marcus Better
marcusb-guest at costa.debian.org
Sun Sep 17 13:42:21 UTC 2006
Author: marcusb-guest
Date: 2006-09-17 13:42:21 +0000 (Sun, 17 Sep 2006)
New Revision: 2456
Added:
branches/jaxme/feature/debian/debian/README.Debian.source
branches/jaxme/feature/debian/debian/dirs
branches/jaxme/feature/debian/debian/doc-base
branches/jaxme/feature/debian/debian/svn-deblayout
branches/jaxme/feature/debian/jaxme.properties
Removed:
branches/jaxme/feature/debian/debian/README.Debian-source
branches/jaxme/feature/debian/debian/libjaxme-java-doc.doc-base
branches/jaxme/feature/debian/debian/libjaxme-java.dirs
branches/jaxme/feature/debian/debian/patches/
Modified:
branches/jaxme/feature/debian/ant/js.xml
branches/jaxme/feature/debian/ant/pm.xml
branches/jaxme/feature/debian/debian/README.Debian
branches/jaxme/feature/debian/debian/control
branches/jaxme/feature/debian/debian/copyright
branches/jaxme/feature/debian/debian/rules
branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
Log:
Cleanup. Get rid of cdbs.
Modified: branches/jaxme/feature/debian/ant/js.xml
===================================================================
--- branches/jaxme/feature/debian/ant/js.xml 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/ant/js.xml 2006-09-17 13:42:21 UTC (rev 2456)
@@ -34,15 +34,15 @@
<property name="src.js" location="${basedir}/src/js"/>
<path id="js.class.path">
- <pathelement location="${preqs}/log4j-1.2.8.jar"/>
- <pathelement location="${preqs}/ant-1.5.4.jar"/>
+ <pathelement location="${preqs}/log4j-1.2.jar"/>
+ <pathelement location="${preqs}/ant.jar"/>
<pathelement location="${preqs}/junit.jar"/>
<pathelement location="${preqs}/antlr.jar"/>
</path>
<path id="js.test.path">
<path refid="js.class.path"/>
- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+ <pathelement location="${preqs}/hsqldb.jar"/>
<pathelement location="${dist}/jaxmejs-${version}.jar"/>
<pathelement location="${build.js.test.classes}"/>
</path>
Modified: branches/jaxme/feature/debian/ant/pm.xml
===================================================================
--- branches/jaxme/feature/debian/ant/pm.xml 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/ant/pm.xml 2006-09-17 13:42:21 UTC (rev 2456)
@@ -37,7 +37,7 @@
<pathelement location="${dist}/jaxmexs-${version}.jar"/>
<pathelement location="${dist}/jaxme2-${version}.jar"/>
<pathelement location="${preqs}/beaver.jar"/>
- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+ <pathelement location="${preqs}/hsqldb.jar"/>
<pathelement location="${preqs}/ant.jar"/>
<pathelement location="${preqs}/xml-apis.jar"/>
<pathelement location="${preqs}/xercesImpl.jar"/>
@@ -73,6 +73,7 @@
source="1.3" target="1.3"
srcdir="${src.pm}">
<exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
+ <exclude name="org/apache/ws/jaxme/pm/xmldb/*"/>
<exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/>
<exclude name="org/apache/ws/jaxme/pm/ino/URLEncoder14.java" unless="have14"/>
</javac>
Modified: branches/jaxme/feature/debian/debian/README.Debian
===================================================================
--- branches/jaxme/feature/debian/debian/README.Debian 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/README.Debian 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,12 +1,12 @@
-libjaxme-java for Debian
------------------
+JaxMe for Debian
+----------------
-This debian package of JaxMe2 from the Apache Webservices
-project is built without the persistent part for the
-XML database system Tamino as this requires non-free libraries.
+This debian package of JaxMe 2 from the Apache Web Services project is
+built without the persistent part for the XML database system Tamino
+as this requires non-free libraries.
The persistence part for xmldb is also missing due to a currently
not available xmldb-api library to build against. This might be
added in the future.
- -- Wolfgang Baer <WBaer at gmx.de> Sun, 12 Feb 2006 17:19:01 +0100
+ -- Marcus Better <marcus at better.se>, Sun, 17 Sep 2006 14:55:09 +0200
Deleted: branches/jaxme/feature/debian/debian/README.Debian-source
===================================================================
--- branches/jaxme/feature/debian/debian/README.Debian-source 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/README.Debian-source 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,5 +0,0 @@
-From the original upstream distribution the prebuilt
-jar files were removed:
-
-rm src/documentation/jimi-1.0.jar
-rm prerequisites/*.jar
Copied: branches/jaxme/feature/debian/debian/README.Debian.source (from rev 2453, branches/jaxme/feature/debian/debian/README.Debian-source)
===================================================================
--- branches/jaxme/feature/debian/debian/README.Debian.source (rev 0)
+++ branches/jaxme/feature/debian/debian/README.Debian.source 2006-09-17 13:42:21 UTC (rev 2456)
@@ -0,0 +1,5 @@
+The following changes have been applied to the upstream source
+distribution:
+
+* Removed src/documentation/lib/jimi-1.0.jar (the JIMI Software
+ Development Kit from Sun) which has a questionable license.
Modified: branches/jaxme/feature/debian/debian/control
===================================================================
--- branches/jaxme/feature/debian/debian/control 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/control 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,32 +1,26 @@
-Source: libjaxme-java
+Source: jaxme
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.28), ant, ant-optional, antlr, java-gcj-compat-dev, junit, liblog4j1.2-java, libxerces2-java, libcommons-codec-java, libhsqldb-java
+Uploaders: Marcus Better <marcus at better.se>
+Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
+Build-Depends-Indep: antlr, java-gcj-compat-dev, junit, liblog4j1.2-java, libxerces2-java, libcommons-codec-java, libhsqldb-java
Standards-Version: 3.6.2
Package: libjaxme-java
Section: libs
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, liblog4j1.2-java, libcommons-codec-java
-Suggests: java-virtual-machine, libjaxme-java-doc
-Description: Implementation of JAXB, the specification for Java/XML binding
- JaxMe 2 is an open source implementation of JAXB, the specification for
- Java/XML binding from the Apache Webservices project.
- .
+Depends: kaffe | java1-runtime | java2-runtime, liblog4j1.2-java, libcommons-codec-java
+Suggests: java-virtual-machine
+Description: implementation of the JAXB specification for Java/XML binding
A Java/XML binding compiler takes as input a schema description. The output
is a set of Java classes:
- * A Java bean class compatible with the schema description
- * An unmarshaller that converts a XML document into the equivalent Java bean
- * A marshaller that converts the Java bean back into the XML document
+ * A Java bean class compatible with the schema description.
+ * An unmarshaller that converts a XML document into the equivalent Java bean.
+ * A marshaller that converts the Java bean back into the XML document.
.
- This package contains the JAXP API, JaxMe JavaSource framework,
- JaxMe parser forXML Schema and the JaxMe Persistence Management.
+ This package contains an implementation of the JAXB API, the JaxMe
+ JavaSource framework for generating Java sources, the JaxMe parser
+ for XML schema and the JaxMe Persistence Management layer.
-Package: libjaxme-java-doc
-Section: doc
-Architecture: all
-Suggests: libjaxme-java
-Description: Implementation of JAXB, Java/XML binding - documentation
- This package contains the full javadoc API documentation for JaxMe.
+ Homepage: http://ws.apache.org/jaxme/
Modified: branches/jaxme/feature/debian/debian/copyright
===================================================================
--- branches/jaxme/feature/debian/debian/copyright 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/copyright 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,17 +1,16 @@
This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
Sat, 23 Apr 2005 15:23:09 +0200.
-It was downloaded from <http://ws.apache.org/jaxme/index.html>
+It was taken over by Marcus Better <marcus at better.se> on Sun, 17 Sep
+2006 15:14:39 +0200.
-Copyright:
+The current maintainer is Marcus Better <marcus at better.se>.
-Copyright (C) 2003-2004 Apache Software Foundation. All rights reserved.
+It was downloaded from http://ws.apache.org/jaxme/ .
-Upstream Author: Jochen Wiedmann <jochen at apache.org> and others
+JaxMe is Copyright (C) 2002-2004 The Apache Software Foundation.
-License:
-
- Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -185,3 +184,7 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
+
+The contributions to the Debian packaging by Marcus Better are
+Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
+under the Apache License, Version 2.0.
Copied: branches/jaxme/feature/debian/debian/dirs (from rev 2453, branches/jaxme/feature/debian/debian/libjaxme-java.dirs)
===================================================================
--- branches/jaxme/feature/debian/debian/dirs (rev 0)
+++ branches/jaxme/feature/debian/debian/dirs 2006-09-17 13:42:21 UTC (rev 2456)
@@ -0,0 +1 @@
+usr/share/java
Copied: branches/jaxme/feature/debian/debian/doc-base (from rev 2453, branches/jaxme/feature/debian/debian/libjaxme-java-doc.doc-base)
===================================================================
--- branches/jaxme/feature/debian/debian/doc-base (rev 0)
+++ branches/jaxme/feature/debian/debian/doc-base 2006-09-17 13:42:21 UTC (rev 2456)
@@ -0,0 +1,9 @@
+Document: libjaxme-java
+Title: JaxMe 2 API
+Author: Apache JaxMe developers
+Abstract: JavaDoc documentation for JaxMe 2
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libjaxme-java/api/index.html
+Files: /usr/share/doc/libjaxme-java/api/*
Deleted: branches/jaxme/feature/debian/debian/libjaxme-java-doc.doc-base
===================================================================
--- branches/jaxme/feature/debian/debian/libjaxme-java-doc.doc-base 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/libjaxme-java-doc.doc-base 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,10 +0,0 @@
-Document: libjaxme-java-doc
-Title: Programmer API for libjaxme-java
-Author: Apache JaxMe developers
-Abstract: Programmer API of the JaxMe, an implementation of JAXB, the
- specification for Java/XML binding from the Apache Webservices project.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjaxme-java-doc/apidocs/index.html
-Files: /usr/share/doc/libjaxme-java-doc/apidocs/*
Deleted: branches/jaxme/feature/debian/debian/libjaxme-java.dirs
===================================================================
--- branches/jaxme/feature/debian/debian/libjaxme-java.dirs 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/libjaxme-java.dirs 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1 +0,0 @@
-usr/share/java
Modified: branches/jaxme/feature/debian/debian/rules
===================================================================
--- branches/jaxme/feature/debian/debian/rules 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/debian/rules 2006-09-17 13:42:21 UTC (rev 2456)
@@ -1,27 +1,68 @@
#!/usr/bin/make -f
-# debian/rules file for ws-jaxme (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar log4j-1.2 xercesImpl junit antlr $(ANT_HOME)/lib/ant-junit.jar commons-codec
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := all javadoc test
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
-install/libjaxme-java::
- install -m 644 dist/jaxmejs-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-js-$(VERSION).jar
- ln -s jaxme-js-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-js.jar
- install -m 644 dist/jaxmexs-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-xs-$(VERSION).jar
- ln -s jaxme-xs-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-xs.jar
- install -m 644 dist/jaxmepm-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-pm-$(VERSION).jar
- ln -s jaxme-pm-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-pm.jar
- install -m 644 dist/jaxmeapi-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-api-$(VERSION).jar
- ln -s jaxme-api-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme-api.jar
- install -m 644 dist/jaxme2-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme2-$(VERSION).jar
- ln -s jaxme2-$(VERSION).jar debian/libjaxme-java/usr/share/java/jaxme2.jar
+DEB_JARS := ant ant-launcher
+
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(DEB_ANT_ARGS)
+
+PKGNAME := libjaxme-java
+INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
+JAVALIBDIR := $(INSTALLDIR)/usr/share/java
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(ANT_INVOKE) all javadoc test
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ $(ANT_INVOKE) clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ mv $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/apidocs \
+ $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/api
+ for f in js xs pm api; do \
+ install -m 644 dist/jaxme$$f-$(VERSION).jar $(JAVALIBDIR) \
+ ln -s jaxme$$f-$(VERSION).jar $(JAVALIBDIR)/jaxme$$f.jar \
+ done
+ install -m 644 dist/jaxme2-$(VERSION).jar $(JAVALIBDIR)
+ ln -s jaxme2-$(VERSION).jar $(JAVALIBDIR)/jaxme2.jar
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Added: branches/jaxme/feature/debian/debian/svn-deblayout
===================================================================
--- branches/jaxme/feature/debian/debian/svn-deblayout (rev 0)
+++ branches/jaxme/feature/debian/debian/svn-deblayout 2006-09-17 13:42:21 UTC (rev 2456)
@@ -0,0 +1,2 @@
+buildArea=../../build-area
+origDir=..
Added: branches/jaxme/feature/debian/jaxme.properties
===================================================================
--- branches/jaxme/feature/debian/jaxme.properties (rev 0)
+++ branches/jaxme/feature/debian/jaxme.properties 2006-09-17 13:42:21 UTC (rev 2456)
@@ -0,0 +1 @@
+preqs=/usr/share/java
Modified: branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
===================================================================
--- branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java 2006-09-17 13:39:52 UTC (rev 2455)
+++ branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java 2006-09-17 13:42:21 UTC (rev 2456)
@@ -17,11 +17,9 @@
package org.apache.ws.jaxme.util;
import java.io.IOException;
+import org.apache.commons.codec.binary.Base64;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
/** A utility class for working with base64 encoding.
*/
public class Base64Binary {
@@ -37,13 +35,13 @@
* base64 encoded byte array.
*/
public static byte[] decode(String pValue) throws IOException {
- return (new BASE64Decoder()).decodeBuffer(pValue);
+ return (new Base64()).encode(pValue.getBytes());
}
/** Converts the base64 encoded byte array <code>pValue</code>
* into a string.
*/
public static String encode(byte[] pValue) {
- return (new BASE64Encoder()).encode(pValue);
+ return new String((new Base64()).decode(pValue));
}
}
More information about the pkg-java-commits
mailing list