From 2f275ec62810bf0a0fff23e4b4907bbe837faee9 Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Mar 09 2012 14:11:52 +0000 Subject: Packaging after license cleanup upstream --- diff --git a/.gitignore b/.gitignore index 577f8d3..b5bfbb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jboss-jaspi-1.0-api-1.0.0.Final.tar.xz +/jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz diff --git a/jboss-jaspi-1.0-api-1.0.0.Final-invalid-chars.patch b/jboss-jaspi-1.0-api-1.0.0.Final-invalid-chars.patch deleted file mode 100644 index b021dd4..0000000 --- a/jboss-jaspi-1.0-api-1.0.0.Final-invalid-chars.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java 2007-07-12 17:12:52.963741000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java 2012-01-25 03:09:28.911003173 -0500 -@@ -45,7 +45,7 @@ public class PasswordValidationCallback - * Create a new PasswordValidationCallback. - * - * @param username the username to authenticate -- * @param password the user�s password, which may be null. -+ * @param password the user's password, which may be null. - */ - public PasswordValidationCallback(Subject subject, String username, char[] password) - { -@@ -65,7 +65,7 @@ public class PasswordValidationCallback - /** - * Get the password. - * Note that this method returns a reference to the password. If a clone -- * of the array is created it is the caller�s responsibility to zero out -+ * of the array is created it is the caller's responsibility to zero out - * the password information after it is no longer needed. - * - * @return the password, which may be null. -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java 2010-11-01 13:27:39.306523000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java 2012-01-25 03:08:47.928999881 -0500 -@@ -146,7 +146,7 @@ public abstract class AuthConfigFactory - * e.g., with setfactory, it will be returned. Otherwise, an attempt will be made to - * construct an instance of the default AuthConfigFactory implementation class. The - * fully qualified class name of the default factory implementation class is obtained -- * from the value of the �authconfigprovider.factory� security property. When an -+ * from the value of the 'authconfigprovider.factory' security property. When an - * instance of the defaultfactory implementation class is successfully constructed by - * this method, this method will set it as the system-wide factory instance.

- * -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java 2010-11-01 13:27:39.306523000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java 2012-01-25 03:07:46.583995837 -0500 -@@ -78,7 +78,7 @@ public interface AuthConfigProvider - * encapsulated by ClientAuthContext objects derived from the - * returned ClientAuthConfig. This parameter may be null, in which - * case the implementation may assign a default handler to the -- * configuration. The �authconfigprovider.client.callbackhandler� -+ * configuration. The 'authconfigprovider.client.callbackhandler' - * security property is used to define the fully qualified name of - * the default CallbackHandler implementation class. - * @return a ClientAuthConfig Object that describes the configuration of -@@ -107,7 +107,7 @@ public interface AuthConfigProvider - * encapsulated by ServerAuthContext objects derived from the - * returned ServerAuthConfig. This parameter may be null, in which - * case the implementation may assign a default handler to the -- * configuration. The �authconfigprovider.client.callbackhandler� -+ * configuration. The 'authconfigprovider.client.callbackhandler' - * security property is used to define the fully qualified name of - * the default CallbackHandler implementation class. - * @return a ServerAuthConfig Object that describes the configuration of -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/ClientAuthConfig.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/ClientAuthConfig.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/ClientAuthConfig.java 2007-07-12 17:12:52.963741000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/ClientAuthConfig.java 2012-01-25 03:08:21.216999641 -0500 -@@ -59,7 +59,7 @@ public interface ClientAuthConfig extend - * returned ClientAuthContext instance.

- *

The ClientAuthConfig object establishes the request and response MessagePolicy - * objects that are passed to the encapsulated modules when they are initialized by the -- * returned ClientAuthContext instance. It is the modules� responsibility to enforce -+ * returned ClientAuthContext instance. It is the modules' responsibility to enforce - * these policies when invoked.

- * - * @param operation an operation identifier used to index the provided config, or null. -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/ServerAuthConfig.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/ServerAuthConfig.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/config/ServerAuthConfig.java 2007-07-12 17:12:52.963741000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/config/ServerAuthConfig.java 2012-01-25 03:08:04.313005589 -0500 -@@ -57,7 +57,7 @@ public interface ServerAuthConfig extend - * returned ServerAuthContext instance.

- *

The ServerAuthConfig object establishes the request and response MessagePolicy - * objects that are passed to the encapsulated modules when they are initialized by -- * the returned ServerAuthContext instance. It is the modules� responsibility to -+ * the returned ServerAuthContext instance. It is the modules' responsibility to - * enforce these policies when invoked.

- * - * @param operation an operation identifier used to index the provided config, or null. -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/module/ClientAuthModule.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/module/ClientAuthModule.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/module/ClientAuthModule.java 2007-07-12 17:12:52.963741000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/module/ClientAuthModule.java 2012-01-25 03:09:42.707999766 -0500 -@@ -33,7 +33,7 @@ import javax.security.auth.message.Messa - * response messages.

