convert build to maven
diff --git a/src/share/classes/com/sun/activation/registries/LogSupport.java b/activation/src/main/java/com/sun/activation/registries/LogSupport.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/LogSupport.java rename to activation/src/main/java/com/sun/activation/registries/LogSupport.java
diff --git a/src/share/classes/com/sun/activation/registries/MailcapFile.java b/activation/src/main/java/com/sun/activation/registries/MailcapFile.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/MailcapFile.java rename to activation/src/main/java/com/sun/activation/registries/MailcapFile.java
diff --git a/src/share/classes/com/sun/activation/registries/MailcapParseException.java b/activation/src/main/java/com/sun/activation/registries/MailcapParseException.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/MailcapParseException.java rename to activation/src/main/java/com/sun/activation/registries/MailcapParseException.java
diff --git a/src/share/classes/com/sun/activation/registries/MailcapTokenizer.java b/activation/src/main/java/com/sun/activation/registries/MailcapTokenizer.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/MailcapTokenizer.java rename to activation/src/main/java/com/sun/activation/registries/MailcapTokenizer.java
diff --git a/src/share/classes/com/sun/activation/registries/MimeTypeEntry.java b/activation/src/main/java/com/sun/activation/registries/MimeTypeEntry.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/MimeTypeEntry.java rename to activation/src/main/java/com/sun/activation/registries/MimeTypeEntry.java
diff --git a/src/share/classes/com/sun/activation/registries/MimeTypeFile.java b/activation/src/main/java/com/sun/activation/registries/MimeTypeFile.java similarity index 100% rename from src/share/classes/com/sun/activation/registries/MimeTypeFile.java rename to activation/src/main/java/com/sun/activation/registries/MimeTypeFile.java
diff --git a/src/share/classes/com/sun/activation/viewers/ImageViewer.java b/activation/src/main/java/com/sun/activation/viewers/ImageViewer.java similarity index 100% rename from src/share/classes/com/sun/activation/viewers/ImageViewer.java rename to activation/src/main/java/com/sun/activation/viewers/ImageViewer.java
diff --git a/src/share/classes/com/sun/activation/viewers/ImageViewerCanvas.java b/activation/src/main/java/com/sun/activation/viewers/ImageViewerCanvas.java similarity index 100% rename from src/share/classes/com/sun/activation/viewers/ImageViewerCanvas.java rename to activation/src/main/java/com/sun/activation/viewers/ImageViewerCanvas.java
diff --git a/src/share/classes/com/sun/activation/viewers/TextEditor.java b/activation/src/main/java/com/sun/activation/viewers/TextEditor.java similarity index 100% rename from src/share/classes/com/sun/activation/viewers/TextEditor.java rename to activation/src/main/java/com/sun/activation/viewers/TextEditor.java
diff --git a/src/share/classes/com/sun/activation/viewers/TextViewer.java b/activation/src/main/java/com/sun/activation/viewers/TextViewer.java similarity index 100% rename from src/share/classes/com/sun/activation/viewers/TextViewer.java rename to activation/src/main/java/com/sun/activation/viewers/TextViewer.java
diff --git a/src/share/classes/javax/activation/ActivationDataFlavor.java b/activation/src/main/java/javax/activation/ActivationDataFlavor.java similarity index 100% rename from src/share/classes/javax/activation/ActivationDataFlavor.java rename to activation/src/main/java/javax/activation/ActivationDataFlavor.java
diff --git a/src/share/classes/javax/activation/CommandInfo.java b/activation/src/main/java/javax/activation/CommandInfo.java similarity index 100% rename from src/share/classes/javax/activation/CommandInfo.java rename to activation/src/main/java/javax/activation/CommandInfo.java
diff --git a/src/share/classes/javax/activation/CommandMap.java b/activation/src/main/java/javax/activation/CommandMap.java similarity index 100% rename from src/share/classes/javax/activation/CommandMap.java rename to activation/src/main/java/javax/activation/CommandMap.java
diff --git a/src/share/classes/javax/activation/CommandObject.java b/activation/src/main/java/javax/activation/CommandObject.java similarity index 100% rename from src/share/classes/javax/activation/CommandObject.java rename to activation/src/main/java/javax/activation/CommandObject.java
diff --git a/src/share/classes/javax/activation/DataContentHandler.java b/activation/src/main/java/javax/activation/DataContentHandler.java similarity index 100% rename from src/share/classes/javax/activation/DataContentHandler.java rename to activation/src/main/java/javax/activation/DataContentHandler.java
diff --git a/src/share/classes/javax/activation/DataContentHandlerFactory.java b/activation/src/main/java/javax/activation/DataContentHandlerFactory.java similarity index 100% rename from src/share/classes/javax/activation/DataContentHandlerFactory.java rename to activation/src/main/java/javax/activation/DataContentHandlerFactory.java
diff --git a/src/share/classes/javax/activation/DataHandler.java b/activation/src/main/java/javax/activation/DataHandler.java similarity index 100% rename from src/share/classes/javax/activation/DataHandler.java rename to activation/src/main/java/javax/activation/DataHandler.java
diff --git a/src/share/classes/javax/activation/DataSource.java b/activation/src/main/java/javax/activation/DataSource.java similarity index 100% rename from src/share/classes/javax/activation/DataSource.java rename to activation/src/main/java/javax/activation/DataSource.java
diff --git a/src/share/classes/javax/activation/FileDataSource.java b/activation/src/main/java/javax/activation/FileDataSource.java similarity index 100% rename from src/share/classes/javax/activation/FileDataSource.java rename to activation/src/main/java/javax/activation/FileDataSource.java
diff --git a/src/share/classes/javax/activation/FileTypeMap.java b/activation/src/main/java/javax/activation/FileTypeMap.java similarity index 100% rename from src/share/classes/javax/activation/FileTypeMap.java rename to activation/src/main/java/javax/activation/FileTypeMap.java
diff --git a/src/share/classes/javax/activation/MailcapCommandMap.java b/activation/src/main/java/javax/activation/MailcapCommandMap.java similarity index 100% rename from src/share/classes/javax/activation/MailcapCommandMap.java rename to activation/src/main/java/javax/activation/MailcapCommandMap.java
diff --git a/src/share/classes/javax/activation/MimeType.java b/activation/src/main/java/javax/activation/MimeType.java similarity index 100% rename from src/share/classes/javax/activation/MimeType.java rename to activation/src/main/java/javax/activation/MimeType.java
diff --git a/src/share/classes/javax/activation/MimeTypeParameterList.java b/activation/src/main/java/javax/activation/MimeTypeParameterList.java similarity index 100% rename from src/share/classes/javax/activation/MimeTypeParameterList.java rename to activation/src/main/java/javax/activation/MimeTypeParameterList.java
diff --git a/src/share/classes/javax/activation/MimeTypeParseException.java b/activation/src/main/java/javax/activation/MimeTypeParseException.java similarity index 100% rename from src/share/classes/javax/activation/MimeTypeParseException.java rename to activation/src/main/java/javax/activation/MimeTypeParseException.java
diff --git a/src/share/classes/javax/activation/MimetypesFileTypeMap.java b/activation/src/main/java/javax/activation/MimetypesFileTypeMap.java similarity index 100% rename from src/share/classes/javax/activation/MimetypesFileTypeMap.java rename to activation/src/main/java/javax/activation/MimetypesFileTypeMap.java
diff --git a/src/share/classes/javax/activation/SecuritySupport.java b/activation/src/main/java/javax/activation/SecuritySupport.java similarity index 100% rename from src/share/classes/javax/activation/SecuritySupport.java rename to activation/src/main/java/javax/activation/SecuritySupport.java
diff --git a/src/share/classes/javax/activation/URLDataSource.java b/activation/src/main/java/javax/activation/URLDataSource.java similarity index 100% rename from src/share/classes/javax/activation/URLDataSource.java rename to activation/src/main/java/javax/activation/URLDataSource.java
diff --git a/src/share/classes/javax/activation/UnsupportedDataTypeException.java b/activation/src/main/java/javax/activation/UnsupportedDataTypeException.java similarity index 100% rename from src/share/classes/javax/activation/UnsupportedDataTypeException.java rename to activation/src/main/java/javax/activation/UnsupportedDataTypeException.java
diff --git a/src/share/classes/javax/activation/package.html b/activation/src/main/java/javax/activation/package.html similarity index 100% rename from src/share/classes/javax/activation/package.html rename to activation/src/main/java/javax/activation/package.html
diff --git a/src/share/lib/mailcap.default b/activation/src/main/resources/META-INF/mailcap.default similarity index 100% rename from src/share/lib/mailcap.default rename to activation/src/main/resources/META-INF/mailcap.default
diff --git a/src/share/lib/mimetypes.default b/activation/src/main/resources/META-INF/mimetypes.default similarity index 100% rename from src/share/lib/mimetypes.default rename to activation/src/main/resources/META-INF/mimetypes.default
diff --git a/build/classes.mk b/build/classes.mk deleted file mode 100644 index ff75b86..0000000 --- a/build/classes.mk +++ /dev/null
@@ -1,128 +0,0 @@ -# -# VERSION: @(#)classes.mk 1.12 97/12/02 -# this file defines the following Makefile variables: -# SRCS == a space separated list of full pathes to the source files -# CLASSES == a space separated list of the full pathes to the class files -# - -JAVAX_SRCS = \ -$(SRC_DIR)/javax/activation/MailcapCommandMap.java \ -$(SRC_DIR)/javax/activation/CommandMap.java \ -$(SRC_DIR)/javax/activation/CommandObject.java \ -$(SRC_DIR)/javax/activation/CommandInfo.java \ -$(SRC_DIR)/javax/activation/MimeType.java \ -$(SRC_DIR)/javax/activation/MimeTypeParameterList.java \ -$(SRC_DIR)/javax/activation/MimeTypeParseException.java \ -$(SRC_DIR)/javax/activation/ActivationDataFlavor.java \ -$(SRC_DIR)/javax/activation/DataContentHandler.java \ -$(SRC_DIR)/javax/activation/DataContentHandlerFactory.java \ -$(SRC_DIR)/javax/activation/UnsupportedDataTypeException.java \ -$(SRC_DIR)/javax/activation/DataHandler.java \ -$(SRC_DIR)/javax/activation/DataSource.java \ -$(SRC_DIR)/javax/activation/URLDataSource.java \ -$(SRC_DIR)/javax/activation/FileTypeMap.java \ -$(SRC_DIR)/javax/activation/MimetypesFileTypeMap.java \ -$(SRC_DIR)/javax/activation/FileDataSource.java - -COM_SUN_SRCS = \ -$(SRC_DIR)/com/sun/activation/registries/MailcapEntry.java \ -$(SRC_DIR)/com/sun/activation/registries/MailcapFile.java \ -$(SRC_DIR)/com/sun/activation/registries/MimeTypeEntry.java \ -$(SRC_DIR)/com/sun/activation/registries/MimeTypeFile.java \ -$(SRC_DIR)/com/sun/activation/viewers/ImageViewer.java \ -$(SRC_DIR)/com/sun/activation/viewers/ImageViewerCanvas.java \ -$(SRC_DIR)/com/sun/activation/viewers/TextEditor.java \ -$(SRC_DIR)/com/sun/activation/viewers/TextViewer.java \ -$(SRC_DIR)/com/sun/activation/registries/MailcapTokenizer.java \ -$(SRC_DIR)/com/sun/activation/registries/MailcapParseException.java - -TEST_SRCS = \ -$(SRC_DIR)/test/AppletTest.java \ -$(SRC_DIR)/test/CLTest.java \ -$(SRC_DIR)/test/CommandMapTest.java \ -$(SRC_DIR)/test/DHTransferableTest.java \ -$(SRC_DIR)/test/DSWriteTest.java \ -$(SRC_DIR)/test/DataHandlerTest.java \ -$(SRC_DIR)/test/DataSourceTest.java \ -$(SRC_DIR)/test/SerMaker.java \ -$(SRC_DIR)/test/SerMaker11.java \ -$(SRC_DIR)/test/SerReader.java \ -$(SRC_DIR)/test/SerReader11.java - -DEMO_SRCS = \ -$(SRC_DIR)/demo/PrefTest.java \ -$(SRC_DIR)/demo/MikeTest.java \ -$(SRC_DIR)/demo/FileView.java \ -$(SRC_DIR)/demo/MCTest.java \ -$(SRC_DIR)/demo/CompViewer.java \ -$(SRC_DIR)/demo/JAFApp.java \ -$(SRC_DIR)/demo/SimpleDCH.java \ -$(SRC_DIR)/demo/MTest.java \ -$(SRC_DIR)/demo/PlainDCH.java \ -$(SRC_DIR)/demo/DHURL.java \ -$(SRC_DIR)/demo/TextInternalizer.java \ -$(SRC_DIR)/demo/DCHTest2.java \ -$(SRC_DIR)/demo/ODCHTest.java \ -$(SRC_DIR)/demo/DCHTest.java - -JAVAX_CLASSES_LIST = \ -$(CLASS_DIR)/javax/activation/DataSource.class \ -$(CLASS_DIR)/javax/activation/URLDataSource.class \ -$(CLASS_DIR)/javax/activation/MailcapCommandMap.class \ -$(CLASS_DIR)/javax/activation/CommandMap.class \ -$(CLASS_DIR)/javax/activation/CommandObject.class \ -$(CLASS_DIR)/javax/activation/CommandInfo.class \ -$(CLASS_DIR)/javax/activation/MimeType.class \ -$(CLASS_DIR)/javax/activation/MimeTypeParameterList.class \ -$(CLASS_DIR)/javax/activation/MimeTypeParseException.class \ -$(CLASS_DIR)/javax/activation/ActivationDataFlavor.class \ -$(CLASS_DIR)/javax/activation/DataContentHandler.class \ -$(CLASS_DIR)/javax/activation/DataContentHandlerFactory.class \ -$(CLASS_DIR)/javax/activation/UnsupportedDataTypeException.class \ -$(CLASS_DIR)/javax/activation/DataHandler.class \ -$(CLASS_DIR)/javax/activation/FileTypeMap.class \ -$(CLASS_DIR)/javax/activation/MimetypesFileTypeMap.class \ -$(CLASS_DIR)/javax/activation/FileDataSource.class - -COM_SUN_CLASSES_LIST = \ -$(CLASS_DIR)/com/sun/activation/registries/MailcapEntry.class \ -$(CLASS_DIR)/com/sun/activation/registries/MailcapFile.class \ -$(CLASS_DIR)/com/sun/activation/registries/MimeTypeEntry.class \ -$(CLASS_DIR)/com/sun/activation/registries/MimeTypeFile.class \ -$(CLASS_DIR)/com/sun/activation/viewers/ImageViewer.class \ -$(CLASS_DIR)/com/sun/activation/viewers/ImageViewerCanvas.class \ -$(CLASS_DIR)/com/sun/activation/viewers/TextEditor.class \ -$(CLASS_DIR)/com/sun/activation/viewers/TextViewer.class \ -$(CLASS_DIR)/com/sun/activation/registries/MailcapTokenizer.class \ -$(CLASS_DIR)/com/sun/activation/registries/MailcapParseException.class - -# Tests that only work on JDK 1.2... -# $(CLASS_DIR)/test/CLTest.class \ - -TEST_CLASSES_LIST = \ -$(CLASS_DIR)/test/AppletTest.class \ -$(CLASS_DIR)/test/CommandMapTest.class \ -$(CLASS_DIR)/test/DHTransferableTest.class \ -$(CLASS_DIR)/test/DSWriteTest.class \ -$(CLASS_DIR)/test/DataHandlerTest.class \ -$(CLASS_DIR)/test/DataSourceTest.class \ -$(CLASS_DIR)/test/SerMaker.class \ -$(CLASS_DIR)/test/SerMaker11.class \ -$(CLASS_DIR)/test/SerReader.class \ -$(CLASS_DIR)/test/SerReader11.class - -DEMO_CLASSES_LIST = \ -$(CLASS_DIR)/demo/MikeTest.class \ -$(CLASS_DIR)/demo/PrefTest.class \ -$(CLASS_DIR)/demo/FileView.class \ -$(CLASS_DIR)/demo/MCTest.class \ -$(CLASS_DIR)/demo/CompViewer.class \ -$(CLASS_DIR)/demo/JAFApp.class \ -$(CLASS_DIR)/demo/SimpleDCF.class \ -$(CLASS_DIR)/demo/TextInternalizer.class \ -$(CLASS_DIR)/demo/MTest.class \ -$(CLASS_DIR)/demo/DHURL.class \ -$(CLASS_DIR)/demo/PlainDCH.class \ -$(CLASS_DIR)/demo/DCHTest2.class \ -$(CLASS_DIR)/demo/ODCHTest.class \ -$(CLASS_DIR)/demo/DCHTest.class
diff --git a/build/share/minclude/com_sun_activation_registries.jmk b/build/share/minclude/com_sun_activation_registries.jmk deleted file mode 100644 index 278949c..0000000 --- a/build/share/minclude/com_sun_activation_registries.jmk +++ /dev/null
@@ -1,10 +0,0 @@ -# -# @(#)com_sun_activation_registries.jmk 1.3 03/08/20 -# -FILES_java = \ - $(TARGDIR)com/sun/activation/registries/LogSupport.java \ - $(TARGDIR)com/sun/activation/registries/MailcapFile.java \ - $(TARGDIR)com/sun/activation/registries/MailcapParseException.java \ - $(TARGDIR)com/sun/activation/registries/MailcapTokenizer.java \ - $(TARGDIR)com/sun/activation/registries/MimeTypeEntry.java \ - $(TARGDIR)com/sun/activation/registries/MimeTypeFile.java
diff --git a/build/share/minclude/com_sun_activation_viewers.jmk b/build/share/minclude/com_sun_activation_viewers.jmk deleted file mode 100644 index 6013b1a..0000000 --- a/build/share/minclude/com_sun_activation_viewers.jmk +++ /dev/null
@@ -1,8 +0,0 @@ -# -# @(#)com_sun_activation_viewers.jmk 1.1 99/03/06 -# -FILES_java = \ - $(TARGDIR)com/sun/activation/viewers/ImageViewer.java \ - $(TARGDIR)com/sun/activation/viewers/ImageViewerCanvas.java \ - $(TARGDIR)com/sun/activation/viewers/TextEditor.java \ - $(TARGDIR)com/sun/activation/viewers/TextViewer.java
diff --git a/build/share/minclude/demo.jmk b/build/share/minclude/demo.jmk deleted file mode 100644 index a67ea46..0000000 --- a/build/share/minclude/demo.jmk +++ /dev/null
@@ -1,17 +0,0 @@ -# -# @(#)demo.jmk 1.3 05/04/07 -# -FILES_java = \ - $(TARGDIR)demo/CompViewer.java \ - $(TARGDIR)demo/DCHTest.java \ - $(TARGDIR)demo/DCHTest2.java \ - $(TARGDIR)demo/DHURL.java \ - $(TARGDIR)demo/FileView.java \ - $(TARGDIR)demo/JAFApp.java \ - $(TARGDIR)demo/MCDump.java \ - $(TARGDIR)demo/MCTest.java \ - $(TARGDIR)demo/ODCHTest.java \ - $(TARGDIR)demo/PlainDCH.java \ - $(TARGDIR)demo/PrefTest.java \ - $(TARGDIR)demo/SimpleDCF.java \ - $(TARGDIR)demo/TextInternalizer.java
diff --git a/build/share/minclude/javax_activation.jmk b/build/share/minclude/javax_activation.jmk deleted file mode 100644 index 6c9f602..0000000 --- a/build/share/minclude/javax_activation.jmk +++ /dev/null
@@ -1,22 +0,0 @@ -# -# @(#)javax_activation.jmk 1.2 02/03/10 -# -FILES_java = \ - $(TARGDIR)javax/activation/ActivationDataFlavor.java \ - $(TARGDIR)javax/activation/CommandInfo.java \ - $(TARGDIR)javax/activation/CommandMap.java \ - $(TARGDIR)javax/activation/CommandObject.java \ - $(TARGDIR)javax/activation/DataContentHandler.java \ - $(TARGDIR)javax/activation/DataContentHandlerFactory.java \ - $(TARGDIR)javax/activation/DataHandler.java \ - $(TARGDIR)javax/activation/DataSource.java \ - $(TARGDIR)javax/activation/FileDataSource.java \ - $(TARGDIR)javax/activation/FileTypeMap.java \ - $(TARGDIR)javax/activation/MailcapCommandMap.java \ - $(TARGDIR)javax/activation/MimeType.java \ - $(TARGDIR)javax/activation/MimeTypeParameterList.java \ - $(TARGDIR)javax/activation/MimeTypeParseException.java \ - $(TARGDIR)javax/activation/MimetypesFileTypeMap.java \ - $(TARGDIR)javax/activation/SecuritySupport.java \ - $(TARGDIR)javax/activation/URLDataSource.java \ - $(TARGDIR)javax/activation/UnsupportedDataTypeException.java
diff --git a/build/share/minclude/resources.res b/build/share/minclude/resources.res deleted file mode 100644 index da0f0bf..0000000 --- a/build/share/minclude/resources.res +++ /dev/null
@@ -1,9 +0,0 @@ -# -# @(#)resources.res 1.1 99/03/06 -# -# Defines which files are copied to the META-INF directory - -RESOURCES = \ - $(TOPDIR)/src/share/lib/mailcap.default \ - $(TOPDIR)/src/share/lib/mimetypes.default -
diff --git a/build/solaris/GNUmakefile b/build/solaris/GNUmakefile deleted file mode 100644 index 58b4cac..0000000 --- a/build/solaris/GNUmakefile +++ /dev/null
@@ -1,157 +0,0 @@ -# -# @(#)GNUmakefile 1.24 12/05/02 -# -# Makefile for building all of JAF -# -# Targets and their description: -# -# all -# builds everything, javax, com, demo -# -# jar -# creates the activation.jar file -# -# jar_all -# first makes "all", then makes "jar" of *all* class files -# -# install -# creates a jar file that contains only -# the packages we ship. -# -# project -# creates all the JavaWorkShop project files -# -# release -# removes everything (realclean) then -# creates the release zip file that includes everything -# that is shipped in the jaf.zip file -# -# docs -# builds javadocs -# -# clean -# removes all the class files and binaries -# -# realclean -# clean + removes activation.jar & jaf.zip - -BUILDDIR = . -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -ZIP = zip - -LIBSRC = $(TOPDIR)/src/share/lib - -JAF_RELEASE = 1.1.1 -JAF_RELEASEB = $(shell echo $(JAF_RELEASE) | tr '.' '_') -#JAF_RELEASEDIR = $(BUILDDIR)/jaf-$(JAF_RELEASE) -JAF_RELEASEDIR = jaf-$(JAF_RELEASE) -JAF_RELEASEFILE = $(RELEASEDIR)/jaf$(JAF_RELEASEB).zip - -# specs -SPEC_DIR = $(TOPDIR)/src/share/doc/spec -RELEASE_SPECS = $(SPEC_DIR)/JAF-1.1.ps $(SPEC_DIR)/JAF-1.1.pdf \ - $(SPEC_DIR)/JAF-1.1-changes.txt - -SUBDIRS = javax com demo META-INF - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Subdirs.gmk - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -jar :: - @echo Jarring ... - @sed -e 's"%RELEASE%"$(JAF_RELEASE)"' < $(LIBSRC)/jaf.mf \ - > classes/jaf.mf - @cd classes; $(JAR) cfm ../activation.jar jaf.mf META-INF javax com - -jar_all :: all jar - -install :: jar sigtest - -# generate a new signature file -siggen :: - sh siggen -in activation.jar -package javax -out activation.sig - -# test that API hasn't changed -sigtest :: - sh sigtest -base activation.sig -test activation.jar -package javax \ - -out report.out -check bincomp - -# Javadoc defines -DOCDIR = $(TOPDIR)/src/share/doc/api/javadocs -DOCPACKAGES = javax.activation -DOCFILES = \ - src/share/classes/javax/activation -DOCFILESEX = \ - src/share/classes/javax/activation/SecuritySupport.java - -JAVADOC_OPTS= -J-Xmx32m -TITLE="JavaBeans Activation Framework API documentation" - -# XXX - Would like to use standard "docs" rule but we need to do -# some special things here. In order to generate javadocs -# for only the limited set of classes listed in DOCFILES, -# we have to copy all those files to a temporary directory -# and run javadoc against that directory. - -JAVADOC_OPTS += -use -splitIndex -windowtitle $(TITLE) -doctitle $(TITLE) - -docs: - rm -rf $(DOCDIR) - mkdir -p $(DOCDIR) - mkdir $(DOCDIR)/tmp - (cd $(TOPDIR); tar cFFf - $(DOCFILES)) | (cd $(DOCDIR)/tmp; tar xf -) - (cd $(DOCDIR)/tmp; rm -f $(DOCFILESEX)) - $(JAVADOC) $(JAVADOC_OPTS) -d $(DOCDIR) \ - -sourcepath $(DOCDIR)/tmp/src/share/classes \ - -classpath $(CLASSBINDIR):$(DEPENDS) $(DOCPACKAGES) - rm -rf $(DOCDIR)/tmp - -realclean :: clean - @rm -f activation.jar $(JAF_RELEASEFILE) - -# The "release" target is ugly-ish. Should clean up later. -release :: realclean all install docs releasezip - -releasezip: - @echo Making release ... - @rm -rf $(JAF_RELEASEFILE) $(JAF_RELEASEDIR) - @[ -d $(RELEASEDIR) ] || mkdir $(RELEASEDIR) - @mkdir $(JAF_RELEASEDIR) - @mkdir $(JAF_RELEASEDIR)/docs - @mkdir $(JAF_RELEASEDIR)/docs/javadocs - @mkdir -p $(JAF_RELEASEDIR)/demo - @cp activation.jar $(JAF_RELEASEDIR) - @#cp $(TOPDIR)/src/share/doc/release/CHANGES.txt $(RELEASEDIR) - @rm -f $(RELEASEDIR)/README.txt - @cp $(TOPDIR)/src/share/doc/release/README.txt $(RELEASEDIR) - @rm -f $(RELEASEDIR)/LICENSE.txt - @cp $(TOPDIR)/src/share/doc/release/LICENSE.txt $(RELEASEDIR) - @rm -f $(RELEASEDIR)/distributionREADME.txt - @cp $(TOPDIR)/src/share/doc/release/distributionREADME.txt $(RELEASEDIR) - @rm -f $(RELEASEDIR)/RELNOTES.txt - @cp -r $(TOPDIR)/src/share/doc/api/javadocs $(RELEASEDIR) - @#cp $(TOPDIR)/src/share/doc/release/CHANGES.txt $(JAF_RELEASEDIR) - @cp $(TOPDIR)/src/share/doc/release/README.txt $(JAF_RELEASEDIR) - @cp $(TOPDIR)/src/share/doc/release/LICENSE.txt $(JAF_RELEASEDIR) - @cp $(TOPDIR)/src/share/doc/release/distributionREADME.txt $(JAF_RELEASEDIR) - @cp $(TOPDIR)/src/share/doc/release/RELNOTES.txt $(JAF_RELEASEDIR) - @cp $(TOPDIR)/src/share/classes/demo/*.java $(JAF_RELEASEDIR)/demo - @#cp $(TOPDIR)/src/share/classes/demo/README.txt $(JAF_RELEASEDIR)/demo - @cp -r $(TOPDIR)/src/share/doc/api/javadocs $(JAF_RELEASEDIR)/docs/ - @for i in $(RELEASE_SPECS); do \ - if [ -f $$i ]; then \ - file=`basename $$i`; \ - rm -f $(RELEASEDIR)/$$file; \ - cp $$i $(RELEASEDIR); \ - cp $$i $(JAF_RELEASEDIR)/docs; \ - fi \ - done - @$(ZIP) -r $(JAF_RELEASEFILE) $(JAF_RELEASEDIR) - @rm -rf $(JAF_RELEASEDIR) - @echo Done Making release
diff --git a/build/solaris/META-INF/GNUmakefile b/build/solaris/META-INF/GNUmakefile deleted file mode 100644 index 6281b8c..0000000 --- a/build/solaris/META-INF/GNUmakefile +++ /dev/null
@@ -1,27 +0,0 @@ -# -# @(#)GNUmakefile 1.2 98/01/30 -# -# Makefile for building (copying) the files in META-INF -# - -BUILDDIR = .. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -SUBDIRS = sun - -include $(MINCLUDES)/resources.res -META_INF_DIR = $(TOPDIR)/build/$(PLATFORM)/classes/META-INF - -all :: - @if [ ! -d $(META_INF_DIR) ] ; then mkdir $(META_INF_DIR); fi - @echo Copying $(RESOURCES) to $(META_INF_DIR) - @cp -f $(RESOURCES) $(META_INF_DIR) - -clean :: - @rm -rf $(META_INF_DIR) - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk
diff --git a/build/solaris/Platform.gmk b/build/solaris/Platform.gmk deleted file mode 100644 index fe9ebf0..0000000 --- a/build/solaris/Platform.gmk +++ /dev/null
@@ -1,8 +0,0 @@ -# -# @(#)Platform.gmk 1.1 97/09/07 -# -# Generic definition of PLATFORM, and related, factored-out variables -# - -PLATFORM = solaris -TOPDIR = ../../$(BUILDDIR)
diff --git a/build/solaris/activation.sig b/build/solaris/activation.sig deleted file mode 100644 index f498fac..0000000 --- a/build/solaris/activation.sig +++ /dev/null
@@ -1,182 +0,0 @@ -//Java signature file -//date: Thu Apr 07 22:16:00 PDT 2005 -//classpath: activation.jar -//package: javax - - -package javax.activation; - -public class ActivationDataFlavor extends java.awt.datatransfer.DataFlavor { - public ActivationDataFlavor(Class, String); - public ActivationDataFlavor(Class, String, String); - public ActivationDataFlavor(String, String); - public boolean equals(java.awt.datatransfer.DataFlavor); - public String getHumanPresentableName(); - public String getMimeType(); - public Class getRepresentationClass(); - public boolean isMimeTypeEqual(String); - protected String normalizeMimeType(String); - protected String normalizeMimeTypeParameter(String, String); - public void setHumanPresentableName(String); -} - -public class CommandInfo { - public CommandInfo(String, String); - public String getCommandClass(); - public String getCommandName(); - public Object getCommandObject(javax.activation.DataHandler, ClassLoader) throws java.io.IOException, ClassNotFoundException; -} - -public abstract class CommandMap { - public CommandMap(); - public abstract javax.activation.DataContentHandler createDataContentHandler(String); - public javax.activation.DataContentHandler createDataContentHandler(String, javax.activation.DataSource); - public abstract javax.activation.CommandInfo[] getAllCommands(String); - public javax.activation.CommandInfo[] getAllCommands(String, javax.activation.DataSource); - public abstract javax.activation.CommandInfo getCommand(String, String); - public javax.activation.CommandInfo getCommand(String, String, javax.activation.DataSource); - public static javax.activation.CommandMap getDefaultCommandMap(); - public String[] getMimeTypes(); - public abstract javax.activation.CommandInfo[] getPreferredCommands(String); - public javax.activation.CommandInfo[] getPreferredCommands(String, javax.activation.DataSource); - public static void setDefaultCommandMap(javax.activation.CommandMap); -} - -public abstract interface CommandObject { - public abstract void setCommandContext(String, javax.activation.DataHandler) throws java.io.IOException; -} - -public abstract interface DataContentHandler { - public abstract Object getContent(javax.activation.DataSource) throws java.io.IOException; - public abstract Object getTransferData(java.awt.datatransfer.DataFlavor, javax.activation.DataSource) throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException; - public abstract java.awt.datatransfer.DataFlavor[] getTransferDataFlavors(); - public abstract void writeTo(Object, String, java.io.OutputStream) throws java.io.IOException; -} - -public abstract interface DataContentHandlerFactory { - public abstract javax.activation.DataContentHandler createDataContentHandler(String); -} - -public class DataHandler implements java.awt.datatransfer.Transferable { - public DataHandler(Object, String); - public DataHandler(java.net.URL); - public DataHandler(javax.activation.DataSource); - public javax.activation.CommandInfo[] getAllCommands(); - public Object getBean(javax.activation.CommandInfo); - public javax.activation.CommandInfo getCommand(String); - public Object getContent() throws java.io.IOException; - public String getContentType(); - public javax.activation.DataSource getDataSource(); - public java.io.InputStream getInputStream() throws java.io.IOException; - public String getName(); - public java.io.OutputStream getOutputStream() throws java.io.IOException; - public javax.activation.CommandInfo[] getPreferredCommands(); - public Object getTransferData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException; - public synchronized java.awt.datatransfer.DataFlavor[] getTransferDataFlavors(); - public boolean isDataFlavorSupported(java.awt.datatransfer.DataFlavor); - public synchronized void setCommandMap(javax.activation.CommandMap); - public static synchronized void setDataContentHandlerFactory(javax.activation.DataContentHandlerFactory); - public void writeTo(java.io.OutputStream) throws java.io.IOException; -} - -public abstract interface DataSource { - public abstract String getContentType(); - public abstract java.io.InputStream getInputStream() throws java.io.IOException; - public abstract String getName(); - public abstract java.io.OutputStream getOutputStream() throws java.io.IOException; -} - -public class FileDataSource implements javax.activation.DataSource { - public FileDataSource(java.io.File); - public FileDataSource(String); - public String getContentType(); - public java.io.File getFile(); - public java.io.InputStream getInputStream() throws java.io.IOException; - public String getName(); - public java.io.OutputStream getOutputStream() throws java.io.IOException; - public void setFileTypeMap(javax.activation.FileTypeMap); -} - -public abstract class FileTypeMap { - public FileTypeMap(); - public abstract String getContentType(java.io.File); - public abstract String getContentType(String); - public static javax.activation.FileTypeMap getDefaultFileTypeMap(); - public static void setDefaultFileTypeMap(javax.activation.FileTypeMap); -} - -public class MailcapCommandMap extends javax.activation.CommandMap { - public MailcapCommandMap(); - public MailcapCommandMap(java.io.InputStream); - public MailcapCommandMap(String) throws java.io.IOException; - public synchronized void addMailcap(String); - public synchronized javax.activation.DataContentHandler createDataContentHandler(String); - public synchronized javax.activation.CommandInfo[] getAllCommands(String); - public synchronized javax.activation.CommandInfo getCommand(String, String); - public synchronized String[] getMimeTypes(); - public synchronized String[] getNativeCommands(String); - public synchronized javax.activation.CommandInfo[] getPreferredCommands(String); -} - -public class MimeType implements java.io.Externalizable { - public MimeType(); - public MimeType(String) throws javax.activation.MimeTypeParseException; - public MimeType(String, String) throws javax.activation.MimeTypeParseException; - public String getBaseType(); - public String getParameter(String); - public javax.activation.MimeTypeParameterList getParameters(); - public String getPrimaryType(); - public String getSubType(); - public boolean match(String) throws javax.activation.MimeTypeParseException; - public boolean match(javax.activation.MimeType); - public void readExternal(java.io.ObjectInput) throws java.io.IOException, ClassNotFoundException; - public void removeParameter(String); - public void setParameter(String, String); - public void setPrimaryType(String) throws javax.activation.MimeTypeParseException; - public void setSubType(String) throws javax.activation.MimeTypeParseException; - public String toString(); - public void writeExternal(java.io.ObjectOutput) throws java.io.IOException; -} - -public class MimeTypeParameterList { - public MimeTypeParameterList(); - public MimeTypeParameterList(String) throws javax.activation.MimeTypeParseException; - public String get(String); - public java.util.Enumeration getNames(); - public boolean isEmpty(); - protected void parse(String) throws javax.activation.MimeTypeParseException; - public void remove(String); - public void set(String, String); - public int size(); - public String toString(); -} - -public class MimeTypeParseException extends Exception { - public MimeTypeParseException(); - public MimeTypeParseException(String); -} - -public class MimetypesFileTypeMap extends javax.activation.FileTypeMap { - public MimetypesFileTypeMap(); - public MimetypesFileTypeMap(java.io.InputStream); - public MimetypesFileTypeMap(String) throws java.io.IOException; - public synchronized void addMimeTypes(String); - public String getContentType(java.io.File); - public synchronized String getContentType(String); -} - -public class URLDataSource implements javax.activation.DataSource { - public URLDataSource(java.net.URL); - public String getContentType(); - public java.io.InputStream getInputStream() throws java.io.IOException; - public String getName(); - public java.io.OutputStream getOutputStream() throws java.io.IOException; - public java.net.URL getURL(); -} - -public class UnsupportedDataTypeException extends java.io.IOException { - public UnsupportedDataTypeException(); - public UnsupportedDataTypeException(String); -} - -//end of Java signature file
diff --git a/build/solaris/com/GNUmakefile b/build/solaris/com/GNUmakefile deleted file mode 100644 index f72e2ae..0000000 --- a/build/solaris/com/GNUmakefile +++ /dev/null
@@ -1,21 +0,0 @@ -# -# @(#)GNUmakefile 1.3 97/10/22 -# -# Makefile for building all of com -# - -BUILDDIR = .. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -SUBDIRS = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Subdirs.gmk - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -clean :: - rm -fr $(LIBDIR) $(BINDIR) $(CLASSBINDIR)
diff --git a/build/solaris/com/sun/GNUmakefile b/build/solaris/com/sun/GNUmakefile deleted file mode 100644 index 2b8690d..0000000 --- a/build/solaris/com/sun/GNUmakefile +++ /dev/null
@@ -1,21 +0,0 @@ -# -# @(#)GNUmakefile 1.1 99/03/06 -# -# Makefile for building all of com.sun -# - -BUILDDIR = ../.. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -SUBDIRS = activation - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Subdirs.gmk - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -clean :: - rm -fr $(LIBDIR) $(BINDIR) $(CLASSBINDIR)
diff --git a/build/solaris/com/sun/activation/GNUmakefile b/build/solaris/com/sun/activation/GNUmakefile deleted file mode 100644 index fbd207a..0000000 --- a/build/solaris/com/sun/activation/GNUmakefile +++ /dev/null
@@ -1,21 +0,0 @@ -# -# @(#)GNUmakefile 1.1 99/03/06 -# -# Makefile for building all of com.sun.activation -# - -BUILDDIR = ../../.. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -SUBDIRS = registries viewers - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Subdirs.gmk - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -clean :: - rm -fr $(LIBDIR) $(BINDIR) $(CLASSBINDIR)
diff --git a/build/solaris/com/sun/activation/registries/GNUmakefile b/build/solaris/com/sun/activation/registries/GNUmakefile deleted file mode 100644 index 233c5e4..0000000 --- a/build/solaris/com/sun/activation/registries/GNUmakefile +++ /dev/null
@@ -1,24 +0,0 @@ -# -# @(#)GNUmakefile 1.4 05/04/07 -# -# Makefile for building all of com.sun.mail.registries -# - -BUILDDIR = ../../../.. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun -PACKAGE = com.sun.activation.registries - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -default: all - -include $(MINCLUDES)com_sun_activation_registries.jmk -include $(BUILDDIR)/makefiles/Classes.gmk - -all: classes - -clean clobber :: classes.clean - -
diff --git a/build/solaris/com/sun/activation/viewers/GNUmakefile b/build/solaris/com/sun/activation/viewers/GNUmakefile deleted file mode 100644 index 62a2347..0000000 --- a/build/solaris/com/sun/activation/viewers/GNUmakefile +++ /dev/null
@@ -1,24 +0,0 @@ -# -# @(#)GNUmakefile 1.1 99/03/06 -# -# Makefile for building all of com.sun.activation.viewers -# - -BUILDDIR = ../../../.. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun -PACKAGE = com.sun.activation.viewers - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -default: all - -include $(MINCLUDES)com_sun_activation_viewers.jmk -include $(BUILDDIR)/makefiles/Classes.gmk - -all: classes - -clean clobber :: classes.clean - -
diff --git a/build/solaris/demo/GNUmakefile b/build/solaris/demo/GNUmakefile deleted file mode 100644 index 0e52e30..0000000 --- a/build/solaris/demo/GNUmakefile +++ /dev/null
@@ -1,24 +0,0 @@ -# -# @(#)GNUmakefile 1.2 07/05/15 -# -# Makefile for building all of demo -# - -BUILDDIR = .. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -ALT_SRCDIR = demo -ALT_CLASSBINDIR = $(BUILDDIR)/demo_classes -DEPENDS = $(CLASSDIR) - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -include $(MINCLUDES)demo.jmk - -all :: classes - -clean clobber :: classes.clean - -include $(BUILDDIR)/makefiles/Classes.gmk
diff --git a/build/solaris/javax/GNUmakefile b/build/solaris/javax/GNUmakefile deleted file mode 100644 index 6f050b8..0000000 --- a/build/solaris/javax/GNUmakefile +++ /dev/null
@@ -1,31 +0,0 @@ -# -# @(#)GNUmakefile 1.1 99/03/06 -# -# Makefile for building all of javax -# - -BUILDDIR = .. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun - -# Javadoc defines -DOCDIR = $(TOPDIR)/src/share/doc/api/javadocs -DOCPACKAGES = javax.activation - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -SUBDIRS = activation - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Subdirs.gmk - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -clean :: - rm -fr $(LIBDIR) $(BINDIR) $(CLASSBINDIR) - -# for "docs" target (hack: set JDK to 1.2 so that newer javadoc is used) -JDK = /usr/local/java/jdk1.2/solaris/ -JAVADOC_OPTS= -J-Xmx32m -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Docs.gmk -
diff --git a/build/solaris/javax/activation/GNUmakefile b/build/solaris/javax/activation/GNUmakefile deleted file mode 100644 index 0b886f3..0000000 --- a/build/solaris/javax/activation/GNUmakefile +++ /dev/null
@@ -1,21 +0,0 @@ -# -# @(#)GNUmakefile 1.6 05/04/07 -# -# Makefile for building all of javax.activation.* -# - -BUILDDIR = ../.. -include $(BUILDDIR)/Platform.gmk - -PRODUCT = sun -PACKAGE = javax.activation - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -include $(MINCLUDES)javax_activation.jmk - -all :: classes - -clean clobber :: classes.clean - -include $(BUILDDIR)/makefiles/Classes.gmk
diff --git a/build/solaris/lib/activation.jar b/build/solaris/lib/activation.jar deleted file mode 100644 index 6837774..0000000 --- a/build/solaris/lib/activation.jar +++ /dev/null Binary files differ
diff --git a/build/solaris/makefiles/Classes.gmk b/build/solaris/makefiles/Classes.gmk deleted file mode 100644 index df1e6ab..0000000 --- a/build/solaris/makefiles/Classes.gmk +++ /dev/null
@@ -1,17 +0,0 @@ -# -# @(#)Classes.gmk 1.1 97/09/07 -# -# Generic makefile for building collections of classes that doesn't -# also have to build programs or libraries. -# - -FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Rules.gmk - -classes.clean : - rm -rf $(CLASSBINDIR)/$(PKGDIR) .classes.* - -DEBUG = classes - -OPTIMIZED = classes
diff --git a/build/solaris/makefiles/Defs-solaris.gmk b/build/solaris/makefiles/Defs-solaris.gmk deleted file mode 100644 index 3b73880..0000000 --- a/build/solaris/makefiles/Defs-solaris.gmk +++ /dev/null
@@ -1,185 +0,0 @@ -# -# @(#)Defs-solaris.gmk 1.3 05/04/07 -# -# Makefile to specify compiler flags for programs and libraries -# targeted to Solaris. Should not contain any rules. -# - -ARCH = $(shell uname -p) -OS_VERSION = $(shell uname -r) - -WHOAMI=/usr/ucb/whoami -ZIP=/usr/dist/local/exe/zip - -# This default is redefined during a release build. -RELEASE = $(shell echo `$(WHOAMI)`:`date '+%m/%d/%y-%H:%M'`) -FULL_VERSION = $(shell echo `$(WHOAMI)`:`date '+%m/%d/%y-%H:%M'`) - -## Section 1: Define CC, CPP, AS and LD flags. - -# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the -# optimized build, and that ordering of the flags completely freaks -# out cc. Hence, -Xa is instead in each CFLAGS variant. - -ifneq ($(CC_VERSION), gcc) -CFLAGS_COMMON = -v -CFLAGS_OPT = -Xa $(POPT) -CFLAGS_DBG = -Xa -g -else -CFLAGS_COMMON = -CFLAGS_OPT = $(POPT) -CFLAGS_DBG = -g -endif - -# Java memory management is based on memory mapping by default, but a -# system only assuming malloc/free can be built by adding -DUSE_MALLOC - -ifneq ($(CC_VERSION), gcc) -CPPFLAGS_COMMON = -D$(ARCH) -DSOLARIS2 -DRELEASE='"$(RELEASE)"' -DFULL_VERSION='"$(FULL_VERSION)"' -else -CPPFLAGS_COMMON = -D$(ARCH) -DHAVE_ALIGNED_LONGLONGS -DHAVE_ALIGNED_DOUBLES -DSOLARIS2 -DRELEASE='"$(RELEASE)"' -DFULL_VERSION='"$(FULL_VERSION)"' -endif -# [sbb] int32 scaffolding -- to be removed -CPPFLAGS_COMMON += $(USE_INT32) -CPPFLAGS_OPT = -CPPFLAGS_DBG = -DDEBUG - -ASFLAGS_COMMON = -P -ASFLAGS_OPT = -ASFLAGS_DBG = - -ifneq ($(LIBRARY),JdbcOdbc) -LDFLAGS_COMMON = -z defs -else -LDFLAGS_COMMON = -endif -LDFLAGS_OPT = -LDFLAGS_DBG = - -# -# All libraries except libjava and libjvm itself link against libjvm -# and libjava, the latter for its exported common utilities. libjava -# only links against libjvm. Programs' makefiles take their own -# responsibility for adding other libs. -# -ifdef LIBRARY -LDLIBS_COMMON = -ifneq ($(LIBRARY),jvm) -ifneq ($(LIBRARY),java) -# no libjvm in JDK 1.1 -#LDLIBS_OPT = -L$(LIB_LOCATION) -ljvm -ljava -#LDLIBS_DBG = -L$(LIB_LOCATION) -ljvm_g -ljava_g -LDLIBS_OPT = -L$(LIB_LOCATION) -ljava -LDLIBS_DBG = -L$(LIB_LOCATION) -ljava_g -else -LDLIBS_OPT = -L$(LIB_LOCATION) -ljvm -LDLIBS_DBG = -L$(LIB_LOCATION) -ljvm_g -endif -endif -endif - -## Section 2: Variables globally settable from the make -## command line (default values in brackets): -## THREADS_FLAG (native), GPROF (false), JCOV (true). -## Eg: % gnumake THREADS_FLAG=green - -THREADS_FLAG=green - -ifdef LIBRARY -ifeq ($(LIBRARY), jvm) -# do nothing -else -ifeq ($(LIBRARY), agent) -# do nothing -else -BUILD_REENTRANT_LIBS = true -endif -endif -endif - -LDFLAGS_COMMON = -L$(JDK_LIBDIR)/$(ARCH) -ifdef BUILD_REENTRANT_LIBS -CFLAGS_COMMON += -D_REENTRANT -LDFLAGS_COMMON += -L$(LIBDIR)/$(ARCH) -else -ifeq ($(THREADS_FLAG), native) - CFLAGS_COMMON += -D_REENTRANT -DNATIVE - # Even though libjava.so is linked with -lthread, this makes sure that - # the executable sees libthread definitions of thr_* functions before - # libc definitions. Starting in 2.5.1 the libc functions "do the - # right thing" when linked before libthread, but there is at least - # one bug in thr_stksegment that prevents it from working. The - # following line could go away if we decide not to support Solaris - # releases prior to 2.5.1 *and* the libc thread stubs get fixed. - # Dean Long 3/24/97: - LDLIBS_COMMON += -lthread -endif -endif - -GPROF = false -ifeq ($(GPROF), true) - CFLAGS_COMMON += -DGPROF -xpg - LDLIBS_COMMON += -xpg -endif - -JCOV = true -ifeq ($(JCOV), true) -ifeq ($(VARIANT), DBG) - CFLAGS_COMMON += -DJCOV -endif -endif - -ifdef LIBRARY - LDLIBS_COMMON += -lc -endif - - -## Section 3: Are we building some piece of the runtime? - -# Java default optimization -x04 -ifeq ($(PRODUCT), java) -ifneq ($(CC_VERSION), gcc) - _OPT = -xO4 -else - _OPT = -O3 -endif - CPPFLAGS_DBG += -DLOGGING - ASFLAGS_COMMON += -D_ASM -endif - - -## Section 4: Was your answer to Section 3 no? - -# Non-runtime default optimization -x02 -ifneq ($(PRODUCT), java) -ifneq ($(CC_VERSION), gcc) - _OPT = -xO2 -else - _OPT = -O2 -endif -endif - - -## Section 5: Tools - -ifneq ($(CC_VERSION), gcc) -CC = cc -CPP = cc -E -CXX = CC -else -CC = gcc -CPP = gcc -E -CXX = g++ -endif - -AS = as -LD = /usr/ccs/bin/ld -OPENWINHOME = /usr/openwin -LIBRARY_SUFFIX = so - -# SunSoft JIT -ifneq ($(PRODUCT), java) -ifeq ($(BUILD_USES_JIT), true) - JIT_OPTION=-Djava.compiler=sunwjit -endif -endif
diff --git a/build/solaris/makefiles/Defs.gmk b/build/solaris/makefiles/Defs.gmk deleted file mode 100644 index 6a041b7..0000000 --- a/build/solaris/makefiles/Defs.gmk +++ /dev/null
@@ -1,205 +0,0 @@ -# -# @(#)Defs.gmk 1.21 07/05/15 -# -# Common variables used by all the Java makefiles. This file should not -# contain rules. -# - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs-$(PLATFORM).gmk - - -SHARE_SRC = $(TOPDIR)/src/share -PLATFORM_SRC = $(TOPDIR)/src/$(PLATFORM) - -TARGDIR = -MINCLUDES = $(TOPDIR)/build/share/minclude/ - -# -# Default BOOTDIR -# -_BOOTDIR = /usr/local/java/latest - -# -# Set BOOTDIR to _BOOTDIR if ALT_BOOTDIR isn't set. Otherwise, set -# it to ALT_BOOTDIR -# -BOOTDIR = $(_BOOTDIR$(ALT_BOOTDIR))$(ALT_BOOTDIR) - -# -# Default JAVAHOME -# -ifeq ($(ARCH), sparc) - _JAVAHOME = /java/re/jdk/1.5.0/archive/fcs/binaries/solaris-sparc -else - _JAVAHOME = /java/re/jdk/1.5.0/archive/fcs/binaries/solaris-i586 -endif - -# -# Set JAVAHOME to _JAVAHOME if ALT_JAVAHOME isn't set. Otherwise, set -# it to ALT_JAVAHOME -# -JAVAHOME = $(_JAVAHOME$(ALT_JAVAHOME))$(ALT_JAVAHOME) - -JDK = $(JAVAHOME$(JDK_HOME))$(JDK_HOME) -JDK_BINDIR = $(JDK)/bin -JDK_INCLUDE = $(JDK)/include -JDK_LIBDIR = $(JDK)/jre/lib -BINDIR = $(TOPDIR)/build/$(PLATFORM)/bin -LIBDIR = $(TOPDIR)/build/$(PLATFORM)/lib -INCLUDEDIR = $(TOPDIR)/build/$(PLATFORM)/include -CLASSDIR = $(TOPDIR)/build/$(PLATFORM)/classes -RELEASEDIR = $(TOPDIR)/build/$(PLATFORM)/release -# Set CLASSBINDIR to CLASSDIR if ALT_CLASSBINDIR isn't set. Otheriwse set -# it to ALT_CLASSBINDIR -CLASSBINDIR = $(CLASSDIR$(ALT_CLASSBINDIR))$(ALT_CLASSBINDIR) -_SRCDIR = . -SRCDIR = $(_SRCDIR$(ALT_SRCDIR))$(ALT_SRCDIR) - -INCLUDES = -I. -ICClassHeaders \ - -I$(JDK_INCLUDE) -I$(JDK_INCLUDE)/$(PLATFORM) \ - $(patsubst %,-I%,$(subst :, ,$(VPATH.h))) $(OTHER_INCLUDES) -OTHER_CPPFLAGS = $(INCLUDES) - -# -# vpaths. These are the default locations searched for source files. -# GNUmakefiles of individual areas often override the default settings. -# There are no longer default vpath entries for C and assembler files -# so we can ensure that libraries don't get their hands on JVM files. -# -# We define an intermediate variable for Java files because -# we use its value later to help define $CLASSPATH -# -VPATH.java = $(PLATFORM_SRC)/classes/$(SRCDIR):$(SHARE_SRC)/classes/$(SRCDIR) - -vpath %.java $(VPATH.java) - -vpath %.class $(CLASSBINDIR) - -vpath %.o $(OBJDIR) - -# -# VPATH.h is used elsewhere to generate include flags. By default, -# anyone has access to the include files that the JVM area exports, -# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific -# relatives. -# -VPATH.h = $(PLATFORM_SRC)/javavm/export:$(SHARE_SRC)/javavm/export - -vpath %.h $(VPATH.h) - -# -# Object Directories -# Create different object directories for green and native threads -# so that both options can be built without clobbering each other - -# Directory name specific to type of threads: green or native -# If THREADS_FLAG is not set or not equal to green or native, then no threads -# specific object directories are made. This would enable to quickly move to -# a build environment with a single threads type, in the future. -# TSOBJDIR = Thread Specific object directory - -ifdef BUILD_REENTRANT_LIBS - TSOBJDIR = . -else -ifeq ($(THREADS_FLAG), native) - TSOBJDIR = native_threads -else -ifeq ($(THREADS_FLAG), green) - TSOBJDIR = green_threads -else - TSOBJDIR = . -endif -endif -endif - -# -OBJDIR_NAME = obj -OBJDIR = $(OBJDIR_NAME)$(SUFFIX)/$(ARCH)/$(TSOBJDIR) -OBJDIRS = $(OBJDIR_NAME)$(OPT_SUFFIX)/$(ARCH)/$(TSOBJDIR) \ - $(OBJDIR_NAME)$(DBG_SUFFIX)/$(ARCH)/$(TSOBJDIR) - -# -# LIB_LOCATION must be defined in all cases so that we can link against -# libjava in various places. -# -LIB_LOCATION = $(LIBDIR)/$(ARCH) -JDK_LIB_LOCATION = $(JDK_LIBDIR)/$(ARCH) - -# Compute the root of each of the object directories -# used to delete whole object directories when making clean and/or clobber - -OBJROOTS = $(patsubst %/$(ARCH)/$(TSOBJDIR), %, $(OBJDIRS)) - -# -# Java header and stub variables -# -ifeq ($(PRODUCT), java) - CLASSPATH = $(CLASSBINDIR):$(DEPENDS):$(VPATH.java) -else - PKG = $(shell expr $(PACKAGE) : '\([a-z]*\)') - PKGDIR = $(shell echo $(PACKAGE) | sed 's:\.:/:g') - CLASSSRCDIR1 = $(PLATFORM_SRC)/classes/$(SRCDIR) - CLASSSRCDIR2 = $(SHARE_SRC)/classes/$(SRCDIR) - SRCPATH = $(CLASSSRCDIR1):$(CLASSSRCDIR2) - CLASSPATH = $(SRCPATH):$(CLASSBINDIR):$(DEPENDS) -endif - -CLASSHDRDIR = CClassHeaders -CLASSHDRS = $(patsubst %,$(CLASSHDRDIR)/%.h,$(subst .,_,$(CLASSES.export))) -CLASSSTUBOBJS = classstubs.o -STUBPREAMBLE= $(TOPDIR)/build/$(PLATFORM)/classes/StubPreamble.h - -# -# Suffixes for various VARIANTs -# -OPT_SUFFIX = -DBG_SUFFIX = _g -SUFFIX = $($(VARIANT)_SUFFIX) - -# -# Java executables/scripts [I'm not sure whether we really want to be -# getting the raw executables in the other cases rather than going -# through the wrappers. Adding JCMD to fix a problem in JAVAC_CMD is -# conservative for now but may not be best. It's also not clear that -# JCMD should be java$(SUFFIX), but that may be needed for "gnumake -# debug" to do the right thing. Again, do no harm for now.] -# -ifeq ($(PRODUCT), java) - JAVA = $(BINDIR)/$(ARCH)/$(TSOBJDIR)/java$(SUFFIX) - JAVAH = $(BINDIR)/$(ARCH)/$(TSOBJDIR)/javah$(SUFFIX) - JAVAC = $(BINDIR)/$(ARCH)/$(TSOBJDIR)/javac$(SUFFIX) - JAR = $(BINDIR)/$(ARCH)/$(TSOBJDIR)/jar$(SUFFIX) - JCMD = $(BINDIR)/java$(SUFFIX) -$(THREADS_FLAG) -else - JAVA = $(JDK_BINDIR)/java$(SUFFIX) - JAVAC = $(JDK_BINDIR)/javac$(SUFFIX) - JAVAH = $(JDK_BINDIR)/javah$(SUFFIX) - JAVADOC = $(JDK_BINDIR)/javadoc$(SUFFIX) - JAR = $(JDK_BINDIR)/jar$(SUFFIX) - JDB = $(JDK_BINDIR)/jdb$(SUFFIX) - JCMD = $(JAVA) -endif - -# -# Invoking the Java compiler -# -JAVAC_CMD = $(JAVAC) -source 1.5 - -# -# Set opt level to ALT_OPT if set otherwise _OPT -# -POPT = $(_OPT$(ALT_OPT))$(ALT_OPT) - -# -# Tool flags -# -CFLAGS = $(CFLAGS_$(VARIANT)) $(CFLAGS_COMMON) $(OTHER_CFLAGS) -LCFLAGS = $(CFLAGS_$(VARIANT)) $(LCFLAGS_COMMON) $(OTHER_CFLAGS) -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ - $(DEFINES) $(OPTIONS:%=-D%) -LCPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(LCPPFLAGS_COMMON) \ - $(OTHER_CPPFLAGS) $(DEFINES) $(OPTIONS:%=-D%) -ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) -LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) -
diff --git a/build/solaris/makefiles/Docs.gmk b/build/solaris/makefiles/Docs.gmk deleted file mode 100644 index 305d93b..0000000 --- a/build/solaris/makefiles/Docs.gmk +++ /dev/null
@@ -1,25 +0,0 @@ -# -# @(#)Docs.gmk 1.5 99/03/06 -# -# Makefile Rule for generating javadocs -# -# Depends on JDK 1.2beta4 or later javadoc. -# - -TITLE = 'JavaBeans Activation Framework 1.0 API documentation' -JAVADOC_OPTS = -use -splitIndex -windowtitle $(TITLE) -doctitle $(TITLE) - -docs: - if [ ! -s $(DOCDIR) ]; then \ - mkdir -p $(DOCDIR); \ - fi - if [ ! -s $(DOCDIR)/images ]; then \ - echo Warning: No Images directory in $(DOCDIR); \ - if [ -s $(DOCDIR)/../misc/images ]; then \ - mkdir $(DOCDIR)/images; \ - cp $(DOCDIR)/../misc/images/*.gif $(DOCDIR)/images; \ - fi; \ - fi - rm -f $(DOCDIR)/*.html - $(JAVADOC) $(JAVADOC_OPTS) -d $(DOCDIR) -sourcepath $(SRCPATH) \ - $(DOCPACKAGES)
diff --git a/build/solaris/makefiles/Library.gmk b/build/solaris/makefiles/Library.gmk deleted file mode 100644 index 11dd9ea..0000000 --- a/build/solaris/makefiles/Library.gmk +++ /dev/null
@@ -1,100 +0,0 @@ -# -# @(#)Library.gmk 1.1 97/09/07 -# -# Generic makefile for building libraries. -# -# This should be included in your library GNUmakefile. -# - -.PHONY: all optimized debug clean .exported.classes - -all: optimized debug - -library: optimized debug - -optimized debug: - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Classes.gmk -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -# It is important to define these *after* including Classes.gmk -# in order to override the values defined inthat makefile. -# -DEBUG = $(LIB_LOCATION)/lib$(LIBRARY)_g.$(LIBRARY_SUFFIX) - -OPTIMIZED = $(LIB_LOCATION)/lib$(LIBRARY).$(LIBRARY_SUFFIX) - -FILES_o = $(patsubst %.c,$(OBJDIR)/%.o,$(FILES_c)) -FILES_o += $(patsubst %.s,$(OBJDIR)/%.o,$(FILES_s)) -FILES_o += $(patsubst %.cpp,$(OBJDIR)/%.o,$(FILES_cpp)) - -ifeq ($(LIBRARY), jvm) -$(OPTIMIZED) $(DEBUG) :: \ - $(INIT) $(OBJDIR)/.library.dirs.$(ARCH) .library.headers - @true -else -$(OPTIMIZED) $(DEBUG) :: \ - $(INIT) $(OBJDIR)/.library.dirs.$(ARCH) classes .library.headers - @true -endif - -$(OPTIMIZED) $(DEBUG):: $(FILES_o) - @set -- $?; \ - echo Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...}; - @echo $@ - @echo "OBJDIR=$(OBJDIR)" - $(CC) -G -o $@ $(FILES_o) $(LDFLAGS) $(LDLIBS) - /usr/ccs/bin/mcs -d -a "$(FULL_VERSION)" $@ - -ifneq ($(PRODUCT), java) -vpath %.c $(SHARE_SRC)/native/$(PKGDIR) -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR) - -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \ - -I$(PLATFORM_SRC)/native/$(PKGDIR) -endif - -OTHER_INCLUDES += -I$(SHARE_SRC)/native/common \ - -I$(PLATFORM_SRC)/native/common - -CLASSES.export = $(shell echo '$(FILES_export)' '$(FILES_export2)' \ - | sed -e 's:\.java::g' -e 's:/:\.:g' -e 's/\$$/\\\$$/g') - -.exported.classes: .delete.classlist \ - $(FILES_export:%.java=$(CLASSBINDIR)/%.class) .compile.classlist - -# -# Delete these libstubs.c rules once conversion to JNI is completed -# -libstubs.c .library.headers :: .exported.classes - @true - -libstubs.c :: $(FILES_export:%.java=$(CLASSBINDIR)/%.class) - $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH) -o $@ \ - -stubs $(CLASSES.export) - @-touch $@ # javah only writes file if changed - -.library.headers :: $(FILES_export:%.java=$(CLASSBINDIR)/%.class) - $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH) -d $(CLASSHDRDIR)/ \ - $(CLASSES.export) - @-touch $@ - -$(OBJDIR)/.library.dirs.$(ARCH): FORCE - mkdir -p $(LIBDIR)/$(ARCH)/$(TSOBJDIR) $(OBJDIRS) - @-touch $(OBJDIR)/.library.dirs.$(ARCH) - -library.clean: - rm -rf libstubs.c $(OBJROOTS) CClassHeaders - rm -rf $(DEBUG) $(OPTIMIZED) .library.* - -clobber :: clean - -# -# Include make dependancies -# -files := $(foreach file, $(wildcard */$(ARCH)/$(TSOBJDIR)/*.d), $(file)) -ifneq ($(strip $(files)),) - include $(files) -endif - -.PHONY : .exported.classes
diff --git a/build/solaris/makefiles/Program.gmk b/build/solaris/makefiles/Program.gmk deleted file mode 100644 index 8332ef6..0000000 --- a/build/solaris/makefiles/Program.gmk +++ /dev/null
@@ -1,91 +0,0 @@ -# -# @(#)Program.gmk 1.1 97/09/07 -# -# Generic makefile for building executables. - -.PHONY: all optimized debug classes clean clobber - -all: optimized debug - -TSPROGRAM = $(PROGRAM:%=$(TSOBJDIR)/%) -DEBUG = $(BINDIR)/$(ARCH)/$(TSPROGRAM)_g $(BINDIR)/$(PROGRAM)_g -OPTIMIZED = $(BINDIR)/$(ARCH)/$(TSPROGRAM) $(BINDIR)/$(PROGRAM) - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Rules.gmk - -FILES_o = $(patsubst %.c,$(OBJDIR)/%.o,$(FILES_c)) -FILES_o += $(patsubst %.s,$(OBJDIR)/%.o,$(FILES_s)) - -CLASSES.export = $(shell echo $(FILES_export) | \ - sed "s:\.java::g" | sed "s:/:\.:g") - -.PHONY : $(PROGRAM)_g $(PROGRAM) - -$(PROGRAM)_g: debug - -$(PROGRAM): optimized - -# Make a generic link to the executable, for casual users - -$(BINDIR)/$(ARCH)/$(TSPROGRAM)_g $(BINDIR)/$(ARCH)/$(TSPROGRAM) \ - :: $(INIT) $(OBJDIR)/.program.dirs.$(ARCH) classes $(PROGRAM_HEADERS) - @true - -$(BINDIR)/$(ARCH)/$(TSPROGRAM)_g $(BINDIR)/$(ARCH)/$(TSPROGRAM) \ - :: $(FILES_o) - @set -- $?; \ - echo Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...}; - $(CC) $(LDFLAGS) $(FILES_o) $(LDLIBS) -o $(OBJDIR)/$(@F) - -(cp $(OBJDIR)/$(@F) $(BINDIR)/$(ARCH)/$(TSOBJDIR)/$(@F) \ - && echo "Copying" $(@F) "to" \ - $(BINDIR)/$(ARCH)/$(TSOBJDIR)) 2>/dev/null - -$(BINDIR)/$(PROGRAM)_g: $(BINDIR)/.java_wrapper .java_wrapper_local - rm -f $(BINDIR)/$(@F) ; ln -s .java_wrapper $(BINDIR)/$(@F) - rm -f $(@F) ; ln -s .java_wrapper_local $(@F) - -$(BINDIR)/$(PROGRAM): $(BINDIR)/.java_wrapper .java_wrapper_local - rm -f $(BINDIR)/$(@F) ; ln -s .java_wrapper $(BINDIR)/$(@F) - rm -f $(@F) ; ln -s .java_wrapper_local $(@F) - -$(BINDIR)/.java_wrapper: $(PLATFORM_SRC)/bin/java_wrapper.sh - rm -f $(BINDIR)/.java_wrapper - cp $(PLATFORM_SRC)/bin/java_wrapper.sh $(BINDIR)/.java_wrapper - chmod +x $(BINDIR)/.java_wrapper - -.java_wrapper_local: $(PLATFORM_SRC)/bin/java_wrapper_local.sh - rm -f .java_wrapper_local - cp $(PLATFORM_SRC)/bin/java_wrapper_local.sh .java_wrapper_local - chmod +x .java_wrapper_local - -$(OBJDIR)/.program.dirs.$(ARCH): - mkdir -p $(OBJDIRS) $(BINDIR)/$(ARCH)/$(TSOBJDIR) \ - $(CLASSBINDIR) - -touch $(OBJDIR)/.program.dirs.$(ARCH) - -$(PROGRAM_HEADERS): $(FILES_export:%.java=$(CLASSBINDIR)/%.class) - $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH) -d $(CLASSHDRDIR)/ \ - $(CLASSES.export) - @-touch $@ - -classstubs.c: $(FILES_export:%.java=$(CLASSBINDIR)/%.class) - $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH) -o $@ \ - -stubs $(CLASSES.export) - @-touch $@ # javah only writes file if changed - -clean :: FORCE - rm -rf $(OBJROOTS) - rm -f classstubs.c .program* - -clobber :: FORCE - rm -f $(OPTIMIZED) $(DEBUG) $(PROGRAM) $(PROGRAM)_g - rm -f .java_wrapper_local - -# -# Now include make dependencies -# -files := $(foreach file, $(wildcard */$(ARCH)/$(TSOBJDIR)/*.d), $(file)) -ifneq ($(strip $(files)),) - include $(files) -endif -
diff --git a/build/solaris/makefiles/Project.gmk b/build/solaris/makefiles/Project.gmk deleted file mode 100644 index 1cba7ac..0000000 --- a/build/solaris/makefiles/Project.gmk +++ /dev/null
@@ -1,21 +0,0 @@ -# -# @(#)Project.gmk 1.2 97/10/25 -# -# Rule to make the Java Workshop project file at each level. -# -# SUBDIRS may be set if there are subdirectories. -# .classes.prj will have been created if there -# are .java files here. - -MAIN_prj = $(MAIN:%=%.prj) - -project :: $(MAIN_prj) GNUmakefile - sh $(TOPDIR)/build/$(PLATFORM)/makefiles/mkproject -d $(CLASSBINDIR) \ - -p $(CLASSPATH) -s "$(SUBDIRS)" -c "-g -J-mx16m -J-mx32m" \ - $(shell if [ -s .classes.prj ] ; then cat .classes.prj; fi) \ - >$(shell basename `pwd`).prj - -%.prj: GNUmakefile - sh $(TOPDIR)/build/$(PLATFORM)/makefiles/mkproject -d $(CLASSBINDIR) \ - -p $(CLASSPATH) -s $(TOPDIR)/build/$(PLATFORM)/$(PLATFORM) \ - -j -mx32m -m $(PACKAGE).$(subst .prj,,$@) > $@
diff --git a/build/solaris/makefiles/Rules.gmk b/build/solaris/makefiles/Rules.gmk deleted file mode 100644 index 57cfe2a..0000000 --- a/build/solaris/makefiles/Rules.gmk +++ /dev/null
@@ -1,175 +0,0 @@ -# -# @(#)Rules.gmk 1.3 97/10/23 -# -# Rules shared by all Java makefiles. -# - -.PHONY: classes - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -# -# This could now be done with vpaths. -# -$(CLASSBINDIR)/%.class: $(PLATFORM_SRC)/classes/%.java - @echo $? >>.classes.list -$(CLASSBINDIR)/%.class: $(SHARE_SRC)/classes/%.java - @echo $? >>.classes.list - -FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) - -.delete.classlist: - @/bin/rm -f .classes.list - -.compile.classlist: - if [ -s .classes.list ] ; \ - then $(JAVAC_CMD) -classpath $(CLASSPATH) -d $(CLASSBINDIR) \ - $(JAVACFLAGS) \ - $(shell if [ -s .classes.list ] ; then cat .classes.list; fi ) ; \ - fi - -classes : $(CLASSBINDIR) .delete.classlist $(FILES_class) .compile.classlist - -# -# Special rules to collect the list of source files in this project. -# The leading "X/" is a necessary hack because otherwise "%.class" -# doesn't match anything with a "/" in it. -# -X/%.class: $(PLATFORM_SRC)/classes/%.java - @echo $? >>.classes.prj -X/%.class: $(SHARE_SRC)/classes/%.java - @echo $? >>.classes.prj - -FILES_list = $(FILES_java:%.java=X/%.class) - -# -# Rules for making Java Workshop project files -# -project :: .delete.prjlist $(FILES_list) - -.delete.prjlist: - @/bin/rm -f .classes.prj - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Project.gmk - -# End of Java Workshop rules - -$(CLASSBINDIR): - @mkdir -p $@ - -$(OBJDIR)/%.o: %.c - ifdef VARIANT - $(COMPILE.c) -o $@ $< - @$(CC) -xM1 $(CPPFLAGS) $< 2> /dev/null | \ - sed -e '/:[ ]*[/]/d' -e 's!$*\.o!$(dir $@)&!g' | \ - sort | uniq > $(@:.o=.d) - else - $(MAKE) $@ VARIANT=OPT - endif - -$(OBJDIR_NAME)$(DBG_SUFFIX)/$(ARCH)/$(TSOBJDIR)/%.o: %.c - ifdef VARIANT - $(COMPILE.c) -o $@ $< - @$(CC) -xM1 $(CPPFLAGS) $< 2> /dev/null | \ - sed -e '/:[ ]*[/]/d' -e 's!$*\.o!$(dir $@)&!g' | \ - sort | uniq > $(@:.o=.d) - else - $(MAKE) $@ VARIANT=DBG - endif - -$(OBJDIR_NAME)/$(ARCH)/$(TSOBJDIR)/%.o: %.cpp - $(COMPILE.cc) -o $@ $< - -$(OBJDIR_NAME)$(DBG_SUFFIX)/$(ARCH)/$(TSOBJDIR)/%.o: %.cpp - $(COMPILE.cc) -o $@ $< - -$(OBJDIR_NAME)/$(ARCH)/$(TSOBJDIR)/%.o: %.s - $(COMPILE.s) -o $@ $< - -$(OBJDIR_NAME)$(DBG_SUFFIX)/$(ARCH)/$(TSOBJDIR)/%.o: %.s - $(COMPILE.s) -o $@ $< - -# -# Special targets and dependencies -# -opcodes.h: $(SHARE_SRC)/javavm/include/opcodes.list - @echo "Creating $@ ... " - @rm -f $@ - @awk 'BEGIN {print "typedef enum {" } \ - /^[a-z]/ {printf(" opc_%s = %d,\n", $$1, i++); } \ - END {printf(" opc_first_unused_index = %d,\n", i++); \ - print " opc_software = 254,"; \ - print " opc_hardware = 255"; \ - print "} opcode_type;"; \ - }' \ - $(SHARE_SRC)/javavm/include/opcodes.list > $@ - @chmod 444 $@ - -opcodes.init: $(SHARE_SRC)/javavm/include/opcodes.list - @echo "Creating $@ ... " - @rm -f $@ - @awk 'BEGIN { print "char *opnames[256] = {" } \ - /^[a-z]/ { printf(" \"%s\",\n", $$1); i++; } \ - END { while(i++ < 254) print " \"??\","; \ - print " \"software\","; \ - print " \"hardware\","; \ - print "};" \ - }' \ - $(SHARE_SRC)/javavm/include/opcodes.list > $@ - @chmod 444 $@ - -opcodes.c: $(SHARE_SRC)/javavm/include/opcodes.list - @echo "Creating $@ ... " - @rm -f $@ - @awk 'BEGIN { \ - print "#if defined(TRACING) || defined(STATISTICS)"; \ - print "char *opnames[256] = {"; \ - } \ - /^[a-z]/ { printf(" \"%s\",\n", $$1); i++; } \ - END { \ - while(i++ < 254) \ - print " \"??\","; \ - print " \"software\","; \ - print " \"hardware\","; \ - print "};"; \ - print "#else "; \ - print "char *opnames[1];"; \ - print "#endif"; \ - } \ - ' \ - $(SHARE_SRC)/javavm/include/opcodes.list > $@ - @chmod 444 $@ - -opcodes.length: $(SHARE_SRC)/javavm/include/opcodes.list - @echo "Creating $@ ... " - @rm -f $@ - @awk 'BEGIN { print "short opcode_length[256] = {" } \ - /^[a-z]/ { printf(" %s,\t\t/* %s */\n", $$2, $$1); i++; } \ - END { while(i++ < 256) print " -1,"; print "};" }' \ - $(SHARE_SRC)/javavm/include/opcodes.list > $@ - @chmod 444 $@ - -opcodes.in_out: $(SHARE_SRC)/javavm/include/opcodes.list - @echo "Creating $@ ... " - @rm -f $@ - @awk 'BEGIN { print "char *opcode_in_out[][2] = {" } \ - /^[a-z]/ { if ($$3 == "-") $$3 = ""; \ - if ($$4 == "-") $$4 = ""; \ - printf(" {\"%s\", \"%s\"}, \t\t/* %s */\n", \ - $$3, $$4, $$1); } \ - END { print "};" }' \ - $(SHARE_SRC)/javavm/include/opcodes.list > $@ - @chmod 444 $@ - -clobber :: clean - -FORCE: ; - -.PHONY : .delete.classlist classes .compile.classlist clean clobber - -debug: - $(MAKE) $(DEBUG) VARIANT=DBG - -optimized: - $(MAKE) $(OPTIMIZED) VARIANT=OPT -
diff --git a/build/solaris/makefiles/Subdirs.gmk b/build/solaris/makefiles/Subdirs.gmk deleted file mode 100644 index cb8f954..0000000 --- a/build/solaris/makefiles/Subdirs.gmk +++ /dev/null
@@ -1,11 +0,0 @@ -# -# @(#)Subdirs.gmk 1.1 97/10/22 -# -# Generic rule to recurse. -# -all clean clobber project :: - @for i in $(SUBDIRS) ; do \ - echo ">>>Recursively making "$$i" "$@"..."; \ - cd $$i; $(MAKE) $@ RELEASE=$(RELEASE) || exit 1; cd ..; \ - echo "<<<Finished Recursively making "$$i" "$@"." ; \ - done
diff --git a/build/solaris/makefiles/Wrapper.gmk b/build/solaris/makefiles/Wrapper.gmk deleted file mode 100644 index 56d21ae..0000000 --- a/build/solaris/makefiles/Wrapper.gmk +++ /dev/null
@@ -1,61 +0,0 @@ -# @(#)Wrapper.gmk 1.1 97/09/07 -# -# Wrapper installation rules for tools that invoke java with a -# classname (eg: javac, javakey). - - -# Usage: -# Include this file in your makefile and set PROG_SH to be the -# tool(s) name(s). The tool should live in -# src/$(PLATFORM)/bin/tool.sh. For instance: -# -# include $(TOPDIR)/build/$(PLATFORM)/makefiles/Wrapper.gmk -# PROG_SH = javakey javakey_g -# -# Note that multiple scripts can be installed. - - -include $(TOPDIR)/build/$(PLATFORM)/makefiles/Defs.gmk - -# -# PROG_SH_* variables point to locations of the: -# (a) script in the distribution/build (DEST), -# (b) dirname for DEST (namely DESTDIR), -# (c) script in its source form (SRC), and -# (d) symlink so the tool could use .java_wrapper (LINK). -# -PROG_SH_DESTDIR = $(BINDIR)/$(ARCH)/$(TSOBJDIR) -PROG_SH_DEST = $(PROG_SH:%=$(PROG_SH_DESTDIR)/%) -PROG_SH_SRC = $(PROG_SH:%=$(PLATFORM_SRC)/bin/%.sh) -PROG_SH_LINK = $(PROG_SH:%=$(BINDIR)/%) - -$(PROG_SH_DESTDIR)/%: $(PLATFORM_SRC)/bin/%.sh - @mkdir -p $(BINDIR) - rm -f $@ - cp $< $@ - chmod +x $@ - -$(PROG_SH_LINK): $(BINDIR)/.java_wrapper - rm -f $(PROG_SH_LINK) - cd $(BINDIR) ; \ - for i in $(PROG_SH) ; do \ - ln -s .java_wrapper $$i ; \ - done - -$(BINDIR)/.java_wrapper: $(PLATFORM_SRC)/bin/java_wrapper.sh \ - $(PROG_SH_DESTDIR)/.extract_args - @mkdir -p $(BINDIR) - rm -f $(BINDIR)/.java_wrapper - cp $(PLATFORM_SRC)/bin/java_wrapper.sh $(BINDIR)/.java_wrapper - chmod +x $(BINDIR)/.java_wrapper - -$(PROG_SH_DESTDIR)/.extract_args: $(PLATFORM_SRC)/bin/extract_args.sh - @mkdir -p $(PROG_SH_DESTDIR) - rm -f $(PROG_SH_DESTDIR)/.extract_args - cp $(PLATFORM_SRC)/bin/extract_args.sh $(PROG_SH_DESTDIR)/.extract_args - -all install: $(PROG_SH_DEST) $(PROG_SH_LINK) - -clean clobber:: - rm -f $(PROG_SH_DEST) $(PROG_SH_LINK) -
diff --git a/build/solaris/makefiles/mkproject b/build/solaris/makefiles/mkproject deleted file mode 100644 index f09471a..0000000 --- a/build/solaris/makefiles/mkproject +++ /dev/null
@@ -1,140 +0,0 @@ -#!/bin/sh -# -# @(#)mkproject 1.4 97/11/26 -# -# Copyright (c) 1997 by Sun Microsystems, Inc. -# All rights reserved. -# -# mkproject - make a Java Workshop project file -# -USAGE='mkproject [-d classdir] [-p classpath] [-s subdirs] [-c compiler-opts] - [-j java-opts] [-m main-class] files ...' -# -CLASSDIR=classes -CLASSPATH= -SUBDIRS= -JAVACFLAGS=-g -JAVAFLAGS= -MAIN= -while getopts d:p:s:c:j:m: i -do - case $i in - d) CLASSDIR="$OPTARG";; - p) CLASSPATH="$OPTARG";; - s) SUBDIRS="$OPTARG";; - c) JAVACFLAGS="$OPTARG";; - j) JAVAFLAGS="$OPTARG";; - m) MAIN="$OPTARG";; - '?') echo "$USAGE"; exit 2;; - esac -done -shift `expr $OPTIND - 1` -echo sun.jws.version.2 -if [ -n "$MAIN" ] -then - PACKAGE=`expr $MAIN : '\(.*\)\..*'` - CLASS=`expr $MAIN : '.*\.\(.*\)'` - cat <<-EOF - sun.jws.package=$PACKAGE - sun.jws.classname=$CLASS - sun.jws.type=standalone - EOF -else - echo sun.jws.type=package -fi -cat <<EOF -sun.jws.useVisual=false -sun.jws.classdir=$CLASSDIR -sun.jws.options=$JAVACFLAGS -EOF -if [ -n "$MAIN" ] -then - echo "sun.jws.javaArguments=$JAVAFLAGS" - # - # Put out the sourcepath, eliminating duplicates and anything - # that doesn't look like a source directory. - # - echo sun.jws.sourcepath=List - oldIFS=$IFS - IFS=: - for i in $CLASSPATH - do - echo $i - done | \ - awk ' - /\/src\// { if (!seen[$1]) { - print; - seen[$1] = 1; - } - } - ' - IFS=$oldIFS - echo EndOfList -fi -# -# Put out the CLASSPATH, eliminating duplicates and anything that looks -# like the JDK or JRE. -# -echo sun.jws.classpath=List -oldIFS=$IFS -IFS=: -for i in $CLASSPATH -do - echo $i -done | \ -awk ' - /^\/.*\/java\/lib\/classes\.zip$/ { next; } - /^\/.*\/solaris\/lib\/classes\.zip$/ { next; } - /^\/.*\/jre\/lib\/rt\.jar$/ { next; } - { if (!seen[$1]) { - print; - seen[$1] = 1; - } - } -' -IFS=$oldIFS -echo EndOfList -# -# If any subdirectories, put out references to sub-projects. -# -if [ -n "$SUBDIRS" ] -then - echo sun.jws.includes=List - for i in $SUBDIRS - do - case $i in - tests) ;; # skip - */*) echo $i.prj;; - *) echo $i/$i.prj;; - esac - done - echo EndOfList -fi -# -# If any files, list them. -# -if [ $# -gt 0 ] -then - echo sun.jws.files=List - for i - do - echo $i - done - echo EndOfList -elif [ -n "$MAIN" ] -then - echo sun.jws.files=List - MAIN_src=`echo "$MAIN" | sed -e 's:\.:/:g'`.java - oldIFS=$IFS - IFS=: - for i in $CLASSPATH - do - if [ -f $i/$MAIN_src ] - then - echo $i/$MAIN_src - break - fi - done - IFS=$oldIFS - echo EndOfList -fi
diff --git a/build/solaris/scslize b/build/solaris/scslize deleted file mode 100644 index 316ecdb..0000000 --- a/build/solaris/scslize +++ /dev/null
@@ -1,28 +0,0 @@ -#!/bin/sh -# -# @(#)scslize 1.1 02/04/02 -# -# A shell script to modify a workspace to make it suitable -# for the SCSL release of the source. We get rid of lots -# of internal-only tests and stuff. -# -# First, remove permission for anyone to putback this workspace. -# -cd $CODEMGR_WS -ed - Codemgr_wsdata/access_control <<'EOF' -/^putback-from/c -putback-from - -. -w -q -EOF -# -# Next, remove the files that don't belong here. -# -workspace filerm \ - tests \ - src/share/classes/javasoft \ - src/share/classes/test \ - src/share/doc/spec \ - build/precompile.jtx \ - build/solaris/scslize
diff --git a/build/solaris/siggen b/build/solaris/siggen deleted file mode 100644 index 9429339..0000000 --- a/build/solaris/siggen +++ /dev/null
@@ -1,16 +0,0 @@ -#!/bin/sh -# -# @(#)siggen 1.5 04/07/13 -# -# Generate a new signature file. -# -# Usage: siggen -in mail.jar -package javax -out mail.sig -# -#CLASSPATH=/java/re/jct-tools/2.1.6/archive/fcs/binaries/apiCheck.jar -# newer version... -CLASSPATH=/java/re/jct-tools/3.1.4/archive/fcs/binaries/lib/apiCheck.jar -JAVA_HOME=/java/re/jdk/1.3.1/archive/fcs/binaries/solsparc -export CLASSPATH JAVA_HOME -#${JAVA_HOME}/bin/java javasoft.sqe.apiCheck.Setup "$@" -# options used by CTS... -${JAVA_HOME}/bin/java javasoft.sqe.apiCheck.Setup -xpriv -constvalues "$@"
diff --git a/build/solaris/sigtest b/build/solaris/sigtest deleted file mode 100644 index 984ab9d..0000000 --- a/build/solaris/sigtest +++ /dev/null
@@ -1,15 +0,0 @@ -#!/bin/sh -# -# @(#)sigtest 1.5 04/07/13 -# -# Compare API against a signature file. -# -# Usage: sigtest -base mail.sig -test mail.jar -package javax -# -out report.out -updateout update.out -# -#CLASSPATH=/java/re/jct-tools/2.1.6/archive/fcs/binaries/apiCheck.jar -# newer version... -CLASSPATH=/java/re/jct-tools/3.1.4/archive/fcs/binaries/lib/apiCheck.jar -JAVA_HOME=/java/re/jdk/1.3.1/archive/fcs/binaries/solsparc -export CLASSPATH JAVA_HOME -${JAVA_HOME}/bin/java javasoft.sqe.apiCheck.Diff "$@"
diff --git a/build/win32/Makefile b/build/win32/Makefile deleted file mode 100644 index 976703f..0000000 --- a/build/win32/Makefile +++ /dev/null
@@ -1,115 +0,0 @@ -# -# VERSION @(#)Makefile 1.6 97/10/28 -# - -PLATFORM = win32 -PACKAGE = javax.activation -PRODUCT = sun - -# -# important locations -# -TOPDIR = ..\.. -BUILD_DIR = $(TOPDIR)\build -PLATFORM_DIR = $(BUILD_DIR)\$(PLATFORM) -CLASS_DIR = $(PLATFORM_DIR)\classes -SRC_DIR = $(TOPDIR)\src\classes -LIB_DIR = $(PLATFORM_DIR)\lib -META_INF_DIR = $(PLATFORM_DIR)\classes\META-INF -SRC_LIB_DIR = $(TOPDIR)\src\lib - -# -# Set JAVA_HOME to _JAVA_HOME if JDK_HOME isn't set. Otherwise, set -# it to JDK_HOME -# -_JAVA_HOME = C:\jdk -!IF "$(JDK_HOME)" == "" -JAVA_HOME = $(_JAVA_HOME) -!ELSE -JAVA_HOME = $(JDK_HOME) -!ENDIF - -!if "$(OS)" == "Windows_NT" -DEL = del/f/q -DELTREE = rmdir/s/q -!else -DEL = deltree/y -DELTREE = deltree/y -!endif - -# -# the commands to build with -# -JAVA = $(JAVA_HOME)\bin\java -JAVAC = $(JAVA_HOME)\bin\javac -J-mx32m -JAVADOC = $(JAVA_HOME)\bin\javadoc -STDCLASSPATH = $(JAVA_HOME)\classes;$(JAVA_HOME)\lib\classes.zip - -# -# define the variables that specify the source files and class files -# -!include $(BUILD_DIR)\classes.mk - -# -# the targets -# -jaf: classesdir $(JAVAX_CLASSES_LIST) $(COM_SUN_CLASSES_LIST) - @echo Jarring... - @md $(LIB_DIR) - @md $(META_INF_DIR) - @xcopy /f $(SRC_LIB_DIR)\mailcap $(META_INF_DIR) - @xcopy /f $(SRC_LIB_DIR)\mimetypes $(META_INF_DIR) - @cd $(CLASS_DIR) - - @jar cf ..\lib\jaf.jar javax com META-INF - @cd .. - -test: classesdir $(TEST_CLASSES_LIST) - -classesdir: - @md $(CLASS_DIR) - -all: jaf test - -demo: jaf $(DEMO_CLASSES_LIST) - -javahome: - @echo JAVA_HOME is $(JAVA_HOME) - @$(JAVA) -fullversion - -clean: - @echo Cleaning... - @$(DELTREE) $(CLASS_DIR) - @$(DELTREE) $(LIB_DIR) - -# -# Build rules for converting .java files into .class files -# we have to define implicit rules for each directory since boneheaded -# nmake doesn't support static pattern rules =( -# -.SUFFIXES: .java .class - -{$(SRC_DIR)\javax\activation}.java{$(CLASS_DIR)\javax\activation}.class : - @echo Compiling $<... - @$(JAVAC) -d $(CLASS_DIR) -classpath $(CLASS_DIR);$(STDCLASSPATH);$(SRC_DIR) $< - @echo ----------------------- - -{$(SRC_DIR)\com\sun\activation\registries}.java{$(CLASS_DIR)\com\sun\activation\registries}.class : - @echo Compiling $<... - @$(JAVAC) -d $(CLASS_DIR) -classpath $(CLASS_DIR);$(STDCLASSPATH);$(SRC_DIR) $< - @echo ----------------------- - -{$(SRC_DIR)\com\sun\activation\viewers}.java{$(CLASS_DIR)\com\sun\activation\viewers}.class : - @echo Compiling $<... - @$(JAVAC) -d $(CLASS_DIR) -classpath $(CLASS_DIR);$(STDCLASSPATH);$(SRC_DIR) $< - @echo ----------------------- - -{$(SRC_DIR)\com\sun\activation\mime}.java{$(CLASS_DIR)\com\sun\activation\mime}.class : - @echo Compiling $<... - @$(JAVAC) -d $(CLASS_DIR) -classpath $(CLASS_DIR);$(STDCLASSPATH);$(SRC_DIR) $< - @echo ----------------------- - -{$(SRC_DIR)\test}.java{$(CLASS_DIR)\test}.class : - @echo Compiling $<... - @$(JAVAC) -d $(CLASS_DIR) -classpath $(CLASS_DIR);$(STDCLASSPATH);$(SRC_DIR) $< - @echo -----------------------
diff --git a/src/share/classes/demo/CompViewer.java b/demo/src/main/java/CompViewer.java similarity index 100% rename from src/share/classes/demo/CompViewer.java rename to demo/src/main/java/CompViewer.java
diff --git a/src/share/classes/demo/DCHTest.java b/demo/src/main/java/DCHTest.java similarity index 100% rename from src/share/classes/demo/DCHTest.java rename to demo/src/main/java/DCHTest.java
diff --git a/src/share/classes/demo/DCHTest2.java b/demo/src/main/java/DCHTest2.java similarity index 100% rename from src/share/classes/demo/DCHTest2.java rename to demo/src/main/java/DCHTest2.java
diff --git a/src/share/classes/demo/DHURL.java b/demo/src/main/java/DHURL.java similarity index 100% rename from src/share/classes/demo/DHURL.java rename to demo/src/main/java/DHURL.java
diff --git a/src/share/classes/demo/FileView.java b/demo/src/main/java/FileView.java similarity index 100% rename from src/share/classes/demo/FileView.java rename to demo/src/main/java/FileView.java
diff --git a/src/share/classes/demo/JAFApp.java b/demo/src/main/java/JAFApp.java similarity index 100% rename from src/share/classes/demo/JAFApp.java rename to demo/src/main/java/JAFApp.java
diff --git a/src/share/classes/demo/MCDump.java b/demo/src/main/java/MCDump.java similarity index 100% rename from src/share/classes/demo/MCDump.java rename to demo/src/main/java/MCDump.java
diff --git a/src/share/classes/demo/MCTest.java b/demo/src/main/java/MCTest.java similarity index 100% rename from src/share/classes/demo/MCTest.java rename to demo/src/main/java/MCTest.java
diff --git a/src/share/classes/demo/ODCHTest.java b/demo/src/main/java/ODCHTest.java similarity index 100% rename from src/share/classes/demo/ODCHTest.java rename to demo/src/main/java/ODCHTest.java
diff --git a/src/share/classes/demo/PlainDCH.java b/demo/src/main/java/PlainDCH.java similarity index 100% rename from src/share/classes/demo/PlainDCH.java rename to demo/src/main/java/PlainDCH.java
diff --git a/src/share/classes/demo/PrefTest.java b/demo/src/main/java/PrefTest.java similarity index 100% rename from src/share/classes/demo/PrefTest.java rename to demo/src/main/java/PrefTest.java
diff --git a/src/share/classes/demo/SimpleDCF.java b/demo/src/main/java/SimpleDCF.java similarity index 100% rename from src/share/classes/demo/SimpleDCF.java rename to demo/src/main/java/SimpleDCF.java
diff --git a/src/share/classes/demo/TextInternalizer.java b/demo/src/main/java/TextInternalizer.java similarity index 100% rename from src/share/classes/demo/TextInternalizer.java rename to demo/src/main/java/TextInternalizer.java
diff --git a/src/share/doc/release/LICENSE.txt b/doc/release/LICENSE.txt similarity index 100% rename from src/share/doc/release/LICENSE.txt rename to doc/release/LICENSE.txt
diff --git a/src/share/doc/release/README.txt b/doc/release/README.txt similarity index 100% rename from src/share/doc/release/README.txt rename to doc/release/README.txt
diff --git a/src/share/doc/release/RELNOTES.txt b/doc/release/RELNOTES.txt similarity index 100% rename from src/share/doc/release/RELNOTES.txt rename to doc/release/RELNOTES.txt
diff --git a/src/share/doc/spec/JAF-1.0.doc b/doc/spec/JAF-1.0.doc similarity index 100% rename from src/share/doc/spec/JAF-1.0.doc rename to doc/spec/JAF-1.0.doc Binary files differ
diff --git a/src/share/doc/spec/JAF-1.0.pdf b/doc/spec/JAF-1.0.pdf similarity index 100% rename from src/share/doc/spec/JAF-1.0.pdf rename to doc/spec/JAF-1.0.pdf Binary files differ
diff --git a/src/share/doc/spec/JAF-1.0.ps b/doc/spec/JAF-1.0.ps similarity index 100% rename from src/share/doc/spec/JAF-1.0.ps rename to doc/spec/JAF-1.0.ps
diff --git a/src/share/doc/spec/JAF-1.1-changes.txt b/doc/spec/JAF-1.1-changes.txt similarity index 100% rename from src/share/doc/spec/JAF-1.1-changes.txt rename to doc/spec/JAF-1.1-changes.txt
diff --git a/src/share/doc/spec/JAF-1.1.doc b/doc/spec/JAF-1.1.doc similarity index 100% rename from src/share/doc/spec/JAF-1.1.doc rename to doc/spec/JAF-1.1.doc Binary files differ
diff --git a/src/share/doc/spec/JAF-1.1.pdf b/doc/spec/JAF-1.1.pdf similarity index 100% rename from src/share/doc/spec/JAF-1.1.pdf rename to doc/spec/JAF-1.1.pdf Binary files differ
diff --git a/src/share/doc/spec/JAF-1.1.ps b/doc/spec/JAF-1.1.ps similarity index 100% rename from src/share/doc/spec/JAF-1.1.ps rename to doc/spec/JAF-1.1.ps
diff --git a/src/share/lib/jaf.mf b/src/share/lib/jaf.mf deleted file mode 100644 index 0296ff4..0000000 --- a/src/share/lib/jaf.mf +++ /dev/null
@@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -SCCS-ID: @(#)jaf.mf 1.2 05/05/23 -Extension-Name: javax.activation -Specification-Title: JavaBeans(TM) Activation Framework Specification -Specification-Version: 1.1 -Specification-Vendor: Sun Microsystems, Inc. -Implementation-Version: %RELEASE% -Implementation-Vendor: Sun Microsystems, Inc. -Implementation-Vendor-Id: com.sun