rpms/appframework/devel appframework-1.03-no-local-storage.diff, NONE, 1.1 appframework-1.03-openjdk.diff, NONE, 1.1 appframework.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Aug 29 10:49:13 UTC 2008

Author: victorv

Update of /cvs/pkgs/rpms/appframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29164/devel

Modified Files:
	.cvsignore sources 
Added Files:
	appframework-1.03-no-local-storage.diff 
	appframework-1.03-openjdk.diff appframework.spec import.log 
Log Message:
Initial version


appframework-1.03-no-local-storage.diff:

--- NEW FILE appframework-1.03-no-local-storage.diff ---
--- src/org/jdesktop/application/LocalStorage.orig	2007-12-13 10:40:54.000000000 +0100
+++ src/org/jdesktop/application/LocalStorage.java	2007-12-13 10:42:01.000000000 +0100
@@ -31,11 +31,6 @@
 import java.security.PrivilegedAction;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.jnlp.BasicService;
-import javax.jnlp.FileContents;
-import javax.jnlp.PersistenceService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
 
 
 /**
@@ -377,7 +372,7 @@
 		}
 	    }
 	    if (bsFound && psFound) {
-		return new PersistenceServiceIO();
+		//return new PersistenceServiceIO();
 	    }
 	}
 	catch (Exception ignore) {
@@ -385,7 +380,7 @@
 	}
 	return null;
     }
-
+/*
     private class PersistenceServiceIO extends LocalIO {
 	private BasicService bs;
 	private PersistenceService ps;
@@ -442,7 +437,7 @@
 		catch (FileNotFoundException e) {
 		    /* Verify that the max size for new PersistenceService 
 		     * files is >= 100K (2^17) before opening one.
-		     */
+		     * /
 		    long maxSizeRequest = 131072L;
 		    long maxSize = ps.create(fileURL, maxSizeRequest);
 		    if (maxSize >= maxSizeRequest) {
@@ -473,4 +468,5 @@
 	    }
 	}
     }
+ */
 }

appframework-1.03-openjdk.diff:

--- NEW FILE appframework-1.03-openjdk.diff ---
diff -Nur AppFramework-1.03/nbproject/project.properties AppFramework-1.03.new/nbproject/project.properties
--- AppFramework-1.03/nbproject/project.properties	2007-09-20 17:29:34.000000000 +0400
+++ AppFramework-1.03.new/nbproject/project.properties	2008-07-15 21:18:28.000000000 +0400
@@ -16,9 +16,15 @@
 dist.dir=dist
 dist.jar=${dist.dir}/AppFramework.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.swing-worker.jar=lib/swing-worker.jar
+# As of Java 6, SwingWorker is included in the JRE. 
+# file.reference.swing-worker.jar=lib/swing-worker.jar
+# The SwingWorker class isn't accessible in OpenJDK until rt.jur is added to classpath.
+file.reference.swing-worker.jar=/usr/lib/jvm/java/jre/lib/rt.jar
 osx.jnlp.classpath=/Applications/Utilities/Java/Java\ Web\ Start.app/Contents/MacOS/javaws.jar
-jnlp.classpath=${java.home}/lib/javaws.jar
+# In OpenJDK (java-1.6.0-openjdk-1.6.0.0-0.10.b09.fc9) the classes of the javaws.jar are placed into rt.jar.
+# jnlp.classpath=${java.home}/lib/javaws.jar
+# The classes of the javax.jnlp package aren't accessible in OpenJDK until rt.jar is added to classpath.
+jnlp.classpath=/usr/lib/jvm/java/jre/lib/rt.jar
 jar.compress=false
 javac.classpath=\
     ${jnlp.classpath}:\
diff -Nur AppFramework-1.03/src/org/jdesktop/application/Task.java AppFramework-1.03.new/src/org/jdesktop/application/Task.java
--- AppFramework-1.03/src/org/jdesktop/application/Task.java	2007-10-31 16:04:48.000000000 +0300
+++ AppFramework-1.03.new/src/org/jdesktop/application/Task.java	2008-07-16 01:02:49.000000000 +0400
@@ -15,8 +15,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.jdesktop.swingworker.SwingWorker;
-import org.jdesktop.swingworker.SwingWorker.StateValue;
+import javax.swing.SwingWorker;
+import javax.swing.SwingWorker.StateValue;
 
 
 /**
diff -Nur AppFramework-1.03/src/org/jdesktop/application/TaskMonitor.java AppFramework-1.03.new/src/org/jdesktop/application/TaskMonitor.java
--- AppFramework-1.03/src/org/jdesktop/application/TaskMonitor.java	2007-09-20 17:29:36.000000000 +0400
+++ AppFramework-1.03.new/src/org/jdesktop/application/TaskMonitor.java	2008-07-16 01:01:10.000000000 +0400
@@ -9,7 +9,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import org.jdesktop.swingworker.SwingWorker.StateValue;
+import javax.swing.SwingWorker.StateValue;
 
 
 /**


--- NEW FILE appframework.spec ---
Name:    appframework
Version: 1.03
Release: 4%{?dist}
Summary: Swing Application Framework
License: LGPLv2+
URL:     https://appframework.dev.java.net/
Group:   Development/Libraries

Source0: https://appframework.dev.java.net/downloads/AppFramework-1.03-src.zip
Patch0:  %{name}-%{version}-no-local-storage.diff
Patch1:  %{name}-%{version}-openjdk.diff

BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: ant-junit
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: swing-layout >= 1.0.3

Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: swing-layout >= 1.0.3

BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The JSR-296 Swing Application Framework prototype implementation is a small 
set of Java classes that simplify building desktop applications.

%package javadoc
Summary: Javadoc for %{name}
Group:   Documentation

%description javadoc
Javadoc for %{name}.

%prep

%setup -q -n AppFramework-%{version}

# remove all binary libs
find . -name "*.jar" -exec %{__rm} -f {} \;

%patch0 -b .sav
%patch1 -p1 -b .sav

%build
%{ant} -Dlibs.swing-layout.classpath=%{_javadir}/swing-layout.jar dist

%install
%{__rm} -fr %{buildroot}
# jar
%{__install} -d -m 755 %{buildroot}%{_javadir}
%{__install} -m 644 dist/AppFramework-1.03.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__cp} -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc COPYING README

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/*

%changelog
* Wed Aug 27 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.03-4
- The %%defattr(-,root,root,-) is used everywhere

* Mon Aug 25 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.03-3
- Use the %%{ant} instead of the ant command
- Use the %%{version} in the "-n" option of the %%setup

* Wed Aug 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.03-2
- java-devel & jpackage-utils are added as the build requirements.
- jpackage-utils is added as the run-time requirement.
- Appropriate values of Group Tags are chosen from the official list.
- Redundant run-time requirements for /bin/* utilities are removed.
- A ghost symlink for javadoc package is removed.
- Documentation added.
- Both build-time and run-time requirements for the swing-layout package are added.
- Redundant dependency on swing-worker is removed.

* Mon Jul 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.03-1
- Fix version number 1.0.3 -> 1.03 .
- Remove swingworker from requirement due to JRE 6 includes it.
- Fix Summary.
- Change BuldRoot.
- Bootstrap into Fedora.

* Thu Jun 19 2008 Thierry Vignaud <tvignaud at mandriva.com> 0:1.0.3-3mdv2009.0
+ Revision: 226162
- rebuild

* Sun Dec 16 2007 Anssi Hannula <anssi at mandriva.org> 0:1.0.3-2mdv2008.1
+ Revision: 120823
- buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64)

* Thu Dec 13 2007 Jaroslav Tulach <jtulach at mandriva.org> 0:1.0.3-1mdv2008.1
+ Revision: 119282
- Removing support for JNLP mode, as the classes needed for compilation do not seem to be present in Iced Tea
- Initial package for Swing Application Framework
- create appframework


--- NEW FILE import.log ---
appframework-1_03-4_fc10:HEAD:appframework-1.03-4.fc10.src.rpm:1220006848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/appframework/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2008 04:29:14 -0000	1.1
+++ .cvsignore	29 Aug 2008 10:48:43 -0000	1.2
@@ -0,0 +1 @@
+AppFramework-1.03-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/appframework/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2008 04:29:14 -0000	1.1
+++ sources	29 Aug 2008 10:48:43 -0000	1.2
@@ -0,0 +1 @@
+f600e8019b94033a88b351674ffdbdf9  AppFramework-1.03-src.zip


