United StatesChange Country, Oracle Worldwide Web Sites Communities I am a... I want to...
Bug ID: JDK-7029905 demo applets missing some html files
JDK-7029905 : demo applets missing some html files

Details
Type:
Bug
Submit Date:
2011-03-22
Status:
Closed
Updated Date:
2011-04-25
Project Name:
JDK
Resolved Date:
2011-04-21
Component:
infrastructure
OS:
linux_ubuntu,generic
Sub-Component:
build
CPU:
x86,generic
Priority:
P2
Resolution:
Fixed
Affected Versions:
OpenJDK6,7
Fixed Versions:

Related Reports
Backport:
Duplicate:
Relates:

Sub Tasks

Description
in the jfc demos in the JDK there are no longer the html files to run the demos with appletviewer
example: no jdk/demo/jfc/SwingSet2/SwingSet2.html

                                    

Comments
SUGGESTED FIX

diff --git a/make/mkdemo/jfc/Font2DTest/Makefile b/make/mkdemo/jfc/Font2DTest/Makefile
--- a/make/mkdemo/jfc/Font2DTest/Makefile
+++ b/make/mkdemo/jfc/Font2DTest/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
 
diff --git a/make/mkdemo/jfc/Java2D/Makefile b/make/mkdemo/jfc/Java2D/Makefile
--- a/make/mkdemo/jfc/Java2D/Makefile
+++ b/make/mkdemo/jfc/Java2D/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/Java2D
-DEMO_TOPFILES   = ./Java2Demo.html ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = java2d.Java2Demo
 DEMO_DESTDIR    = $(DEMODIR)/jfc/Java2D
 
diff --git a/make/mkdemo/jfc/SwingApplet/Makefile b/make/mkdemo/jfc/SwingApplet/Makefile
--- a/make/mkdemo/jfc/SwingApplet/Makefile
+++ b/make/mkdemo/jfc/SwingApplet/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
 
diff --git a/make/mkdemo/jfc/SwingSet2/Makefile b/make/mkdemo/jfc/SwingSet2/Makefile
--- a/make/mkdemo/jfc/SwingSet2/Makefile
+++ b/make/mkdemo/jfc/SwingSet2/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_MANIFEST_ATTR = SplashScreen-Image: resources/images/splash.png
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
                                     
2011-04-04
EVALUATION

Comparing jdk1.6.0 with jdk1.7.0:

svc6<1244>  find /opt/java/jdk1.6.0/demo -name \[A-Z]\*.html
/opt/java/jdk1.6.0/demo/plugin/jfc/SwingSet2/SwingSet2.html
/opt/java/jdk1.6.0/demo/plugin/jfc/Java2D/Java2Demo.html
/opt/java/jdk1.6.0/demo/plugin/jfc/Font2DTest/Font2DTest.html
/opt/java/jdk1.6.0/demo/plugin/jfc/SwingApplet/SwingApplet.html
/opt/java/jdk1.6.0/demo/plugin/jfc/CodePointIM/README.html
/opt/java/jdk1.6.0/demo/plugin/jfc/CodePointIM/README_zh_CN.html
/opt/java/jdk1.6.0/demo/plugin/jfc/CodePointIM/README_ja.html
/opt/java/jdk1.6.0/demo/jfc/CodePointIM/README.html
/opt/java/jdk1.6.0/demo/jfc/CodePointIM/README_ja.html
/opt/java/jdk1.6.0/demo/jfc/CodePointIM/README_zh_CN.html
/opt/java/jdk1.6.0/demo/jfc/Font2DTest/Font2DTest.html
/opt/java/jdk1.6.0/demo/jfc/Java2D/Java2Demo.html
/opt/java/jdk1.6.0/demo/jfc/SwingSet2/SwingSet2.html
/opt/java/jdk1.6.0/demo/jfc/SwingApplet/SwingApplet.html

svc6<1245> find /opt/java/jdk1.7.0/demo -name \[A-Z]\*.html
/opt/java/jdk1.7.0/demo/plugin/jfc/Java2D/Java2Demo.html
/opt/java/jdk1.7.0/demo/plugin/jfc/CodePointIM/README.html
/opt/java/jdk1.7.0/demo/plugin/jfc/CodePointIM/README_zh_CN.html
/opt/java/jdk1.7.0/demo/plugin/jfc/CodePointIM/README_ja.html
/opt/java/jdk1.7.0/demo/jfc/Java2D/Java2Demo.html
/opt/java/jdk1.7.0/demo/jfc/CodePointIM/README_ja.html
/opt/java/jdk1.7.0/demo/jfc/CodePointIM/README.html
/opt/java/jdk1.7.0/demo/jfc/CodePointIM/README_zh_CN.html

Ignoring the readmes, I see these missing:

/opt/java/jdk1.6.0/demo/plugin/jfc/SwingSet2/SwingSet2.html
/opt/java/jdk1.6.0/demo/plugin/jfc/Font2DTest/Font2DTest.html
/opt/java/jdk1.6.0/demo/plugin/jfc/SwingApplet/SwingApplet.html
/opt/java/jdk1.6.0/demo/jfc/Font2DTest/Font2DTest.html
/opt/java/jdk1.6.0/demo/jfc/SwingSet2/SwingSet2.html
/opt/java/jdk1.6.0/demo/jfc/SwingApplet/SwingApplet.html

Fixing the bottom 3 should fix the top 3.

This is the proposed fix:

diff --git a/make/mkdemo/jfc/Font2DTest/Makefile b/make/mkdemo/jfc/Font2DTest/Makefile
--- a/make/mkdemo/jfc/Font2DTest/Makefile
+++ b/make/mkdemo/jfc/Font2DTest/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
 
diff --git a/make/mkdemo/jfc/Java2D/Makefile b/make/mkdemo/jfc/Java2D/Makefile
--- a/make/mkdemo/jfc/Java2D/Makefile
+++ b/make/mkdemo/jfc/Java2D/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/Java2D
-DEMO_TOPFILES   = ./Java2Demo.html ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = java2d.Java2Demo
 DEMO_DESTDIR    = $(DEMODIR)/jfc/Java2D
 
diff --git a/make/mkdemo/jfc/SwingApplet/Makefile b/make/mkdemo/jfc/SwingApplet/Makefile
--- a/make/mkdemo/jfc/SwingApplet/Makefile
+++ b/make/mkdemo/jfc/SwingApplet/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
 
diff --git a/make/mkdemo/jfc/SwingSet2/Makefile b/make/mkdemo/jfc/SwingSet2/Makefile
--- a/make/mkdemo/jfc/SwingSet2/Makefile
+++ b/make/mkdemo/jfc/SwingSet2/Makefile
@@ -33,7 +33,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_MANIFEST_ATTR = SplashScreen-Image: resources/images/splash.png
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
                                     
2011-04-04
EVALUATION

http://hg.openjdk.java.net/jdk7/build/jdk/rev/9d1f5ad258f8
                                     
2011-04-05



Hardware and Software, Engineered to Work Together