- *

A module implementation should assume it may be used to secure different - * requests as different clients. A module should also assume it may be used -- * concurrently by multiple callers. It is the module implementation�s responsibility -+ * concurrently by multiple callers. It is the module implementation's responsibility - * to properly save and restore any state as necessary. A module that does not need - * to do so may remain completely stateless.

- * -@@ -75,4 +75,4 @@ public interface ClientAuthModule extend - */ - public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, - CallbackHandler handler, Map options) throws AuthException; --} -\ No newline at end of file -+} -diff -rupN jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/module/ServerAuthModule.java jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/module/ServerAuthModule.java ---- jboss-jaspi-1.0-api-1.0.0.Final.orig/src/main/java/javax/security/auth/message/module/ServerAuthModule.java 2006-05-23 16:18:57.000000000 -0400 -+++ jboss-jaspi-1.0-api-1.0.0.Final/src/main/java/javax/security/auth/message/module/ServerAuthModule.java 2012-01-25 03:10:01.969000194 -0500 -@@ -35,7 +35,7 @@ import javax.security.auth.message.Serve - * back to the client.

- *

A module implementation should assume it may be used to secure different - * requests as different clients. A module should also assume it may be used -- * concurrently by multiple callers. It is the module implementation�s responsibility -+ * concurrently by multiple callers. It is the module implementation's responsibility - * to properly save and restore any state as necessary. A module that does not need - * to do so may remain completely stateless. Every implementation of the interface - * must provide a public zero argument contructor.

diff --git a/jboss-jaspi-1.0-api.spec b/jboss-jaspi-1.0-api.spec index 9588ff7..5858294 100644 --- a/jboss-jaspi-1.0-api.spec +++ b/jboss-jaspi-1.0-api.spec @@ -1,21 +1,18 @@ -%global namedreltag .Final +%global namedreltag .20120309gitdc8eed %global namedversion %{version}%{?namedreltag} Name: jboss-jaspi-1.0-api -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 0.1%{namedreltag}%{?dist} Summary: JBoss Java Authentication SPI for Containers 1.0 API Group: Development/Libraries -License: LGPLv2+ +License: CDDL or GPLv2 with exceptions URL: http://www.jboss.org # git clone git://github.com/jboss/jboss-jaspi-api_spec.git -# cd jboss-jaspi-api_spec/ && git archive --format=tar --prefix=jboss-jaspi-1.0-api-1.0.0.Final/ jboss-jaspi-api_1.0_spec-1.0.0.Final | xz > jboss-jaspi-1.0-api-1.0.0.Final.tar.xz +# cd jboss-jaspi-api_spec/ && git archive --format=tar --prefix=jboss-jaspi-1.0-api/ dc8eedb8526ebdc76dcd37951a3cce609613f39c | xz > jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz Source0: %{name}-%{namedversion}.tar.xz -# Patch to fix invalid ASCII chars -Patch0: %{name}-%{namedversion}-invalid-chars.patch - BuildRequires: jpackage-utils BuildRequires: java-devel BuildRequires: maven @@ -44,8 +41,22 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{namedversion} -%patch0 -p1 +%setup -q -n jboss-jaspi-1.0-api + +# Fixing JDK7 ASCII issues +files=' +src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java +src/main/java/javax/security/auth/message/config/AuthConfigFactory.java +src/main/java/javax/security/auth/message/config/AuthConfigProvider.java +src/main/java/javax/security/auth/message/config/ClientAuthConfig.java +src/main/java/javax/security/auth/message/config/ServerAuthConfig.java +src/main/java/javax/security/auth/message/module/ClientAuthModule.java +src/main/java/javax/security/auth/message/module/ServerAuthModule.java +' + +for f in ${files}; do + native2ascii -encoding UTF8 ${f} ${f} +done %build mvn-rpmbuild install javadoc:aggregate @@ -53,27 +64,32 @@ mvn-rpmbuild install javadoc:aggregate %install install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JAR -install -pm 644 target/jboss-jaspi-api_1.0_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -pm 644 target/jboss-jaspi-api_1.0_spec-%{version}-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # POM install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar # APIDOCS -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files %{_javadir}/%{name}.jar %{_mavenpomdir}/* %{_mavendepmapfragdir}/* +%doc LICENSE README %files javadoc %{_javadocdir}/%{name} +%doc LICENSE %changelog +* Fri Mar 09 2012 Marek Goldmann 1.0.1-0.1.20120309gitdc8eed +- Packaging after license cleanup upstream + * Fri Feb 24 2012 Marek Goldmann 1.0.0-3 - Relocated jars to _javadir diff --git a/sources b/sources index 6928de3..3d7ac63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4967586d66479af54f431773e52ee25 jboss-jaspi-1.0-api-1.0.0.Final.tar.xz +d2f4885b31754f3bee87115054e51c60 jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz