[Jsxe-cvs] SF.net SVN: jsxe: [1235] branches/jsxe2
Status: Inactive
Brought to you by:
ian_lewis
From: <ian...@us...> - 2006-09-05 15:51:36
|
Revision: 1235 http://svn.sourceforge.net/jsxe/?rev=1235&view=rev Author: ian_lewis Date: 2006-09-05 08:47:51 -0700 (Tue, 05 Sep 2006) Log Message: ----------- Merge from trunk/jsxe of rev. 1232 Modified Paths: -------------- branches/jsxe2/AUTHORS branches/jsxe2/Changelog branches/jsxe2/INSTALL branches/jsxe2/README branches/jsxe2/bin/jsXe.bat branches/jsxe2/bin/jsXe.sh branches/jsxe2/build.xml branches/jsxe2/src/net/sourceforge/jsxe/ActionManager.java branches/jsxe2/src/net/sourceforge/jsxe/BufferHistory.java branches/jsxe2/src/net/sourceforge/jsxe/CatalogManager.java branches/jsxe2/src/net/sourceforge/jsxe/CustomFileFilter.java branches/jsxe2/src/net/sourceforge/jsxe/DocumentBuffer.java branches/jsxe2/src/net/sourceforge/jsxe/LocalizedAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/CopyAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/CutAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/FindAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/FindNextAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/OpenRecentFileAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/PasteAction.java branches/jsxe2/src/net/sourceforge/jsxe/dom/AdapterNode.java branches/jsxe2/src/net/sourceforge/jsxe/dom/XMLDocument.java branches/jsxe2/src/net/sourceforge/jsxe/gui/GUIUtilities.java branches/jsxe2/src/net/sourceforge/jsxe/gui/Messages.java branches/jsxe2/src/net/sourceforge/jsxe/gui/TabbedView.java branches/jsxe2/src/net/sourceforge/jsxe/gui/menu/WrappingMenu.java branches/jsxe2/src/net/sourceforge/jsxe/jsXe.java branches/jsxe2/src/net/sourceforge/jsxe/msg/PropertyChanged.java branches/jsxe2/src/net/sourceforge/jsxe/options/GeneralOptionPane.java branches/jsxe2/src/net/sourceforge/jsxe/options/ShortcutsOptionPane.java branches/jsxe2/src/net/sourceforge/jsxe/properties Added Paths: ----------- branches/jsxe2/buildlib/avalon.jar branches/jsxe2/buildlib/batik.jar branches/jsxe2/buildlib/bsf.jar branches/jsxe2/buildlib/docbook/ branches/jsxe2/buildlib/docbook/VERSION branches/jsxe2/buildlib/docbook/catalog.xml branches/jsxe2/buildlib/docbook/common/ branches/jsxe2/buildlib/docbook/common/ChangeLog branches/jsxe2/buildlib/docbook/common/af.xml branches/jsxe2/buildlib/docbook/common/ar.xml branches/jsxe2/buildlib/docbook/common/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/common/bg.xml branches/jsxe2/buildlib/docbook/common/bn.xml branches/jsxe2/buildlib/docbook/common/bs.xml branches/jsxe2/buildlib/docbook/common/ca.xml branches/jsxe2/buildlib/docbook/common/common.xsl branches/jsxe2/buildlib/docbook/common/cs.xml branches/jsxe2/buildlib/docbook/common/da.xml branches/jsxe2/buildlib/docbook/common/de.xml branches/jsxe2/buildlib/docbook/common/el.xml branches/jsxe2/buildlib/docbook/common/en.xml branches/jsxe2/buildlib/docbook/common/es.xml branches/jsxe2/buildlib/docbook/common/et.xml branches/jsxe2/buildlib/docbook/common/eu.xml branches/jsxe2/buildlib/docbook/common/fa.xml branches/jsxe2/buildlib/docbook/common/fi.xml branches/jsxe2/buildlib/docbook/common/fr.xml branches/jsxe2/buildlib/docbook/common/gentext.xsl branches/jsxe2/buildlib/docbook/common/he.xml branches/jsxe2/buildlib/docbook/common/hr.xml branches/jsxe2/buildlib/docbook/common/hu.xml branches/jsxe2/buildlib/docbook/common/id.xml branches/jsxe2/buildlib/docbook/common/it.xml branches/jsxe2/buildlib/docbook/common/ja.xml branches/jsxe2/buildlib/docbook/common/ko.xml branches/jsxe2/buildlib/docbook/common/l10n.dtd branches/jsxe2/buildlib/docbook/common/l10n.xml branches/jsxe2/buildlib/docbook/common/l10n.xsl branches/jsxe2/buildlib/docbook/common/la.xml branches/jsxe2/buildlib/docbook/common/labels.xsl branches/jsxe2/buildlib/docbook/common/lt.xml branches/jsxe2/buildlib/docbook/common/nl.xml branches/jsxe2/buildlib/docbook/common/nn.xml branches/jsxe2/buildlib/docbook/common/no.xml branches/jsxe2/buildlib/docbook/common/olink.xsl branches/jsxe2/buildlib/docbook/common/pi.xsl branches/jsxe2/buildlib/docbook/common/pl.xml branches/jsxe2/buildlib/docbook/common/pt.xml branches/jsxe2/buildlib/docbook/common/pt_br.xml branches/jsxe2/buildlib/docbook/common/ro.xml branches/jsxe2/buildlib/docbook/common/ru.xml branches/jsxe2/buildlib/docbook/common/sk.xml branches/jsxe2/buildlib/docbook/common/sl.xml branches/jsxe2/buildlib/docbook/common/sr.xml branches/jsxe2/buildlib/docbook/common/sr_Latn.xml branches/jsxe2/buildlib/docbook/common/subtitles.xsl branches/jsxe2/buildlib/docbook/common/sv.xml branches/jsxe2/buildlib/docbook/common/table.xsl branches/jsxe2/buildlib/docbook/common/targetdatabase.dtd branches/jsxe2/buildlib/docbook/common/targets.xsl branches/jsxe2/buildlib/docbook/common/th.xml branches/jsxe2/buildlib/docbook/common/titles.xsl branches/jsxe2/buildlib/docbook/common/tr.xml branches/jsxe2/buildlib/docbook/common/uk.xml branches/jsxe2/buildlib/docbook/common/vi.xml branches/jsxe2/buildlib/docbook/common/xh.xml branches/jsxe2/buildlib/docbook/common/zh_cn.xml branches/jsxe2/buildlib/docbook/common/zh_tw.xml branches/jsxe2/buildlib/docbook/dtd/ branches/jsxe2/buildlib/docbook/dtd/calstblx.dtd branches/jsxe2/buildlib/docbook/dtd/catalog branches/jsxe2/buildlib/docbook/dtd/catalog.xml branches/jsxe2/buildlib/docbook/dtd/dbcentx.mod branches/jsxe2/buildlib/docbook/dtd/dbgenent.mod branches/jsxe2/buildlib/docbook/dtd/dbhierx.mod branches/jsxe2/buildlib/docbook/dtd/dbnotnx.mod branches/jsxe2/buildlib/docbook/dtd/dbpoolx.mod branches/jsxe2/buildlib/docbook/dtd/docbookx.dtd branches/jsxe2/buildlib/docbook/dtd/ent/ branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsa.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsb.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsc.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsn.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamso.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsr.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISObox.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOcyr1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOcyr2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOdia.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk3.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk4.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOlat1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOlat2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOnum.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOpub.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOtech.ent branches/jsxe2/buildlib/docbook/dtd/ent/catalog branches/jsxe2/buildlib/docbook/dtd/ent/catalog.xml branches/jsxe2/buildlib/docbook/dtd/htmltblx.mod branches/jsxe2/buildlib/docbook/dtd/soextblx.dtd branches/jsxe2/buildlib/docbook/fo/ branches/jsxe2/buildlib/docbook/fo/ChangeLog branches/jsxe2/buildlib/docbook/fo/admon.xsl branches/jsxe2/buildlib/docbook/fo/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/fo/autoidx.xsl branches/jsxe2/buildlib/docbook/fo/autotoc.xsl branches/jsxe2/buildlib/docbook/fo/axf.xsl branches/jsxe2/buildlib/docbook/fo/biblio.xsl branches/jsxe2/buildlib/docbook/fo/block.xsl branches/jsxe2/buildlib/docbook/fo/callout.xsl branches/jsxe2/buildlib/docbook/fo/component.xsl branches/jsxe2/buildlib/docbook/fo/division.xsl branches/jsxe2/buildlib/docbook/fo/docbook.xsl branches/jsxe2/buildlib/docbook/fo/docbookng.xsl branches/jsxe2/buildlib/docbook/fo/ebnf.xsl branches/jsxe2/buildlib/docbook/fo/fo-patch-for-fop.xsl branches/jsxe2/buildlib/docbook/fo/fo-rtf.xsl branches/jsxe2/buildlib/docbook/fo/fo.xsl branches/jsxe2/buildlib/docbook/fo/footnote.xsl branches/jsxe2/buildlib/docbook/fo/fop.xsl branches/jsxe2/buildlib/docbook/fo/formal.xsl branches/jsxe2/buildlib/docbook/fo/glossary.xsl branches/jsxe2/buildlib/docbook/fo/graphics.xsl branches/jsxe2/buildlib/docbook/fo/htmltbl.xsl branches/jsxe2/buildlib/docbook/fo/index.xsl branches/jsxe2/buildlib/docbook/fo/info.xsl branches/jsxe2/buildlib/docbook/fo/inline.xsl branches/jsxe2/buildlib/docbook/fo/keywords.xsl branches/jsxe2/buildlib/docbook/fo/lists.xsl branches/jsxe2/buildlib/docbook/fo/math.xsl branches/jsxe2/buildlib/docbook/fo/pagesetup.xsl branches/jsxe2/buildlib/docbook/fo/param.ent branches/jsxe2/buildlib/docbook/fo/param.xml branches/jsxe2/buildlib/docbook/fo/param.xsl branches/jsxe2/buildlib/docbook/fo/param.xweb branches/jsxe2/buildlib/docbook/fo/passivetex.xsl branches/jsxe2/buildlib/docbook/fo/pdf2index branches/jsxe2/buildlib/docbook/fo/pi.xsl branches/jsxe2/buildlib/docbook/fo/profile-docbook.xsl branches/jsxe2/buildlib/docbook/fo/qandaset.xsl branches/jsxe2/buildlib/docbook/fo/refentry.xsl branches/jsxe2/buildlib/docbook/fo/sections.xsl branches/jsxe2/buildlib/docbook/fo/synop.xsl branches/jsxe2/buildlib/docbook/fo/table.xsl branches/jsxe2/buildlib/docbook/fo/task.xsl branches/jsxe2/buildlib/docbook/fo/titlepage.templates.xml branches/jsxe2/buildlib/docbook/fo/titlepage.templates.xsl branches/jsxe2/buildlib/docbook/fo/titlepage.xsl branches/jsxe2/buildlib/docbook/fo/toc.xsl branches/jsxe2/buildlib/docbook/fo/verbatim.xsl branches/jsxe2/buildlib/docbook/fo/xep.xsl branches/jsxe2/buildlib/docbook/fo/xref.xsl branches/jsxe2/buildlib/docbook/html/ branches/jsxe2/buildlib/docbook/html/ChangeLog branches/jsxe2/buildlib/docbook/html/admon.xsl branches/jsxe2/buildlib/docbook/html/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/html/autoidx.xsl branches/jsxe2/buildlib/docbook/html/autotoc.xsl branches/jsxe2/buildlib/docbook/html/biblio.xsl branches/jsxe2/buildlib/docbook/html/block.xsl branches/jsxe2/buildlib/docbook/html/callout.xsl branches/jsxe2/buildlib/docbook/html/changebars.xsl branches/jsxe2/buildlib/docbook/html/chunk-code.xsl branches/jsxe2/buildlib/docbook/html/chunk-common.xsl branches/jsxe2/buildlib/docbook/html/chunk.xsl branches/jsxe2/buildlib/docbook/html/chunker.xsl branches/jsxe2/buildlib/docbook/html/chunkfast.xsl branches/jsxe2/buildlib/docbook/html/chunktoc.xsl branches/jsxe2/buildlib/docbook/html/component.xsl branches/jsxe2/buildlib/docbook/html/division.xsl branches/jsxe2/buildlib/docbook/html/docbook.xsl branches/jsxe2/buildlib/docbook/html/docbookng.xsl branches/jsxe2/buildlib/docbook/html/ebnf.xsl branches/jsxe2/buildlib/docbook/html/footnote.xsl branches/jsxe2/buildlib/docbook/html/formal.xsl branches/jsxe2/buildlib/docbook/html/glossary.xsl branches/jsxe2/buildlib/docbook/html/graphics.xsl branches/jsxe2/buildlib/docbook/html/html-rtf.xsl branches/jsxe2/buildlib/docbook/html/html.xsl branches/jsxe2/buildlib/docbook/html/htmltbl.xsl branches/jsxe2/buildlib/docbook/html/index.xsl branches/jsxe2/buildlib/docbook/html/info.xsl branches/jsxe2/buildlib/docbook/html/inline.xsl branches/jsxe2/buildlib/docbook/html/keywords.xsl branches/jsxe2/buildlib/docbook/html/lists.xsl branches/jsxe2/buildlib/docbook/html/maketoc.xsl branches/jsxe2/buildlib/docbook/html/manifest.xsl branches/jsxe2/buildlib/docbook/html/math.xsl branches/jsxe2/buildlib/docbook/html/oldchunker.xsl branches/jsxe2/buildlib/docbook/html/onechunk.xsl branches/jsxe2/buildlib/docbook/html/param.ent branches/jsxe2/buildlib/docbook/html/param.xml branches/jsxe2/buildlib/docbook/html/param.xsl branches/jsxe2/buildlib/docbook/html/param.xweb branches/jsxe2/buildlib/docbook/html/pi.xsl branches/jsxe2/buildlib/docbook/html/profile-chunk-code.xsl branches/jsxe2/buildlib/docbook/html/profile-chunk.xsl branches/jsxe2/buildlib/docbook/html/profile-docbook.xsl branches/jsxe2/buildlib/docbook/html/profile-onechunk.xsl branches/jsxe2/buildlib/docbook/html/qandaset.xsl branches/jsxe2/buildlib/docbook/html/refentry.xsl branches/jsxe2/buildlib/docbook/html/sections.xsl branches/jsxe2/buildlib/docbook/html/synop.xsl branches/jsxe2/buildlib/docbook/html/table.xsl branches/jsxe2/buildlib/docbook/html/task.xsl branches/jsxe2/buildlib/docbook/html/titlepage.templates.xml branches/jsxe2/buildlib/docbook/html/titlepage.templates.xsl branches/jsxe2/buildlib/docbook/html/titlepage.xsl branches/jsxe2/buildlib/docbook/html/toc.xsl branches/jsxe2/buildlib/docbook/html/verbatim.xsl branches/jsxe2/buildlib/docbook/html/xref.xsl branches/jsxe2/buildlib/docbook/lib/ branches/jsxe2/buildlib/docbook/lib/ChangeLog branches/jsxe2/buildlib/docbook/lib/lib.xml branches/jsxe2/buildlib/docbook/lib/lib.xsl branches/jsxe2/buildlib/docbook/lib/lib.xweb branches/jsxe2/buildlib/fop.jar branches/jsxe2/buildlib/js.jar branches/jsxe2/doc/ branches/jsxe2/doc/manual/ branches/jsxe2/doc/manual/manual.xml branches/jsxe2/installer/ branches/jsxe2/installer/done-HalfAnOS.html branches/jsxe2/installer/done-MacOS.html branches/jsxe2/installer/done-Unix.html branches/jsxe2/installer/done-VMS.html branches/jsxe2/installer/done-Windows.html branches/jsxe2/installer/gpl.html branches/jsxe2/installer/jsxe-installer.ico branches/jsxe2/installer/jsxe.desktop branches/jsxe2/installer/jsxe.png branches/jsxe2/installer/launch4j.xml branches/jsxe2/installer/readme.html branches/jsxe2/installer/src/ branches/jsxe2/installer/src/installer/ branches/jsxe2/installer/src/installer/BZip2Constants.java branches/jsxe2/installer/src/installer/CBZip2InputStream.java branches/jsxe2/installer/src/installer/CBZip2OutputStream.java branches/jsxe2/installer/src/installer/CRC.java branches/jsxe2/installer/src/installer/ConsoleInstall.java branches/jsxe2/installer/src/installer/ConsoleProgress.java branches/jsxe2/installer/src/installer/Install.java branches/jsxe2/installer/src/installer/InstallThread.java branches/jsxe2/installer/src/installer/InvalidHeaderException.java branches/jsxe2/installer/src/installer/NonInteractiveInstall.java branches/jsxe2/installer/src/installer/OperatingSystem.java branches/jsxe2/installer/src/installer/Progress.java branches/jsxe2/installer/src/installer/SwingInstall.java branches/jsxe2/installer/src/installer/TarBuffer.java branches/jsxe2/installer/src/installer/TarEntry.java branches/jsxe2/installer/src/installer/TarHeader.java branches/jsxe2/installer/src/installer/TarInputStream.java branches/jsxe2/installer/src/installer/TarOutputStream.java branches/jsxe2/installer/src/installer/VariableGridLayout.java branches/jsxe2/jsxe.ico branches/jsxe2/launch4j.xml branches/jsxe2/messages/messages.properties branches/jsxe2/messages/messages_de.properties branches/jsxe2/messages/messages_ja.properties branches/jsxe2/messages/messages_ru.properties branches/jsxe2/messages/messages_sv.properties branches/jsxe2/src/net/sourceforge/jsxe/action/ContextSpecificAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/RedoAction.java branches/jsxe2/src/net/sourceforge/jsxe/action/UndoAction.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/ branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/InsertEdit.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodeNameChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodePrefixChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodeValueChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/RemoveEdit.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java branches/jsxe2/src/net/sourceforge/jsxe/gui/RolloverButton.java branches/jsxe2/src/net/sourceforge/jsxe/help/ branches/jsxe2/src/net/sourceforge/jsxe/help/HelpIndex.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpSearchPanel.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpTOCPanel.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpViewer.java branches/jsxe2/src/net/sourceforge/jsxe/icons/ArrowD.png branches/jsxe2/src/net/sourceforge/jsxe/icons/ArrowL.png branches/jsxe2/src/net/sourceforge/jsxe/icons/ArrowR.png branches/jsxe2/src/net/sourceforge/jsxe/icons/ArrowU.png branches/jsxe2/src/net/sourceforge/jsxe/msg/RedoEvent.java branches/jsxe2/src/net/sourceforge/jsxe/msg/UndoEvent.java Removed Paths: ------------- branches/jsxe2/buildlib/docbook/VERSION branches/jsxe2/buildlib/docbook/catalog.xml branches/jsxe2/buildlib/docbook/common/ branches/jsxe2/buildlib/docbook/common/ChangeLog branches/jsxe2/buildlib/docbook/common/af.xml branches/jsxe2/buildlib/docbook/common/ar.xml branches/jsxe2/buildlib/docbook/common/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/common/bg.xml branches/jsxe2/buildlib/docbook/common/bn.xml branches/jsxe2/buildlib/docbook/common/bs.xml branches/jsxe2/buildlib/docbook/common/ca.xml branches/jsxe2/buildlib/docbook/common/common.xsl branches/jsxe2/buildlib/docbook/common/cs.xml branches/jsxe2/buildlib/docbook/common/da.xml branches/jsxe2/buildlib/docbook/common/de.xml branches/jsxe2/buildlib/docbook/common/el.xml branches/jsxe2/buildlib/docbook/common/en.xml branches/jsxe2/buildlib/docbook/common/es.xml branches/jsxe2/buildlib/docbook/common/et.xml branches/jsxe2/buildlib/docbook/common/eu.xml branches/jsxe2/buildlib/docbook/common/fa.xml branches/jsxe2/buildlib/docbook/common/fi.xml branches/jsxe2/buildlib/docbook/common/fr.xml branches/jsxe2/buildlib/docbook/common/gentext.xsl branches/jsxe2/buildlib/docbook/common/he.xml branches/jsxe2/buildlib/docbook/common/hr.xml branches/jsxe2/buildlib/docbook/common/hu.xml branches/jsxe2/buildlib/docbook/common/id.xml branches/jsxe2/buildlib/docbook/common/it.xml branches/jsxe2/buildlib/docbook/common/ja.xml branches/jsxe2/buildlib/docbook/common/ko.xml branches/jsxe2/buildlib/docbook/common/l10n.dtd branches/jsxe2/buildlib/docbook/common/l10n.xml branches/jsxe2/buildlib/docbook/common/l10n.xsl branches/jsxe2/buildlib/docbook/common/la.xml branches/jsxe2/buildlib/docbook/common/labels.xsl branches/jsxe2/buildlib/docbook/common/lt.xml branches/jsxe2/buildlib/docbook/common/nl.xml branches/jsxe2/buildlib/docbook/common/nn.xml branches/jsxe2/buildlib/docbook/common/no.xml branches/jsxe2/buildlib/docbook/common/olink.xsl branches/jsxe2/buildlib/docbook/common/pi.xsl branches/jsxe2/buildlib/docbook/common/pl.xml branches/jsxe2/buildlib/docbook/common/pt.xml branches/jsxe2/buildlib/docbook/common/pt_br.xml branches/jsxe2/buildlib/docbook/common/ro.xml branches/jsxe2/buildlib/docbook/common/ru.xml branches/jsxe2/buildlib/docbook/common/sk.xml branches/jsxe2/buildlib/docbook/common/sl.xml branches/jsxe2/buildlib/docbook/common/sr.xml branches/jsxe2/buildlib/docbook/common/sr_Latn.xml branches/jsxe2/buildlib/docbook/common/subtitles.xsl branches/jsxe2/buildlib/docbook/common/sv.xml branches/jsxe2/buildlib/docbook/common/table.xsl branches/jsxe2/buildlib/docbook/common/targetdatabase.dtd branches/jsxe2/buildlib/docbook/common/targets.xsl branches/jsxe2/buildlib/docbook/common/th.xml branches/jsxe2/buildlib/docbook/common/titles.xsl branches/jsxe2/buildlib/docbook/common/tr.xml branches/jsxe2/buildlib/docbook/common/uk.xml branches/jsxe2/buildlib/docbook/common/vi.xml branches/jsxe2/buildlib/docbook/common/xh.xml branches/jsxe2/buildlib/docbook/common/zh_cn.xml branches/jsxe2/buildlib/docbook/common/zh_tw.xml branches/jsxe2/buildlib/docbook/dtd/ branches/jsxe2/buildlib/docbook/dtd/calstblx.dtd branches/jsxe2/buildlib/docbook/dtd/catalog branches/jsxe2/buildlib/docbook/dtd/catalog.xml branches/jsxe2/buildlib/docbook/dtd/dbcentx.mod branches/jsxe2/buildlib/docbook/dtd/dbgenent.mod branches/jsxe2/buildlib/docbook/dtd/dbhierx.mod branches/jsxe2/buildlib/docbook/dtd/dbnotnx.mod branches/jsxe2/buildlib/docbook/dtd/dbpoolx.mod branches/jsxe2/buildlib/docbook/dtd/docbookx.dtd branches/jsxe2/buildlib/docbook/dtd/ent/ branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsa.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsb.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsc.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsn.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamso.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOamsr.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISObox.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOcyr1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOcyr2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOdia.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk3.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOgrk4.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOlat1.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOlat2.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOnum.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOpub.ent branches/jsxe2/buildlib/docbook/dtd/ent/ISOtech.ent branches/jsxe2/buildlib/docbook/dtd/ent/catalog branches/jsxe2/buildlib/docbook/dtd/ent/catalog.xml branches/jsxe2/buildlib/docbook/dtd/htmltblx.mod branches/jsxe2/buildlib/docbook/dtd/soextblx.dtd branches/jsxe2/buildlib/docbook/fo/ branches/jsxe2/buildlib/docbook/fo/ChangeLog branches/jsxe2/buildlib/docbook/fo/admon.xsl branches/jsxe2/buildlib/docbook/fo/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/fo/autoidx.xsl branches/jsxe2/buildlib/docbook/fo/autotoc.xsl branches/jsxe2/buildlib/docbook/fo/axf.xsl branches/jsxe2/buildlib/docbook/fo/biblio.xsl branches/jsxe2/buildlib/docbook/fo/block.xsl branches/jsxe2/buildlib/docbook/fo/callout.xsl branches/jsxe2/buildlib/docbook/fo/component.xsl branches/jsxe2/buildlib/docbook/fo/division.xsl branches/jsxe2/buildlib/docbook/fo/docbook.xsl branches/jsxe2/buildlib/docbook/fo/docbookng.xsl branches/jsxe2/buildlib/docbook/fo/ebnf.xsl branches/jsxe2/buildlib/docbook/fo/fo-patch-for-fop.xsl branches/jsxe2/buildlib/docbook/fo/fo-rtf.xsl branches/jsxe2/buildlib/docbook/fo/fo.xsl branches/jsxe2/buildlib/docbook/fo/footnote.xsl branches/jsxe2/buildlib/docbook/fo/fop.xsl branches/jsxe2/buildlib/docbook/fo/formal.xsl branches/jsxe2/buildlib/docbook/fo/glossary.xsl branches/jsxe2/buildlib/docbook/fo/graphics.xsl branches/jsxe2/buildlib/docbook/fo/htmltbl.xsl branches/jsxe2/buildlib/docbook/fo/index.xsl branches/jsxe2/buildlib/docbook/fo/info.xsl branches/jsxe2/buildlib/docbook/fo/inline.xsl branches/jsxe2/buildlib/docbook/fo/keywords.xsl branches/jsxe2/buildlib/docbook/fo/lists.xsl branches/jsxe2/buildlib/docbook/fo/math.xsl branches/jsxe2/buildlib/docbook/fo/pagesetup.xsl branches/jsxe2/buildlib/docbook/fo/param.ent branches/jsxe2/buildlib/docbook/fo/param.xml branches/jsxe2/buildlib/docbook/fo/param.xsl branches/jsxe2/buildlib/docbook/fo/param.xweb branches/jsxe2/buildlib/docbook/fo/passivetex.xsl branches/jsxe2/buildlib/docbook/fo/pdf2index branches/jsxe2/buildlib/docbook/fo/pi.xsl branches/jsxe2/buildlib/docbook/fo/profile-docbook.xsl branches/jsxe2/buildlib/docbook/fo/qandaset.xsl branches/jsxe2/buildlib/docbook/fo/refentry.xsl branches/jsxe2/buildlib/docbook/fo/sections.xsl branches/jsxe2/buildlib/docbook/fo/synop.xsl branches/jsxe2/buildlib/docbook/fo/table.xsl branches/jsxe2/buildlib/docbook/fo/task.xsl branches/jsxe2/buildlib/docbook/fo/titlepage.templates.xml branches/jsxe2/buildlib/docbook/fo/titlepage.templates.xsl branches/jsxe2/buildlib/docbook/fo/titlepage.xsl branches/jsxe2/buildlib/docbook/fo/toc.xsl branches/jsxe2/buildlib/docbook/fo/verbatim.xsl branches/jsxe2/buildlib/docbook/fo/xep.xsl branches/jsxe2/buildlib/docbook/fo/xref.xsl branches/jsxe2/buildlib/docbook/html/ branches/jsxe2/buildlib/docbook/html/ChangeLog branches/jsxe2/buildlib/docbook/html/admon.xsl branches/jsxe2/buildlib/docbook/html/autoidx-ng.xsl branches/jsxe2/buildlib/docbook/html/autoidx.xsl branches/jsxe2/buildlib/docbook/html/autotoc.xsl branches/jsxe2/buildlib/docbook/html/biblio.xsl branches/jsxe2/buildlib/docbook/html/block.xsl branches/jsxe2/buildlib/docbook/html/callout.xsl branches/jsxe2/buildlib/docbook/html/changebars.xsl branches/jsxe2/buildlib/docbook/html/chunk-code.xsl branches/jsxe2/buildlib/docbook/html/chunk-common.xsl branches/jsxe2/buildlib/docbook/html/chunk.xsl branches/jsxe2/buildlib/docbook/html/chunker.xsl branches/jsxe2/buildlib/docbook/html/chunkfast.xsl branches/jsxe2/buildlib/docbook/html/chunktoc.xsl branches/jsxe2/buildlib/docbook/html/component.xsl branches/jsxe2/buildlib/docbook/html/division.xsl branches/jsxe2/buildlib/docbook/html/docbook.xsl branches/jsxe2/buildlib/docbook/html/docbookng.xsl branches/jsxe2/buildlib/docbook/html/ebnf.xsl branches/jsxe2/buildlib/docbook/html/footnote.xsl branches/jsxe2/buildlib/docbook/html/formal.xsl branches/jsxe2/buildlib/docbook/html/glossary.xsl branches/jsxe2/buildlib/docbook/html/graphics.xsl branches/jsxe2/buildlib/docbook/html/html-rtf.xsl branches/jsxe2/buildlib/docbook/html/html.xsl branches/jsxe2/buildlib/docbook/html/htmltbl.xsl branches/jsxe2/buildlib/docbook/html/index.xsl branches/jsxe2/buildlib/docbook/html/info.xsl branches/jsxe2/buildlib/docbook/html/inline.xsl branches/jsxe2/buildlib/docbook/html/keywords.xsl branches/jsxe2/buildlib/docbook/html/lists.xsl branches/jsxe2/buildlib/docbook/html/maketoc.xsl branches/jsxe2/buildlib/docbook/html/manifest.xsl branches/jsxe2/buildlib/docbook/html/math.xsl branches/jsxe2/buildlib/docbook/html/oldchunker.xsl branches/jsxe2/buildlib/docbook/html/onechunk.xsl branches/jsxe2/buildlib/docbook/html/param.ent branches/jsxe2/buildlib/docbook/html/param.xml branches/jsxe2/buildlib/docbook/html/param.xsl branches/jsxe2/buildlib/docbook/html/param.xweb branches/jsxe2/buildlib/docbook/html/pi.xsl branches/jsxe2/buildlib/docbook/html/profile-chunk-code.xsl branches/jsxe2/buildlib/docbook/html/profile-chunk.xsl branches/jsxe2/buildlib/docbook/html/profile-docbook.xsl branches/jsxe2/buildlib/docbook/html/profile-onechunk.xsl branches/jsxe2/buildlib/docbook/html/qandaset.xsl branches/jsxe2/buildlib/docbook/html/refentry.xsl branches/jsxe2/buildlib/docbook/html/sections.xsl branches/jsxe2/buildlib/docbook/html/synop.xsl branches/jsxe2/buildlib/docbook/html/table.xsl branches/jsxe2/buildlib/docbook/html/task.xsl branches/jsxe2/buildlib/docbook/html/titlepage.templates.xml branches/jsxe2/buildlib/docbook/html/titlepage.templates.xsl branches/jsxe2/buildlib/docbook/html/titlepage.xsl branches/jsxe2/buildlib/docbook/html/toc.xsl branches/jsxe2/buildlib/docbook/html/verbatim.xsl branches/jsxe2/buildlib/docbook/html/xref.xsl branches/jsxe2/buildlib/docbook/lib/ branches/jsxe2/buildlib/docbook/lib/ChangeLog branches/jsxe2/buildlib/docbook/lib/lib.xml branches/jsxe2/buildlib/docbook/lib/lib.xsl branches/jsxe2/buildlib/docbook/lib/lib.xweb branches/jsxe2/buildlib/jsmoothgen-ant.jar branches/jsxe2/buildlib/skeletons/ branches/jsxe2/doc/manual/ branches/jsxe2/doc/manual/manual.xml branches/jsxe2/installer/done-HalfAnOS.html branches/jsxe2/installer/done-MacOS.html branches/jsxe2/installer/done-Unix.html branches/jsxe2/installer/done-VMS.html branches/jsxe2/installer/done-Windows.html branches/jsxe2/installer/gpl.html branches/jsxe2/installer/jsxe-installer.ico branches/jsxe2/installer/jsxe.desktop branches/jsxe2/installer/jsxe.png branches/jsxe2/installer/launch4j.xml branches/jsxe2/installer/readme.html branches/jsxe2/installer/src/ branches/jsxe2/installer/src/installer/ branches/jsxe2/installer/src/installer/BZip2Constants.java branches/jsxe2/installer/src/installer/CBZip2InputStream.java branches/jsxe2/installer/src/installer/CBZip2OutputStream.java branches/jsxe2/installer/src/installer/CRC.java branches/jsxe2/installer/src/installer/ConsoleInstall.java branches/jsxe2/installer/src/installer/ConsoleProgress.java branches/jsxe2/installer/src/installer/Install.java branches/jsxe2/installer/src/installer/InstallThread.java branches/jsxe2/installer/src/installer/InvalidHeaderException.java branches/jsxe2/installer/src/installer/NonInteractiveInstall.java branches/jsxe2/installer/src/installer/OperatingSystem.java branches/jsxe2/installer/src/installer/Progress.java branches/jsxe2/installer/src/installer/SwingInstall.java branches/jsxe2/installer/src/installer/TarBuffer.java branches/jsxe2/installer/src/installer/TarEntry.java branches/jsxe2/installer/src/installer/TarHeader.java branches/jsxe2/installer/src/installer/TarInputStream.java branches/jsxe2/installer/src/installer/TarOutputStream.java branches/jsxe2/installer/src/installer/VariableGridLayout.java branches/jsxe2/jsXe.jsmooth branches/jsxe2/messages/messages branches/jsxe2/messages/messages.de branches/jsxe2/messages/messages.ja branches/jsxe2/messages/messages.sv branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/InsertEdit.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodeNameChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodePrefixChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/NodeValueChange.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/RemoveEdit.java branches/jsxe2/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpIndex.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpSearchPanel.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpTOCPanel.java branches/jsxe2/src/net/sourceforge/jsxe/help/HelpViewer.java Modified: branches/jsxe2/AUTHORS =================================================================== --- branches/jsxe2/AUTHORS 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/AUTHORS 2006-09-05 15:47:51 UTC (rev 1235) @@ -4,7 +4,7 @@ Translators: German (de) - Bianca Schoen Swedish (sv) - Patrik Johansson <pa...@it...> + Russian (ru) - Alexandr Gridnev <ale...@ya...> Past Contributers:\n\ Aaron Flatten <afl...@us...> - Bilel Remmache <rb...@us...> - SVM <svm...@us...> + Bilel Remmache <rb...@us...> \ No newline at end of file Modified: branches/jsxe2/Changelog =================================================================== --- branches/jsxe2/Changelog 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/Changelog 2006-09-05 15:47:51 UTC (rev 1235) @@ -1,10 +1,82 @@ +08/31/2006 Ian Lewis <Ian...@me...> + + * Added new ContextSpecificActions to replace ViewSpecificActions. Now + actions such as cut and paste can be registered for specific components + not just a specific view. + +08/29/2006 Ian Lewis <Ian...@me...> + + * Fixed a memory leak with JMenuItems. ActionManager kept a cache of + Wrapper Action objects. JMenu items register listeners with those Actions + so the JMenuItems would never be Garbage collected. + * Fixed that the Find action had Ctrl-v as the default shortcut. Changed it + to Ctrl-f + +08/28/2006 Ian Lewis <Ian...@me...> + + * Changed the messages files to be named the standard ResourceBundle way. + * Fixed default key binding for exit. + * Added some new processing for generating jsXe's manual. + +08/27/2006 Ian Lewis <Ian...@me...> + + * Updated the launch4j script to set the absolute path of the lib directory + in the jre option to set the endorsed dirs. This will allow jsXe to be + launched from anywhere and still be able to find the right version of + Xerces. + * Updated the installer to create a script file in unix that uses the java + in the environment path and use the HotSpot server so that jsXe runs + faster at the cost of startup time and memory footprint. + * Added an option to display the full path to a file in the recent files + menu. Feature Request #1546371 + +08/21/2006 Ian Lewis <Ian...@me...> + + * Updated russian translation. + +08/18/2006 Ian Lewis <Ian...@me...> + + * Added a hack to disable view specific actions that aren't implemented by + the view. + +08/17/2006 Ian Lewis <Ian...@me...> + + * Updated the German translation thanks to Dieter Steiner + +08/12/2006 Ian Lewis <Ian...@me...> + + * Added support for running jsXe in a wrapped exe using launch4j. + * Added an installer for jsXe. The installer can be packaged in an exe for + easy use by windows users. + * Moved the windows integration into it's own component in the installer so + that it won't be installed on systems other than Windows. + +08/09/2006 Ian Lewis <Ian...@me...> + + * Added a new option to the Global Options dialog for the number of undo + operations to remember. + +08/08/2006 Ian Lewis <Ian...@me...> + + * Added undo/redo support for attributes. + 08/07/2006 Ian Lewis <Ian...@me...> + * Added temporary support for undo to jsXe. + * Added support for undo of text insert and delete. + * Added support for undo of changes to a node's name, value, and prefix. * Removed get/setStringProperty methods from XMLDocument since they aren't needed +08/05/2006 Ian Lewis <Ian...@me...> + + * Added core support for Undo/Redo. Undo/Redo will temporarily be view + specific. Eventually it will be entirely part of core after the + new data model is complete. + 08/03/2006 Ian Lewis <Ian...@me...> + * Added Russian translation thanks to Alexandr Gridnev. * More porting of jEdit's VFS classes to jsXe 07/29/2006 Ian Lewis <Ian...@me...> Modified: branches/jsxe2/INSTALL =================================================================== --- branches/jsxe2/INSTALL 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/INSTALL 2006-09-05 15:47:51 UTC (rev 1235) @@ -1,7 +1,9 @@ REQUIREMENTS -Java 1.4.2 -Xerces 2.6.2 +Java >= 1.4.2 +Xerces >= 2.8.0 +Xalan >= 2.7.0 (for building jsXe's documentation) +launch4j >= 3.0.0pre1 (for building the installer from source) GETTING jsXe @@ -13,17 +15,32 @@ Once you have the source trees for both of these you should put them in a directory called 'jars' in your jsXe root folder. Once they are in that folder, the ant targets (compile, bin, src, etc.) will recognise those plugins and build -them if necessary. So something like this should do it: +them if necessary. -cvs checkout jsxe +You should check out jsxe to make a structure like this. This ensures that +when compiling jsXe the other views and will be compiled as well. It also +ensures that you can build jsxe's installer in binary release distributions. + +jsxe module => jsxe/ +treeview module (optional) => jsxe/jars/treeview +sourceview module (optional) => jsxe/jars/sourceview +jsxe installer (optional) => jsxe/installer +jsxe web module (optional) => web/ +launch4j (needed for win builds) => buildlib/launch4j + +So something like this should do it: + +svn checkout https://svn.sourceforge.net/svnroot/jsxe/trunk/jsxe cd jsxe mkdir jars cd jars -cvs checkout treeview -cvs checkout sourceview +svn checkout https://svn.sourceforge.net/svnroot/jsxe/trunk/treeview +svn checkout https://svn.sourceforge.net/svnroot/jsxe/trunk/sourceview BUILDING jsXe FROM SOURCE +** Requirements ** + This is pretty simple. You will need jakarta ANT and a Sun's javac compiler (others might work, I just haven't tested them). You will need the optional ant tasks installed as well. On some Linux distributions this may be a separate @@ -34,32 +51,56 @@ Xerces (A Xerces 2.8.0 binary distribution is not included in the CVS source tree. You can aquire it at at http://xml.apache.org/) The jar files xercesImpl.jar, xml-apis.jar, and resolver.jar from the 2.8.0 distribution are -required. These should be placed in a directory called lib in jsXe's root folder -(where you installed jsXe's source) or in the jre/lib/ext or lib/ext in your -JVM. These jar files will be included with jsXe distributions for convenience. +required. These should already be in a directory called lib in jsXe's root folder +(where you installed jsXe's source) but you will need to copy them in +the jre/lib/endorsed directory in your JVM. You will also need to put the +xalan.jar in the jre/lib/endorsed directory in order to build jsXe's +documentation. xalan.jar is not currently included with jsXe so you need to +download it from http://xml.apache.org/ -Simply typing 'ant' in jsXe's root directory will give you the +In order to build jsXe's installer or a windows distribution of jsXe you will +need to install launch4j (http://launch4j.sourceforge.net/). You can install it +in the buildlib directory or change the launch4j.dir property in the build.xml +file. You will also need to put the js.jar and bsf.jar in your classpath. These +files are found in the 'buildlib' directory. They are used in scripts for +calculating file sizes. + +** Building ** + +Simply typing 'ant -p' in jsXe's root directory will give you the available targets to use with ant. To just simply compile jsXe and the default views to a jar file you can type 'ant compile'. To build a binary distribution you will need to run the 'bin' target in the build.xml file. I do this by simply typing 'ant bin'. Source distributions can be built using the 'src' target by typing 'ant src'. +You can build jsXe's installer by running 'ant build-installer' which will +build jsXe's installer. The installer will be packaged in a jar file to be run +by java. + +You can build a windows distribution of jsXe by running the 'ant win'. This will +compile jsXe's installer and wrap it in an exe wrapper. The wrapper will search +for the appropriate java runtime with which to run jsXe. + INSTALLING jsXe Unpack the distribution file wherever you like. Normally you would install it in C:\Program Files\ or /usr/local/share/ or something like that. +Or + +Run the install program and follow the prompts to install jsXe. + RUNNING jsXe -You should have 1.4.2 or better of java and you need 2.6.2 of Xerces. +You should have 1.4.2 or better of java and you need 2.8.0 of Xerces. *Windows* Just run jsXe using the jsXe.exe in the install directory. The exe will detect your version of Java and run jsXe using that version. -*Unix* +*Unix/Linux* To run jsXe you should just run the java interpreter on the jsXe.jar file. There is a shell script or batch file included in the source tree for this purpose. Modified: branches/jsxe2/README =================================================================== --- branches/jsxe2/README 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/README 2006-09-05 15:47:51 UTC (rev 1235) @@ -7,3 +7,22 @@ way of creating XML documents. It is geared towards simpler XML documents but will (eventually) be able to handle any XML document. Visit http://jsxe.sourceforge.net/ to learn more about this project. + +jsXe bundles the following libraries: + +- Xerces Java 2.8.0 is a XML parsing library released by the Apache foundation. + This library is released under the Apache license, which can be found at + http://www.apache.org/licenses/LICENSE-2.0 + +The jsXe installer bundles the following libraries: + +- org.apache.excalibur.bzip2 compression library. This library is + released under the Apache license, which can be found at + http://www.apache.org/licenses/LICENSE-2.0 + + The org.apache.excalibur.bzip2 web site is + <http://jakarta.apache.org/avalon/excalibur/bzip2/>. + +- com.ice.tar, by Tim Endres. This code is in the public domain. + + The com.ice.tar web site is <http://www.trustice.com/java/tar/>. \ No newline at end of file Modified: branches/jsxe2/bin/jsXe.bat =================================================================== --- branches/jsxe2/bin/jsXe.bat 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/bin/jsXe.bat 2006-09-05 15:47:51 UTC (rev 1235) @@ -1,7 +1,7 @@ @ECHO OFF set JSXEDIR=. -set CLASSPATH=%JSXEDIR%/jsXe.jar;%JSXEDIR%/lib/xml-apis.jar;%JSXEDIR%/lib/xercesImpl.jar;%JSXEDIR%/lib/resolver.jar -set JSXE=net.sourceforge.jsxe.jsXe +rem set CLASSPATH=%JSXEDIR%/jsXe.jar;%JSXEDIR%/lib/xml-apis.jar;%JSXEDIR%/lib/xercesImpl.jar;%JSXEDIR%/lib/resolver.jar +rem set JSXE=net.sourceforge.jsxe.jsXe set JAVA_HEAP_SIZE=32 -java -mx%JAVA_HEAP_SIZE%m -cp %CLASSPATH% %JSXE% %1 %2 %3 %4 %5 %6 %7 %8 %9 -if errorlevel 1 pause +javaw -server -mx%JAVA_HEAP_SIZE%m -Djava.endorsed.dirs=%JSXEDIR%/lib -jar %JSXEDIR%/jsXe.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 +if errorlevel 1 pause \ No newline at end of file Modified: branches/jsxe2/bin/jsXe.sh =================================================================== --- branches/jsxe2/bin/jsXe.sh 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/bin/jsXe.sh 2006-09-05 15:47:51 UTC (rev 1235) @@ -1,6 +1,5 @@ #!/bin/sh +# Java heap size, in megabytes JSXEDIR=. -CLASSPATH=$JSXEDIR/jsXe.jar:$JSXEDIR/lib/xml-apis.jar:$JSXEDIR/lib/xercesImpl.jar:$JSXEDIR/lib/resolver.jar -JSXE=net.sourceforge.jsxe.jsXe JAVA_HEAP_SIZE=32 -exec java -mx${JAVA_HEAP_SIZE}m -cp $CLASSPATH $JSXE $@ +exec java -server -mx${JAVA_HEAP_SIZE}m -Djava.endorsed.dirs=${JSXEDIR}/lib ${JSXE} -jar ${JSXEDIR}/jsXe.jar $@ \ No newline at end of file Modified: branches/jsxe2/build.xml =================================================================== --- branches/jsxe2/build.xml 2006-09-05 15:47:20 UTC (rev 1234) +++ branches/jsxe2/build.xml 2006-09-05 15:47:51 UTC (rev 1235) @@ -7,23 +7,38 @@ Version: $Id$ You should check out jsxe to make a structure like this. This ensures that - when compiling jsXe the other views will be compiled as well. + when compiling jsXe the other views and will be compiled as well. It also + ensures that you can build jsxe's installer in binary release distributions. jsxe module => jsxe/ treeview module (optional) => jsxe/jars/treeview sourceview module (optional) => jsxe/jars/sourceview + jsxe installer (optional) => jsxe/installer jsxe web module (optional) => web/ - jsmooth ant task (optional) => buildlib/ + launch4j (needed for win builds) => buildlib/launch4j --> -<project basedir="." default="usage" name="jsXe"> +<project basedir="." default="compile" name="jsXe"> <description>jsXe - Java Simple XML Editor</description> <!-- {{{ ============ Initializes properties and variables ============= --> <target name="init"> <tstamp/> + <!-- {{{ app/build properties --> <property name="app.name" value="jsXe"/> + <property name="main.class" value="net.sourceforge.jsxe.jsXe"/> + <property name="major.version" value="0"/> + <property name="minor.version" value="5"/> + <property name="beta.version" value="4"/> + <property name="bugfix.version" value="0"/> + <property name="date.format" value="MM.dd.yyyy HH:mm:ss z"/> + <!-- Human Readable --> + <property name="app.version" value="0.5 pre4"/> + <!-- Used in filenames --> + <property name="app_version" value="05_pre4"/> + <!-- }}} --> + <!-- {{{ build directories --> <property name="root.dir" value="."/> <property name="build.dir" value="${root.dir}/build"/> <property name="src.dir" value="${root.dir}/src"/> @@ -31,47 +46,120 @@ <property name="bin.dir" value="${root.dir}/bin"/> <property name="messages.dir" value="${root.dir}/messages"/> <property name="build.messages" value="${build.dir}/messages"/> - <property name="docs.dir" value="${src.dir}/doc"/> + <property name="docs.dir" value="${root.dir}/doc"/> <property name="plugin.dir" value="${root.dir}/jars"/> + <property name="jsxe.jar" value="${build.dir}/${app.name}.jar"/> + <!-- jar file needs to be relative to the exe --> + <property name="launch4j.jsxe.jar" value="${app.name}.jar"/> + <property name="jsxe.exe" value="${build.dir}/${app.name}.exe"/> + <!-- launch4j doesn't like the ./ in the front of the path --> + <property name="launch4j.jsxe.exe" value="build/${app.name}.exe"/> <property name="build.plugin" value="${build.dir}/jars"/> <property name="build.src" value="${build.dir}/src"/> <property name="build.dest" value="${build.dir}/classes"/> <property name="build.docs" value="${build.dir}/doc"/> <property name="build.lib" value="${build.dir}/lib"/> <property name="build.bin" value="${build.dir}/bin"/> - <property name="date.format" value="MM.dd.yyyy HH:mm:ss z"/> - <property name="build.javadocs" value="${build.docs}/api"/> + <property name="build.javadocs" value="${build.dir}/api"/> <property name="build.help" value="${build.docs}/help"/> + <property name="buildlib.dir" value="${root.dir}/buildlib"/> + <property name="docbook.dir" value="${buildlib.dir}/docbook"/> + <!--<property name="app.version" value="${major.version}.${minor.version} beta"/>--> + <!--<property name="app_version" value="${major.version}_${minor.version}beta"/>--> + <property name="distbin.dir" value="${build.dir}/${app.name}-${app_version}-bin"/> + <property name="distsrc.dir" value="${build.dir}/${app.name}-${app_version}-src"/> + <property name="launch4j.dir" value="${buildlib.dir}/launch4j"/> + <property name="launch4j.config" value="${root.dir}/launch4j.xml"/> + <property name="launch4j.classpath" value="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar"/> + <!-- }}} --> + <!-- {{{ installer directories --> + <property name="installer.build.dir" value="${build.dir}/installer"/> + <property name="installer.program.dir" value="${installer.build.dir}/program"/> + <property name="installer.api.dir" value="${installer.build.dir}/api"/> + <property name="installer.treeview.dir" value="${installer.build.dir}/treeview"/> + <property name="installer.sourceview.dir" value="${installer.build.dir}/sourceview"/> + <property name="installer.win.dir" value="${installer.build.dir}/win"/> + <property name="installer.gnome.dir" value="${installer.build.dir}/gnome"/> + <property name="installer.build.src" value="${installer.build.dir}/src"/> + <property name="installer.build.dest" value="${installer.build.dir}/build"/> + <property name="install.props" value="${installer.build.dest}/installer/install.props"/> + <property name="installer.dir" value="${root.dir}/installer"/> + <property name="installer.launch4j.config" value="${installer.dir}/launch4j.xml"/> + <!-- launch4j doesn't like the ./ in the front of the path --> + <property name="installer.jar" value="build/${app.name}-${app_version}-install.jar"/> + <property name="installer.exe" value="build/${app.name}-${app_version}-install.exe"/> + <!-- }}} --> + <!-- {{{ installer props --> + <property name="installer.main.class" value="installer.Install"/> + + <!-- files listed here are in the ${installer.dir} directory --> + <!-- TODO: labels should be put into a locale specific messages file --> + <property name="app.readme" value="readme.html"/> + <property name="app.license.title" value="GNU General Public License"/> + <property name="app.license" value="gpl.html"/> + <property name="ostask.unix-script.label" value="Install shortcut in:"/> + <property name="ostask.unix-man.label" value="Install manual page in:"/> + <property name="ostask.unix-desktop.label" value="Install desktop launchers in:"/> + <property name="ostask.unix-desktop.shortcut" value="jsxe.desktop"/> + <property name="ostask.unix-desktop.pixmap" value="jsxe.png"/> + + <!--<property name="ostask.unix-man.manpage" value="jsxe.1"/>--> + <property name="comp.count" value="5"/> + + <property name="comp.0.name" value="jsXe XML Editor"/> + <!-- size values are set by the filesize task in the + build-installer task --> + <!--<property name="comp.0.disk-size" value="7084"/> + <property name="comp.0.real-size" value="6073"/>--> + <property name="comp.0.fileset" value="jsxe-program"/> + <property name="installer.build.program.tar" value="${installer.build.dest}/installer/${comp.0.fileset}.tar.bz2"/> + + <property name="comp.1.name" value="Tree view (highly recommended)"/> + <!-- size values are set by the filesize task in the + build-installer task --> + <!--<property name="comp.1.disk-size" value="7084"/> + <property name="comp.1.real-size" value="6073"/>--> + <property name="comp.1.fileset" value="jsxe-treeview"/> + <property name="installer.build.treeview.tar" value="${installer.build.dest}/installer/${comp.1.fileset}.tar.bz2"/> + + <property name="comp.2.name" value="Source view (highly recommended)"/> + <!-- size values are set by the filesize task in the + build-installer task --> + <!--<property name="comp.2.disk-size" value="7084"/> + <property name="comp.2.real-size" value="6073"/>--> + <property name="comp.2.fileset" value="jsxe-sourceview"/> + <property name="installer.build.sourceview.tar" value="${installer.build.dest}/installer/${comp.2.fileset}.tar.bz2"/> + + <property name="comp.3.name" value="API documentation (for plugin development)"/> + <!-- size values are set by the filesize task in the + build-installer task --> + <!--<property name="comp.3.disk-size" value="7084"/> + <property name="comp.3.real-size" value="6073"/>--> + <property name="comp.3.fileset" value="jsxe-api"/> + <property name="installer.build.api.tar" value="${installer.build.dest}/installer/${comp.3.fileset}.tar.bz2"/> + + <property name="comp.4.name" value="Windows Integration (highly recommended)"/> + <!-- size values are set by the filesize task in the + build-installer task --> + <!--<property name="comp.4.disk-size" value="7084"/> + <property name="comp.4.real-size" value="6073"/>--> + <property name="comp.4.fileset" value="jsxe-win"/> + <property name="comp.4.os" value="Windows"/> + <property name="installer.build.win.tar" value="${installer.build.dest}/installer/${comp.4.fileset}.tar.bz2"/> + <!-- }}} --> + <!-- {{{ java build properties --> <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> <property name="javac.deprecation" value="on"/> <property name="javac.include.runtime" value="no"/> <property name="javac.source" value="1.3"/> + <!-- }}} --> + <!-- {{{ doc properties --> <property name="java.javadoc.link" value="http://java.sun.com/j2se/1.3/docs/api/"/> <property name="xerces.javadoc.link" value="http://xerces.apache.org/xerces2-j/javadocs/api/"/> - <property name="main.class" value="net.sourceforge.jsxe.jsXe"/> - <property name="major.version" value="0"/> - <property name="minor.version" value="5"/> - <property name="beta.version" value="3"/> - <property name="bugfix.version" value="0"/> - <!-- Human Readable --> - <property name="app.version" value="0.5 pre3"/> - <!-- Used in filenames --> - <property name="app_version" value="05_pre3"/> + <!-- }}} --> - <property name="buildlib.dir" value="${root.dir}/buildlib"/> - <property name="jsmooth.project" value="${root.dir}/jsXe.jsmooth"/> - <property name="jsmooth.jar" value="${buildlib.dir}/jsmoothgen-ant.jar"/> - - <condition property="windows.build"> - <and> - <os family="windows"/> - <available file="${jsmooth.jar}" property="jsmooth.avail"/> - </and> - </condition> - - <property name="distbin.dir" value="${build.dir}/${app.name}-${app_version}-bin"/> - <property name="distsrc.dir" value="${build.dir}/${app.name}-${app_version}-src"/> + <!-- {{{ classpaths --> <path id="classpath"> <pathelement location="."/> <pathelement location="${build.dest}"/> @@ -83,38 +171,41 @@ </path> <path id="run-classpath"> - <pathelement location="${build.dir}/${app.name}.jar"/> + <pathelement location="${jsxe.jar}"/> <fileset dir="${lib.dir}"> <include name="**/*.jar"/> </fileset> </path> + <!-- }}} --> + <!-- {{{ conditionals --> + <!-- set whether we have the source for the default views --> + + <available file="${root.dir}/../web" property="web.avail"/> + <available file="${plugin.dir}" property="plugin.avail"/> <available file="${plugin.dir}/treeview/build.xml" property="treeview.avail"/> <available file="${plugin.dir}/sourceview/build.xml" property="sourceview.avail"/> - <available file="${root.dir}/../web" property="web.avail"/> - <available file="${plugin.dir}" property="plugin.avail"/> + <available file="${launch4j.dir}" property="launch4j.avail"/> + <available classname="org.apache.bsf.BSFException" property="bsf.avail"/> + <available classname="org.mozilla.javascript.JavaScriptException" property="js.avail"/> + <available file="${installer.dir}" property="installer.avail"/> + <!-- }}} --> + + <!-- {{{ catalog used for building docs --> + <xmlcatalog id="docbook-catalog"> + <catalogpath> + <fileset dir="${docbook.dir}" includes="**/catalog.xml"/> + </catalogpath> + </xmlcatalog> + <!-- }}} --> + <echo message="${app.name} ${app.version}"/> <echo message="----------------------------------------------------------"/> </target> <!-- }}} --> - <!-- {{{ ============ Prints the available targets ===================== --> - <target depends="init" name="usage" description="Prints available targets"> - <echo message=" available targets are:"/> - <echo message=""/> - <echo message=" compile --> generates the ${app.name}.jar file."/> - <echo message=" also generates the jars for the tree view"/> - <echo message=" and source view plugins if available."/> - <echo message=" bin --> generates a binary distribution"/> - <echo message=" src --> generates a source distribution"/> - <echo message=" doc --> generates all documentation"/> - <echo message=" also updates the web api if the web module"/> - <echo message=" is available."/> - <echo message=" clean --> cleans everything up"/> - </target> - <!-- }}} --> <!-- {{{ ============ Prepares for any type of build =================== --> <target depends="init" name="prepare"> <mkdir dir="${build.dir}"/> @@ -141,8 +232,7 @@ <include name="**/*.png"/> <!-- files in the source directory to ignore --> - <!--<exclude name="net/sourceforge/jsxe/dom2/**/*"/> - <exclude name="net/sourceforge/jsxe/io/**/*"/>--> + <exclude name="net/sourceforge/jsxe/help/**/*"/> </fileset> </copy> <mkdir dir="${build.plugin}"/> @@ -174,6 +264,7 @@ <classpath refid="classpath"/> <include name="**/*.java"/> </javac> + <copy todir="${build.dest}"> <fileset dir="${build.src}"> <include name="**/*.props"/> @@ -187,6 +278,15 @@ </fileset> </copy> + <!-- copy the lib directory so that the jsXe.exe can be run + from the build dir --> + <mkdir dir="${build.lib}"/> + <copy todir="${build.lib}"> + <fileset dir="${lib.dir}"> + <include name="**/*"/> + </fileset> + </copy> + <!-- set the build properties --> <propertyfile comment="${app.name}'s build properties" file="${build.dest}/net/sourceforge/jsxe/build.properties"> <entry key="application.name" value="${app.name}"/> @@ -207,7 +307,7 @@ </section> </manifest> - <jar jarfile="${build.dir}/${app.name}.jar" manifest="${build.dir}/${app.name}.manifest"> + <jar jarfile="${jsxe.jar}" manifest="${build.dir}/${app.name}.manifest"> <fileset dir="${build.dest}"> <include name="**/*.class"/> <include name="**/properties"/> @@ -249,13 +349,6 @@ <!-- }}} --> <!-- {{{ ============ Prepares for a build ============================= --> <target depends="init" name="prepare-build"> - <!-- lib --> - <mkdir dir="${build.dir}/lib"/> - <copy todir="${build.dir}/lib"> - <fileset dir="${lib.dir}"> - <include name="**/*"/> - </fileset> - </copy> <!-- bin --> <mkdir dir="${build.dir}/bin"/> <copy todir="${build.dir}/bin"> @@ -267,6 +360,14 @@ <!-- }}} --> <!-- {{{ ============ Generates the documentation ====================== --> <target depends="prepare-doc, prepare-src" name="doc" description="Build documentation"> + <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"> + <classpath> + <pathelement location="${buildlib.dir}\fop.jar"/> + <pathelement location="${buildlib.dir}\avalon.jar"/> + <pathelement location="${buildlib.dir}\batik.jar"/> + </classpath> + </taskdef> + <copy file="${root.dir}/COPYING" tofile="${build.docs}/COPYING"/> <copy file="${root.dir}/README" tofile="${build.docs}/README"/> <copy file="${root.dir}/AUTHORS" tofile="${build.docs}/AUTHORS"/> @@ -276,17 +377,363 @@ <copy file="${root.dir}/THANKS" tofile="${build.docs}/THANKS"/> <copy file="${root.dir}/NEWS" tofile="${build.docs}/NEWS"/> + <!-- generate the html manual --> + <!-- + <mkdir dir="${build.docs}/manual"/> + <xslt basedir="${docs.dir}/manual" + destdir="${build.docs}/manual" + includes="**/manual.xml" + style="${docbook.dir}/html/docbook.xsl"> + <outputproperty name="encoding" value="UTF-8"/> + <mapper type="glob" from="*.xml" to="*.html"/> + <xmlcatalog refid="docbook-catalog"/> + </xslt> + --> + + <!-- generate the pdf manual --> + <!-- + <mkdir dir="${build.dir}/manual"/> + <xslt basedir="${docs.dir}/manual" + destdir="${build.dir}/manual" + includes="**/manual.xml" + style="${docbook.dir}/fo/docbook.xsl"> + <outputproperty name="encoding" value="UTF-8"/> + <mapper type="glob" from="*.xml" to="*.fo"/> + <xmlcatalog refid="docbook-catalog"/> + </xslt> + + <fop format="application/pdf" + outdir="${build.dir}" + messagelevel="warn"> + <fileset dir="${build.dir}/manual"> + <include name="*.fo"/> + </fileset> + </fop> + --> + <javadoc author="true" destdir="${build.javadocs}" doctitle="${app.name} ${app.version} API" locale="en_US" packagenames="*" sourcepath="${build.src}" version="true" windowtitle="${app.name} ${app.version} API"> <link href="${java.javadoc.link}"/> <link href="${xerces.javadoc.link}"/> - </javadoc> + </javadoc> - <zip basedir="${build.docs}" includes="api/**" zipfile="${build.dir}/${app.name}-${app_version}-api... [truncated message content] |