jsxe-cvs Mailing List for jsXe (Page 6)
Status: Inactive
Brought to you by:
ian_lewis
Menu
▾
▴
jsxe-cvs — CVS notices for jsXe
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(29) |
Dec
(63) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(4) |
Feb
(23) |
Mar
(19) |
Apr
(102) |
May
(88) |
Jun
(30) |
Jul
(42) |
Aug
(43) |
Sep
(17) |
Oct
(19) |
Nov
(41) |
Dec
(46) |
| 2005 |
Jan
(32) |
Feb
(8) |
Mar
(110) |
Apr
(102) |
May
(139) |
Jun
(45) |
Jul
(5) |
Aug
(1) |
Sep
(9) |
Oct
(30) |
Nov
(18) |
Dec
|
| 2006 |
Jan
(10) |
Feb
(85) |
Mar
(9) |
Apr
(64) |
May
(24) |
Jun
(95) |
Jul
(107) |
Aug
(123) |
Sep
(37) |
Oct
(15) |
Nov
(1) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ian...@us...> - 2006-08-14 04:18:36
|
Revision: 1147 Author: ian_lewis Date: 2006-08-13 21:18:29 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1147&view=rev Log Message: ----------- Fixed xhtml compliance Modified Paths: -------------- trunk/web/htdocs/downloads.php Modified: trunk/web/htdocs/downloads.php =================================================================== --- trunk/web/htdocs/downloads.php 2006-08-13 04:07:13 UTC (rev 1146) +++ trunk/web/htdocs/downloads.php 2006-08-14 04:18:29 UTC (rev 1147) @@ -62,29 +62,30 @@ </li> </ul> - <li><b>0.5 pre2</b> - <ul> - <li><b>Windows</b> - - <p>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.</p> - </li> + </li> + <li><b>0.5 pre2</b> + <ul> + <li><b>Windows</b> - <li><b>Unix/Linux</b> - - <p>To run jsXe you should just run the java interpreter on the - jsXe.jar file. There is a shell script included in the - source tree for this purpose.</p> - - <p>./bin/jsXe.sh</p> - - <p>The shell script should be run in with the jsXe root directory of - as the working directory. You can also edit the JSXEDIR variable in - the shell script to be the directory where you installed jsXe.</p> - </li> - </ul> - </li> + <p>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.</p> + </li> + + <li><b>Unix/Linux</b> + + <p>To run jsXe you should just run the java interpreter on the + jsXe.jar file. There is a shell script included in the + source tree for this purpose.</p> + + <p>./bin/jsXe.sh</p> + + <p>The shell script should be run in with the jsXe root directory of + as the working directory. You can also edit the JSXEDIR variable in + the shell script to be the directory where you installed jsXe.</p> + </li> + </ul> + </li> </ul> <?php include("footer.php") ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-13 04:07:28
|
Revision: 1146 Author: ian_lewis Date: 2006-08-12 21:07:13 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1146&view=rev Log Message: ----------- merge from the 05pre3 branch Modified Paths: -------------- trunk/jsxe/Changelog trunk/jsxe/INSTALL trunk/jsxe/build.xml trunk/jsxe/installer/src/installer/OperatingSystem.java trunk/jsxe/messages/messages.ja Added Paths: ----------- trunk/jsxe/installer/jsxe-installer.ico trunk/jsxe/installer/jsxe.desktop trunk/jsxe/installer/jsxe.png trunk/jsxe/installer/launch4j.xml trunk/jsxe/jsxe.ico trunk/jsxe/launch4j.xml Removed Paths: ------------- trunk/jsxe/buildlib/jsmoothgen-ant.jar trunk/jsxe/buildlib/skeletons/ trunk/jsxe/jsXe.jsmooth Modified: trunk/jsxe/Changelog =================================================================== --- trunk/jsxe/Changelog 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/Changelog 2006-08-13 04:07:13 UTC (rev 1146) @@ -1,3 +1,11 @@ +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 Modified: trunk/jsxe/INSTALL =================================================================== --- trunk/jsxe/INSTALL 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/INSTALL 2006-08-13 04:07:13 UTC (rev 1146) @@ -2,6 +2,7 @@ Java 1.4.2 Xerces 2.8.0 +launch4j (for building the installer from source) GETTING jsXe @@ -13,17 +14,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 @@ -38,13 +54,30 @@ (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. -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 @@ -52,14 +85,14 @@ 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: trunk/jsxe/build.xml =================================================================== --- trunk/jsxe/build.xml 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/build.xml 2006-08-13 04:07:13 UTC (rev 1146) @@ -15,10 +15,10 @@ 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> @@ -48,6 +48,12 @@ <property name="build.messages" value="${build.dir}/messages"/> <property name="docs.dir" value="${src.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"/> @@ -61,8 +67,9 @@ <!--<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="jsmooth.project" value="${root.dir}/jsXe.jsmooth"/> - <property name="jsmooth.jar" value="${buildlib.dir}/jsmoothgen-ant.jar"/> + <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"/> @@ -70,10 +77,16 @@ <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"/> @@ -85,8 +98,12 @@ <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="4"/> + <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 @@ -119,6 +136,15 @@ <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"/> @@ -144,7 +170,7 @@ </path> <path id="run-classpath"> - <pathelement location="${build.dir}/${app.name}.jar"/> + <pathelement location="${jsxe.jar}"/> <fileset dir="${lib.dir}"> <include name="**/*.jar"/> </fileset> @@ -152,13 +178,6 @@ <!-- }}} --> <!-- {{{ conditionals --> - <available file="${jsmooth.jar}" property="jsmooth.avail"/> - <condition property="windows.build"> - <and> - <os family="windows"/> - <istrue value="${jsmooth.avail}"/> - </and> - </condition> <!-- set whether we have the source for the default views --> @@ -166,6 +185,7 @@ <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="${launch4j.dir}" property="launch4j.avail"/> <available classname="org.apache.bsf.BSFException" property="bsf.avail"/> <available classname="org.mozilla.javascript.JavaScriptException" property="js.avail"/> @@ -177,21 +197,6 @@ <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}"/> @@ -247,6 +252,7 @@ <classpath refid="classpath"/> <include name="**/*.java"/> </javac> + <copy todir="${build.dest}"> <fileset dir="${build.src}"> <include name="**/*.props"/> @@ -280,7 +286,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"/> @@ -361,8 +367,9 @@ <!-- {{{ ============ Builds the installer ============================= --> <target depends="compile, prepare-build, doc" name="build-installer" description="Builds the installer"> - <fail unless="js.avail" message="You must have the ${buildlib.dir}/js.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> - <fail unless="bsf.avail" message="You must have the ${buildlib.dir}/bsf.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="js.avail" message="You must have the ${buildlib.dir}/js.jar in your classpath to build the installer. It is located in the ${buildlib.dir} directory. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="bsf.avail" message="You must have the ${buildlib.dir}/bsf.jar in your classpath to build the installer. It is located in the ${buildlib.dir} directory. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="launch4j.avail" message="You must install launch4j in ${launch4j.dir} or change the launch4j.dir property in build.xml"/> <fail unless="treeview.avail" message="You must have the treeview source available to build the installer."/> <fail unless="sourceview.avail" message="You must have the sourceview source available to build the installer."/> @@ -399,7 +406,13 @@ size += file.length(); } - project.setNewProperty(attributes.get("property"), Math.round(size/1024)); + + roundedSize = Math.round(size/1024); + + echo = project.createTask("echo"); + echo.setMessage("Size: "+roundedSize+"Kb"); + echo.perform(); + project.setNewProperty(attributes.get("property"), roundedSize); } ]]> </scriptdef> @@ -422,10 +435,18 @@ <!-- copy html files --> <copy todir="${installer.build.dest}/installer"> <fileset dir="${installer.dir}"> - <include name="**/*.html"/> + <include name="*.html"/> </fileset> </copy> + <!-- copy other files --> + <copy todir="${installer.build.dest}"> + <fileset dir="${installer.dir}"> + <exclude name="*.html"/> + <include name="*"/> + </fileset> + </copy> + <!-- {{{ create the program tar.bz2 file --> <mkdir dir="${installer.program.dir}"/> @@ -448,7 +469,7 @@ </fileset> </copy> - <copy file="${build.dir}/${app.name}.jar" tofile="${installer.program.dir}/${app.name}.jar"/> + <copy file="${jsxe.jar}" todir="${installer.program.dir}"/> <!-- lib --> <mkdir dir="${installer.program.dir}/lib"/> <copy todir="${installer.program.dir}/lib"> @@ -457,9 +478,6 @@ </fileset> </copy> - <!-- create the windows exe --> - <antcall target="build-exe"/> - <!-- create the tar.bz2 for the installer --> <tar basedir="${installer.program.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-program.tar"/> <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-program.tar" destfile="${installer.build.program.tar}"/> @@ -551,6 +569,47 @@ <!-- }}} --> + <!-- {{{ create the win tar.bz2 file --> + + <!-- copy the lib directory so that the jsXe.exe can be run + from the build dir --> + <mkdir dir="${build.dir}/lib"/> + <copy todir="${build.dir}/lib"> + <fileset dir="${build.lib}"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- create the windows exe --> + <taskdef name="launch4j" + classname="net.sf.launch4j.ant.Launch4jTask" + classpath="${launch4j.classpath}"/> + + <launch4j configFile="${launch4j.config}" + outfile="${launch4j.jsxe.exe}" + jarPath="${launch4j.jsxe.jar}" + /> + + <mkdir dir="${installer.win.dir}"/> + <copy file="${jsxe.exe}" todir="${installer.win.dir}" /> + + <tar basedir="${installer.win.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-win.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-win.tar" destfile="${installer.build.win.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-win.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.4.disk-size"> + <fileset dir="${installer.win.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.4.real-size"> + <fileset file="${installer.build.win.tar}"/> + </filesize> + + <!-- }}} --> + <!-- {{{ create the install.props file --> <propertyfile comment="${app.name}'s installer properties" file="${install.props}"> <entry key="app.name" value="${app.name}"/> @@ -559,6 +618,10 @@ <entry key="app.license.title" value="${app.license.title}"/> <entry key="app.license" value="${app.license}"/> <entry key="ostask.unix-script.label" value="${ostask.unix-script.label}"/> + <entry key="ostask.unix-desktop.label" value="${ostask.unix-desktop.label}"/> + <entry key="ostask.unix-desktop.pixmap" value="${ostask.unix-desktop.pixmap}"/> + <entry key="ostask.unix-desktop.shortcut" value="${ostask.unix-desktop.shortcut}"/> + <!--<entry key="ostask.unix-man.label" value="${ostask.unix-man.label}"/>--> <entry key="comp.count" value="${comp.count}"/> <entry key="comp.0.name" value="${comp.0.name}"/> @@ -580,6 +643,13 @@ <entry key="comp.3.disk-size" value="${comp.3.disk-size}"/> <entry key="comp.3.real-size" value="${comp.3.real-size}"/> <entry key="comp.3.fileset" value="${comp.3.fileset}"/> + + <entry key="comp.4.name" value="${comp.4.name}"/> + <entry key="comp.4.disk-size" value="${comp.4.disk-size}"/> + <entry key="comp.4.real-size" value="${comp.4.real-size}"/> + <entry key="comp.4.fileset" value="${comp.4.fileset}"/> + <entry key="comp.4.os" value="${comp.4.os}"/> + </propertyfile> <!-- }}} --> @@ -595,7 +665,7 @@ <!-- }}} --> <!-- {{{ create the install jar --> - <jar jarfile="${build.dir}/${app.name}-${app_version}-install.jar" manifest="${installer.build.dir}/installer.manifest"> + <jar jarfile="${installer.jar}" manifest="${installer.build.dir}/installer.manifest"> <fileset dir="${installer.build.dest}"> <include name="**/*"/> </fileset> @@ -603,18 +673,16 @@ <!-- }}} --> </target> - <target name="build-exe" if="windows.build"> - <taskdef name="jsmoothgen" - classname="net.charabia.jsmoothgen.ant.JSmoothGen" - classpath="${jsmooth.jar}"/> - - <jsmoothgen project="${jsmooth.project}" skeletonroot="${buildlib.dir}/skeletons"/> - <copy todir="${installer.program.dir}" file="${build.dir}/jsXe.exe"/> - </target> <!-- }}} --> <!-- {{{ ============ Generates a windows distribution ================= --> - <target depends="build-installer" name="win" if="windows.build" description="Build a windows distribution"> + <target depends="build-installer" name="win" description="Build a windows distribution"> + <taskdef name="launch4j" + classname="net.sf.launch4j.ant.Launch4jTask" + classpath="${launch4j.classpath}"/> + <launch4j configFile="${installer.launch4j.config}" + jar="${installer.jar}" + outfile="${installer.exe}"/> </target> <!-- }}} --> <!-- {{{ ============ Generates the binary distribution ================ --> @@ -661,7 +729,7 @@ </fileset> </copy> - <copy file="${build.dir}/${app.name}.jar" tofile="${distbin.dir}/${app.name}.jar"/> + <copy file="${jsxe.jar}" todir="${distbin.dir}"/> <!-- lib --> <mkdir dir="${distbin.dir}/lib"/> <copy todir="${distbin.dir}/lib"> @@ -695,7 +763,7 @@ </fileset> </copy> - <!-- api --> + <!-- api --> <mkdir dir="${distsrc.dir}/doc/api"/> <copy todir="${distsrc.dir}/doc/api"> <fileset dir="${build.javadocs}"> @@ -747,7 +815,7 @@ <include name="**/*"/> </fileset> </copy> - <copy todir="${distsrc.dir}" file="${jsmooth.project}"/> + <copy todir="${distsrc.dir}" file="${launch4j.config}"/> <!-- messages --> <mkdir dir="${distsrc.dir}/messages"/> Deleted: trunk/jsxe/buildlib/jsmoothgen-ant.jar =================================================================== (Binary files differ) Copied: trunk/jsxe/installer/jsxe-installer.ico (from rev 1144, tags/05pre3/jsxe/installer/jsxe-installer.ico) =================================================================== (Binary files differ) Copied: trunk/jsxe/installer/jsxe.desktop (from rev 1144, tags/05pre3/jsxe/installer/jsxe.desktop) =================================================================== --- trunk/jsxe/installer/jsxe.desktop (rev 0) +++ trunk/jsxe/installer/jsxe.desktop 2006-08-13 04:07:13 UTC (rev 1146) @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=jsXe XML Editor +Name[ja]=jsXe XML エディタ +GenericName=XML Editor +GenericName[ja]= +Comment=Edit XML Documents +Comment[ja]= +Exec=jsxe +Icon=jsxe.png +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;Application;Utility; \ No newline at end of file Copied: trunk/jsxe/installer/jsxe.png (from rev 1144, tags/05pre3/jsxe/installer/jsxe.png) =================================================================== (Binary files differ) Copied: trunk/jsxe/installer/launch4j.xml (from rev 1144, tags/05pre3/jsxe/installer/launch4j.xml) =================================================================== --- trunk/jsxe/installer/launch4j.xml (rev 0) +++ trunk/jsxe/installer/launch4j.xml 2006-08-13 04:07:13 UTC (rev 1146) @@ -0,0 +1,20 @@ +<launch4jConfig> + <dontWrapJar>false</dontWrapJar> + <headerType>0</headerType> + <jar>..\build\jsXe-05_pre3-install.jar</jar> + <outfile>..\build\jsxe-installer.exe</outfile> + <errTitle>jsXe Installer</errTitle> + <jarArgs></jarArgs> + <chdir></chdir> + <customProcName>true</customProcName> + <stayAlive>false</stayAlive> + <icon>jsxe-installer.ico</icon> + <jre> + <path></path> + <minVersion>1.4.2</minVersion> + <maxVersion></maxVersion> + <initialHeapSize>16</initialHeapSize> + <maxHeapSize>64</maxHeapSize> + <args></args> + </jre> +</launch4jConfig> \ No newline at end of file Modified: trunk/jsxe/installer/src/installer/OperatingSystem.java =================================================================== --- trunk/jsxe/installer/src/installer/OperatingSystem.java 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/installer/src/installer/OperatingSystem.java 2006-08-13 04:07:13 UTC (rev 1146) @@ -22,321 +22,372 @@ */ public abstract class OperatingSystem { - public abstract String getInstallDirectory(String name, String version); + public abstract String getInstallDirectory(String name, String version); - public abstract static class OSTask - { - protected Install installer; - protected String name; - protected String label; - protected String directory; - protected boolean enabled; + public abstract static class OSTask + { + protected Install installer; + protected String name; + protected String label; + protected String directory; + protected boolean enabled; - public OSTask(Install installer, String name) - { - this.installer = installer; - this.name = name; - this.label = installer.getProperty("ostask." + name + ".label"); - this.directory = getDefaultDirectory(installer); + public OSTask(Install installer, String name) + { + this.installer = installer; + this.name = name; + this.label = installer.getProperty("ostask." + name + ".label"); + this.directory = getDefaultDirectory(installer); - // on by default - enabled = true; - } + // on by default + enabled = true; + } - public String getName() - { - return name; - } + public String getName() + { + return name; + } - public String getLabel() - { - return label; - } + public String getLabel() + { + return label; + } - public String getDefaultDirectory(Install installer) - { - return null; - } + public String getDefaultDirectory(Install installer) + { + return null; + } - public String getDirectory() - { - return directory; - } + public String getDirectory() + { + return directory; + } - public boolean isEnabled() - { - return enabled; - } + public boolean isEnabled() + { + return enabled; + } - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } + public void setEnabled(boolean enabled) + { + this.enabled = enabled; + } - public void setDirectory(String directory) - { - this.directory = directory; - } + public void setDirectory(String directory) + { + this.directory = directory; + } - public abstract void perform(String installDir, - Vector filesets) throws IOException; - } + public abstract void perform(String installDir, + Vector filesets) throws IOException; + } - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[0]; - } + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[0]; + } - public void mkdirs(String directory) throws IOException - { - File file = new File(directory); - if(!file.exists()) - file.mkdirs(); - } + public void mkdirs(String directory) throws IOException + { + File file = new File(directory); + if(!file.exists()) + file.mkdirs(); + } - public static OperatingSystem getOperatingSystem() - { - if(os != null) - return os; + public static OperatingSystem getOperatingSystem() + { + if(os != null) + return os; - if(System.getProperty("mrj.version") != null) - os = new MacOS(); - else - { - String osName = System.getProperty("os.name"); - if(osName.indexOf("Windows") != -1) - os = new Windows(); - else if(osName.indexOf("OS/2") != -1) - os = new HalfAnOS(); - else if(osName.indexOf("VMS") != -1) - os = new VMS(); - else - os = new Unix(); - } + if(System.getProperty("mrj.version") != null) + os = new MacOS(); + else + { + String osName = System.getProperty("os.name"); + if(osName.indexOf("Windows") != -1) + os = new Windows(); + else if(osName.indexOf("OS/2") != -1) + os = new HalfAnOS(); + else if(osName.indexOf("VMS") != -1) + os = new VMS(); + else + os = new Unix(); + } - return os; - } + return os; + } - public static class Unix extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - String dir = "/usr/local/share/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + public static class Unix extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + String dir = "/usr/local/share/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - return new File(dir,name.toLowerCase() + "/" + version).getPath(); - } + return new File(dir,name.toLowerCase() + "/" + version).getPath(); + } - public class ScriptOSTask extends OSTask - { - public ScriptOSTask(Install installer) - { - super(installer,"unix-script"); - } + public class ScriptOSTask extends OSTask + { + public ScriptOSTask(Install installer) + { + super(installer,"unix-script"); + } - public String getDefaultDirectory(Install installer) - { - String dir = "/usr/local/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + public String getDefaultDirectory(Install installer) + { + String dir = "/usr/local/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - return new File(dir,"bin").getPath(); - } + return new File(dir,"bin").getPath(); + } - public void perform(String installDir, - Vector filesets) throws IOException - { - if(!enabled) - return; + public void perform(String installDir, + Vector filesets) throws IOException + { + if(!enabled) + return; - mkdirs(directory); + mkdirs(directory); - String name = installer.getProperty("app.name"); + String name = installer.getProperty("app.name"); + + //jsxe specific: this is needed for java to load our xerces rather + // than the one included with java. + String vmArgs = "-Djava.endorsed.dirs=\""+installDir + File.separator+"lib\""; - // create app start script - String script = directory + File.separatorChar - + name.toLowerCase(); + // create app start script + String script = directory + File.separatorChar + + name.toLowerCase(); - // Delete existing copy - new File(script).delete(); + // Delete existing copy + new File(script).delete(); - // Write simple script - FileWriter out = new FileWriter(script); - out.write("#!/bin/sh\n"); - out.write("# Java heap size, in megabytes\n"); - out.write("JAVA_HEAP_SIZE=32\n"); - out.write("DEFAULT_JAVA_HOME=\"" - + System.getProperty("java.home") - + "\"\n"); - out.write("if [ \"$JAVA_HOME\" = \"\" ]; then\n"); - out.write("JAVA_HOME=\"$DEFAULT_JAVA_HOME\"\n"); - out.write("fi\n"); + // Write simple script + FileWriter out = new FileWriter(script); + out.write("#!/bin/sh\n"); + out.write("# Java heap size, in megabytes\n"); + out.write("JAVA_HEAP_SIZE=32\n"); + out.write("DEFAULT_JAVA_HOME=\"" + + System.getProperty("java.home") + + "\"\n"); + out.write("if [ \"$JAVA_HOME\" = \"\" ]; then\n"); + out.write("JAVA_HOME=\"$DEFAULT_JAVA_HOME\"\n"); + out.write("fi\n"); - out.write("exec \"$JAVA_HOME" - + "/bin/java\" -mx${JAVA_HEAP_SIZE}m ${" - + name.toUpperCase() + "} "); + out.write("exec \"$JAVA_HOME" + + "/bin/java\" -mx${JAVA_HEAP_SIZE}m "+vmArgs+" ${" + + name.toUpperCase() + "} "); - String jar = installDir + File.separator - + name.toLowerCase() + ".jar"; + // String jar = installDir + File.separator + // + name.toLowerCase() + ".jar"; + + String jar = installDir + File.separator + + name + ".jar"; - out.write("-jar \"" + jar + "\" $@\n"); + out.write("-jar \"" + jar + "\" $@\n"); - out.close(); + out.close(); - // Make it executable - String[] chmodArgs = { "chmod", "755", script }; - exec(chmodArgs); - } - } + // Make it executable + String[] chmodArgs = { "chmod", "755", script }; + exec(chmodArgs); + } + } + + public class DesktopOSTask extends OSTask { + + public DesktopOSTask(Install installer) { + super(installer,"unix-desktop"); + } - public class ManPageOSTask extends OSTask - { - public ManPageOSTask(Install installer) - { - super(installer,"unix-man"); - } + public String getDefaultDirectory(Install installer) { + String dir = "/usr/local/"; + if (!new File(dir).canWrite()) { + dir = System.getProperty("user.home"); + } - public String getDefaultDirectory(Install installer) - { - String dir = "/usr/local/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + return new File(dir,"share").getPath(); + } - return new File(dir,"man/man1").getPath(); - } + public void perform(String installDir, + Vector filesets) throws IOException + { + if (!enabled) { + return; + } - public void perform(String installDir, - Vector filesets) throws IOException - { - if(!enabled) - return; + mkdirs(directory); + mkdirs(directory+"/applications"); + mkdirs(directory+"/pixmaps"); - mkdirs(directory); + String name = installer.getProperty("app.name"); - String name = installer.getProperty("app.name"); + // install shortcut + String shortcut = installer.getProperty("ostask.unix-desktop.shortcut"); + String pixmap = installer.getProperty("ostask.unix-desktop.pixmap"); - // install man page - String manpage = installer.getProperty("ostask.unix-man.manpage"); + if (shortcut != null) { + InputStream in = getClass().getResourceAsStream("/" + shortcut); + installer.copy(in, new File(directory+"/applications",shortcut).getPath(), null); + } + if (pixmap != null) { + InputStream in = getClass().getResourceAsStream("/" + pixmap); + installer.copy(in, new File(directory+"/pixmaps", pixmap).getPath(), null); + } + } + } + + public class ManPageOSTask extends OSTask + { + public ManPageOSTask(Install installer) + { + super(installer,"unix-man"); + } - InputStream in = getClass().getResourceAsStream("/" + manpage); - installer.copy(in,new File(directory,manpage).getPath(), - null); - } - } + public String getDefaultDirectory(Install installer) + { + String dir = "/usr/local/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[] { new ScriptOSTask(installer), - new ManPageOSTask(installer) }; - } + return new File(dir,"man/man1").getPath(); + } - public void mkdirs(String directory) throws IOException - { - File file = new File(directory); - if(!file.exists()) - { - String[] mkdirArgs = { "mkdir", "-m", "755", - "-p", directory }; - exec(mkdirArgs); - } - } + public void perform(String installDir, + Vector filesets) throws IOException + { + if(!enabled) + return; - public void exec(String[] args) throws IOException - { - Process proc = Runtime.getRuntime().exec(args); - proc.getInputStream().close(); - proc.getOutputStream().close(); - proc.getErrorStream().close(); - try - { - proc.waitFor(); - } - catch(InterruptedException ie) - { - } - } - } + mkdirs(directory); - public static class MacOS extends Unix - { - public String getInstallDirectory(String name, String version) - { - return "/Applications/" + name + " " + version; - } - } + String name = installer.getProperty("app.name"); - public static class Windows extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "C:\\Program Files\\" + name + " " + version; - } + // install man page + String manpage = installer.getProperty("ostask.unix-man.manpage"); - public class JEditLauncherOSTask extends OSTask - { - public JEditLauncherOSTask(Install installer) - { - super(installer,"jedit-launcher"); - } + if (manpage != null) { + InputStream in = getClass().getResourceAsStream("/" + manpage); + installer.copy(in, new File(directory,manpage).getPath(), null); + } + } + } - public String getDefaultDirectory(Install installer) - { - return null; - } + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[] { new ScriptOSTask(installer), + new ManPageOSTask(installer), new DesktopOSTask(installer) }; + } - public void perform(String installDir, - Vector filesets) - { - if(!enabled - || !filesets.contains("jedit-windows")) - return; + public void mkdirs(String directory) throws IOException + { + File file = new File(directory); + if(!file.exists()) + { + String[] mkdirArgs = { "mkdir", "-m", "755", + "-p", directory }; + exec(mkdirArgs); + } + } - // run jEditLauncher installation - File executable = new File(installDir,"jedit.exe"); - if(!executable.exists()) - return; + public void exec(String[] args) throws IOException + { + Process proc = Runtime.getRuntime().exec(args); + proc.getInputStream().close(); + proc.getOutputStream().close(); + proc.getErrorStream().close(); + try + { + proc.waitFor(); + } + catch(InterruptedException ie) + { + } + } + } - String[] args = { executable.getPath(), "/i", - System.getProperty("java.home") - + File.separator - + "bin" }; + public static class MacOS extends Unix + { + public String getInstallDirectory(String name, String version) + { + return "/Applications/" + name + " " + version; + } + } - try - { - Runtime.getRuntime().exec(args).waitFor(); - } - catch(IOException io) - { - } - catch(InterruptedException ie) - { - } - } - } + public static class Windows extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "C:\\Program Files\\" + name + " " + version; + } - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[] { /* new JEditLauncherOSTask(installer) */ }; - } - } + public class JEditLauncherOSTask extends OSTask + { + public JEditLauncherOSTask(Install installer) + { + super(installer,"jedit-launcher"); + } - public static class HalfAnOS extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "C:\\" + name + " " + version; - } - } + public String getDefaultDirectory(Install installer) + { + return null; + } - public static class VMS extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "./" + name.toLowerCase() + "/" + version; - } - } + public void perform(String installDir, + Vector filesets) + { + if(!enabled + || !filesets.contains("jedit-windows")) + return; - // private members - private static OperatingSystem os; + // run jEditLauncher installation + File executable = new File(installDir,"jedit.exe"); + if(!executable.exists()) + return; + + String[] args = { executable.getPath(), "/i", + System.getProperty("java.home") + + File.separator + + "bin" }; + + try + { + Runtime.getRuntime().exec(args).waitFor(); + } + catch(IOException io) + { + } + catch(InterruptedException ie) + { + } + } + } + + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[] { /* new JEditLauncherOSTask(installer) */ }; + } + } + + public static class HalfAnOS extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "C:\\" + name + " " + version; + } + } + + public static class VMS extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "./" + name.toLowerCase() + "/" + version; + } + } + + // private members + private static OperatingSystem os; } Deleted: trunk/jsxe/jsXe.jsmooth =================================================================== --- trunk/jsxe/jsXe.jsmooth 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/jsXe.jsmooth 2006-08-13 04:07:13 UTC (rev 1146) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<jsmoothproject> -<JVMSearchPath>registry</JVMSearchPath> -<JVMSearchPath>javahome</JVMSearchPath> -<JVMSearchPath>jrepath</JVMSearchPath> -<JVMSearchPath>jdkpath</JVMSearchPath> -<JVMSearchPath>exepath</JVMSearchPath> -<JVMSearchPath>jview</JVMSearchPath> -<classPath>build\jsXe.jar</classPath> -<embeddedJar>false</embeddedJar> -<executableName>build\jsXe.exe</executableName> -<iconLocation>src\net\sourceforge\jsxe\icons\jsxe.jpg</iconLocation> -<initialMemoryHeap>16777216</initialMemoryHeap> -<javaProperties> -<name>java.endorsed.dirs</name> -<value>lib</value> -</javaProperties> -<mainClassName>net.sourceforge.jsxe.jsXe</mainClassName> -<maximumMemoryHeap>67108864</maximumMemoryHeap> -<maximumVersion></maximumVersion> -<minimumVersion>1.4.2</minimumVersion> -<skeletonName>Windowed Wrapper</skeletonName> -<skeletonProperties> -<key>Message</key> -<value>Java has not been found on your computer. Do you want to download it?</value> -</skeletonProperties> -<skeletonProperties> -<key>URL</key> -<value>http://www.java.com</value> -</skeletonProperties> -<skeletonProperties> -<key>SingleProcess</key> -<value>0</value> -</skeletonProperties> -<skeletonProperties> -<key>Debug</key> -<value>0</value> -</skeletonProperties> -</jsmoothproject> Copied: trunk/jsxe/jsxe.ico (from rev 1144, tags/05pre3/jsxe/jsxe.ico) =================================================================== (Binary files differ) Copied: trunk/jsxe/launch4j.xml (from rev 1144, tags/05pre3/jsxe/launch4j.xml) =================================================================== --- trunk/jsxe/launch4j.xml (rev 0) +++ trunk/jsxe/launch4j.xml 2006-08-13 04:07:13 UTC (rev 1146) @@ -0,0 +1,23 @@ +<launch4jConfig> + <dontWrapJar>true</dontWrapJar> + <headerType>0</headerType> + <jar>jsXe.jar</jar> + <outfile>build\jsXe.exe</outfile> + <errTitle>jsXe</errTitle> + <jarArgs></jarArgs> + <chdir></chdir> + <customProcName>true</customProcName> + <stayAlive>false</stayAlive> + <icon>jsxe.ico</icon> + <jre> + <path></path> + <minVersion>1.4.2</minVersion> + <maxVersion></maxVersion> + <initialHeapSize>16</initialHeapSize> + <maxHeapSize>64</maxHeapSize> + <args>-Djava.endorsed.dirs=lib + + +</args> + </jre> +</launch4jConfig> \ No newline at end of file Modified: trunk/jsxe/messages/messages.ja =================================================================== --- trunk/jsxe/messages/messages.ja 2006-08-13 04:04:39 UTC (rev 1145) +++ trunk/jsxe/messages/messages.ja 2006-08-13 04:07:13 UTC (rev 1146) @@ -9,12 +9,25 @@ common.ok=決定 common.cancel=キャンセル +common.open=開く +common.save=保存 +common.save.as=名前を付けて保存 +common.close=閉じる common.apply=適用 +common.more=次 +common.insert=インサート common.add=追加 common.remove=削除 +common.moveUp=上げる +common.moveDown=下げる + +#common.ctrl=Ctrl +#common.alt=Alt +#common.shift=Shift +#common.meta=Meta -#}}} - +#}}} + #{{{ XML Terminology #{{{ XML Node Types @@ -22,9 +35,11 @@ xml.processing.instruction=処理命令 xml.cdata=CDATAセクション xml.text=テキスト -xml.entity.reference=エンティティ参照 +xml.entity.reference=エンティティ参照 +#xml.declaration=Element Declaration xml.notation=表記法 -xml.entity=エンティティ +xml.entity=エンティティ +#xml.entity=Entity Declaration xml.comment=コメント xml.attribute=属性 xml.doctype=文書型 @@ -35,7 +50,8 @@ xml.document=XMLドキュメント xml.namespace=ネームスペース xml.namespace.prefix=ネームスペース前置修飾子 -xml.namespace.prefix.short=前置修飾子 +xml.namespace.prefix.short=前置修飾子 +#xml.namespace.decl=Namespace Declaration xml.doctypedef=文書型 xml.doctype.name=DTDの名前 xml.doctype.public=公開識別子 @@ -43,6 +59,38 @@ xml.schema=XMLスキーマ #}}} + +#{{{ Global Options +Global.Options.Dialog.Title=Global Options +Global.Options.Title=General +Global.Options.Max.Recent.Files=最近使用したドキュメント数: +Global.Options.Max.Recent.Files.ToolTip=最近使用したドキュメントのメニューに表示するドキュメントの数 +Global.Options.network-off=Always cache without asking +Global.Options.network-cache=Ask first, then cache remote files +Global.Options.network-always=Always download without asking +Global.Options.network=DTDとXMLスキーマ ダウンロード: +Global.Options.Menu.Spill.Over=Number of items before menus spill over: +Global.Options.Undos.To.Remember=元に戻す数: +Global.Options.Undos.To.Remember.ToolTip=<HTML>jsXeは元に戻すために、この操作数を覚える.<BR> しかし, ビューを変わったら、覚えることはできません。</HTML> + +Shortcuts.Options.Title=ショットカット +Shortcuts.Options.Select.Label=ショットカットを編集: +Shortcuts.Options.Shortcut=ショットカット +Shortcuts.Options.Command=コマンド + +Grab.Key.title=ショットカットを選択 +Grab.Key.caption="{0}" のショットカットを選択して、決定を押してくただい。 +Grab.Key.keyboard-test=Input the key strokes that are causing problems. +Grab.Key.assigned-to=今登録されたコマンド: {0} +Grab.Key.assigned-to.none=<なし> +Grab.Key.clear=クリア +Grab.Key.remove=今のショットカットを削除 + +Grab.Key.remove-ask.title=ショットカットを削除? +Grab.Key.remove-ask.message=\ + 新しいショットカットは選択されてなかった。\n\ + 今のショットカットを削除? +#}}} #{{{ Document Options Document.Options.Title=ドキュメント設定 @@ -57,18 +105,31 @@ Tools.Menu=ツール View.Menu=表示 -#{{{ File Menu Items -open-file.label=開く... -save-file.label=保管 -reload-file.label=再ロード -close-file.label=閉じる -close-all.label=すべてを閉じる -exit.label=終了 +#{{{ Action Labels +new-file.label=新規作成 +open-file.label=開く... +File.Recent=最近使用したドキュメント +File.Recent.None=最近使用したドキュメントはありません +save-file.label=保存 +save-as.label=名前を付けて保存... +reload-file.label=再ロード +close-file.label=閉じる +close-all.label=すべて閉じる +exit.label=終了 + +undo.label=元に戻す +redo.label=やり直し +cut.label=切り取り +copy.label=コピー +paste.label=貼り付け +find.label=探索... +findnext.label=次を探索 + +document-options.label=ドキュメント設定... +plugin-manager.label=プラグインマネジャー... +about-jsxe.label=jsXeについて... #}}} -document-options.label=ドキュメント設定... -about-jsxe.label=jsXeについて... - #}}} #{{{ Dialogs @@ -89,4 +150,5 @@ ホームページ: http://jsxe.sourceforge.net/ #}}} -#}}} \ No newline at end of file +#}}} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-13 04:04:43
|
Revision: 1145 Author: ian_lewis Date: 2006-08-12 21:04:39 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1145&view=rev Log Message: ----------- removed jsmooth skeleton files Removed Paths: ------------- tags/05pre3/jsxe/buildlib/skeletons/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-13 00:41:27
|
Revision: 1144 Author: ian_lewis Date: 2006-08-12 17:41:19 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1144&view=rev Log Message: ----------- Updated japanese translation Modified Paths: -------------- tags/05pre3/jsxe/messages/messages.ja Modified: tags/05pre3/jsxe/messages/messages.ja =================================================================== --- tags/05pre3/jsxe/messages/messages.ja 2006-08-12 18:51:25 UTC (rev 1143) +++ tags/05pre3/jsxe/messages/messages.ja 2006-08-13 00:41:19 UTC (rev 1144) @@ -9,12 +9,25 @@ common.ok=決定 common.cancel=キャンセル +common.open=開く +common.save=保存 +common.save.as=名前を付けて保存 +common.close=閉じる common.apply=適用 +common.more=次 +common.insert=インサート common.add=追加 common.remove=削除 +common.moveUp=上げる +common.moveDown=下げる + +#common.ctrl=Ctrl +#common.alt=Alt +#common.shift=Shift +#common.meta=Meta -#}}} - +#}}} + #{{{ XML Terminology #{{{ XML Node Types @@ -22,9 +35,11 @@ xml.processing.instruction=処理命令 xml.cdata=CDATAセクション xml.text=テキスト -xml.entity.reference=エンティティ参照 +xml.entity.reference=エンティティ参照 +#xml.declaration=Element Declaration xml.notation=表記法 -xml.entity=エンティティ +xml.entity=エンティティ +#xml.entity=Entity Declaration xml.comment=コメント xml.attribute=属性 xml.doctype=文書型 @@ -35,7 +50,8 @@ xml.document=XMLドキュメント xml.namespace=ネームスペース xml.namespace.prefix=ネームスペース前置修飾子 -xml.namespace.prefix.short=前置修飾子 +xml.namespace.prefix.short=前置修飾子 +#xml.namespace.decl=Namespace Declaration xml.doctypedef=文書型 xml.doctype.name=DTDの名前 xml.doctype.public=公開識別子 @@ -43,6 +59,38 @@ xml.schema=XMLスキーマ #}}} + +#{{{ Global Options +Global.Options.Dialog.Title=Global Options +Global.Options.Title=General +Global.Options.Max.Recent.Files=最近使用したドキュメント数: +Global.Options.Max.Recent.Files.ToolTip=最近使用したドキュメントのメニューに表示するドキュメントの数 +Global.Options.network-off=Always cache without asking +Global.Options.network-cache=Ask first, then cache remote files +Global.Options.network-always=Always download without asking +Global.Options.network=DTDとXMLスキーマ ダウンロード: +Global.Options.Menu.Spill.Over=Number of items before menus spill over: +Global.Options.Undos.To.Remember=元に戻す数: +Global.Options.Undos.To.Remember.ToolTip=<HTML>jsXeは元に戻すために、この操作数を覚える.<BR> しかし, ビューを変わったら、覚えることはできません。</HTML> + +Shortcuts.Options.Title=ショットカット +Shortcuts.Options.Select.Label=ショットカットを編集: +Shortcuts.Options.Shortcut=ショットカット +Shortcuts.Options.Command=コマンド + +Grab.Key.title=ショットカットを選択 +Grab.Key.caption="{0}" のショットカットを選択して、決定を押してくただい。 +Grab.Key.keyboard-test=Input the key strokes that are causing problems. +Grab.Key.assigned-to=今登録されたコマンド: {0} +Grab.Key.assigned-to.none=<なし> +Grab.Key.clear=クリア +Grab.Key.remove=今のショットカットを削除 + +Grab.Key.remove-ask.title=ショットカットを削除? +Grab.Key.remove-ask.message=\ + 新しいショットカットは選択されてなかった。\n\ + 今のショットカットを削除? +#}}} #{{{ Document Options Document.Options.Title=ドキュメント設定 @@ -57,18 +105,31 @@ Tools.Menu=ツール View.Menu=表示 -#{{{ File Menu Items -open-file.label=開く... -save-file.label=保管 -reload-file.label=再ロード -close-file.label=閉じる -close-all.label=すべてを閉じる -exit.label=終了 +#{{{ Action Labels +new-file.label=新規作成 +open-file.label=開く... +File.Recent=最近使用したドキュメント +File.Recent.None=最近使用したドキュメントはありません +save-file.label=保存 +save-as.label=名前を付けて保存... +reload-file.label=再ロード +close-file.label=閉じる +close-all.label=すべて閉じる +exit.label=終了 + +undo.label=元に戻す +redo.label=やり直し +cut.label=切り取り +copy.label=コピー +paste.label=貼り付け +find.label=探索... +findnext.label=次を探索 + +document-options.label=ドキュメント設定... +plugin-manager.label=プラグインマネジャー... +about-jsxe.label=jsXeについて... #}}} -document-options.label=ドキュメント設定... -about-jsxe.label=jsXeについて... - #}}} #{{{ Dialogs @@ -89,4 +150,5 @@ ホームページ: http://jsxe.sourceforge.net/ #}}} -#}}} \ No newline at end of file +#}}} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-12 18:51:31
|
Revision: 1143 Author: ian_lewis Date: 2006-08-12 11:51:25 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1143&view=rev Log Message: ----------- Fixed how jsXe installs on Unix/Linux; Added support for desktop launchers in Unix Modified Paths: -------------- tags/05pre3/jsxe/build.xml tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java Added Paths: ----------- tags/05pre3/jsxe/installer/jsxe.desktop tags/05pre3/jsxe/installer/jsxe.png Modified: tags/05pre3/jsxe/build.xml =================================================================== --- tags/05pre3/jsxe/build.xml 2006-08-12 17:22:38 UTC (rev 1142) +++ tags/05pre3/jsxe/build.xml 2006-08-12 18:51:25 UTC (rev 1143) @@ -78,6 +78,7 @@ <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"/> @@ -97,6 +98,10 @@ <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"/> @@ -140,7 +145,6 @@ <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"/> @@ -402,7 +406,13 @@ size += file.length(); } - project.setNewProperty(attributes.get("property"), Math.round(size/1024)); + + roundedSize = Math.round(size/1024); + + echo = project.createTask("echo"); + echo.setMessage("Size: "+roundedSize+"Kb"); + echo.perform(); + project.setNewProperty(attributes.get("property"), roundedSize); } ]]> </scriptdef> @@ -425,10 +435,18 @@ <!-- copy html files --> <copy todir="${installer.build.dest}/installer"> <fileset dir="${installer.dir}"> - <include name="**/*.html"/> + <include name="*.html"/> </fileset> </copy> + <!-- copy other files --> + <copy todir="${installer.build.dest}"> + <fileset dir="${installer.dir}"> + <exclude name="*.html"/> + <include name="*"/> + </fileset> + </copy> + <!-- {{{ create the program tar.bz2 file --> <mkdir dir="${installer.program.dir}"/> @@ -600,9 +618,10 @@ <entry key="app.license.title" value="${app.license.title}"/> <entry key="app.license" value="${app.license}"/> <entry key="ostask.unix-script.label" value="${ostask.unix-script.label}"/> + <entry key="ostask.unix-desktop.label" value="${ostask.unix-desktop.label}"/> + <entry key="ostask.unix-desktop.pixmap" value="${ostask.unix-desktop.pixmap}"/> + <entry key="ostask.unix-desktop.shortcut" value="${ostask.unix-desktop.shortcut}"/> - <entry key="extra.vm.args" value="-Djava.endorsed.dirs=lib"/> - <!--<entry key="ostask.unix-man.label" value="${ostask.unix-man.label}"/>--> <entry key="comp.count" value="${comp.count}"/> <entry key="comp.0.name" value="${comp.0.name}"/> @@ -630,6 +649,7 @@ <entry key="comp.4.real-size" value="${comp.4.real-size}"/> <entry key="comp.4.fileset" value="${comp.4.fileset}"/> <entry key="comp.4.os" value="${comp.4.os}"/> + </propertyfile> <!-- }}} --> Added: tags/05pre3/jsxe/installer/jsxe.desktop =================================================================== --- tags/05pre3/jsxe/installer/jsxe.desktop (rev 0) +++ tags/05pre3/jsxe/installer/jsxe.desktop 2006-08-12 18:51:25 UTC (rev 1143) @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=jsXe XML Editor +Name[ja]=jsXe XML エディタ +GenericName=XML Editor +GenericName[ja]= +Comment=Edit XML Documents +Comment[ja]= +Exec=jsxe +Icon=jsxe.png +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;Application;Utility; \ No newline at end of file Added: tags/05pre3/jsxe/installer/jsxe.png =================================================================== (Binary files differ) Property changes on: tags/05pre3/jsxe/installer/jsxe.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java =================================================================== --- tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java 2006-08-12 17:22:38 UTC (rev 1142) +++ tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java 2006-08-12 18:51:25 UTC (rev 1143) @@ -153,7 +153,10 @@ mkdirs(directory); String name = installer.getProperty("app.name"); - String vmArgs = installer.getProperty("extra.vm.args"); + + //jsxe specific: this is needed for java to load our xerces rather + // than the one included with java. + String vmArgs = "-Djava.endorsed.dirs=\""+installDir + File.separator+"lib\""; // create app start script String script = directory + File.separatorChar @@ -193,7 +196,50 @@ exec(chmodArgs); } } + + public class DesktopOSTask extends OSTask { + + public DesktopOSTask(Install installer) { + super(installer,"unix-desktop"); + } + public String getDefaultDirectory(Install installer) { + String dir = "/usr/local/"; + if (!new File(dir).canWrite()) { + dir = System.getProperty("user.home"); + } + + return new File(dir,"share").getPath(); + } + + public void perform(String installDir, + Vector filesets) throws IOException + { + if (!enabled) { + return; + } + + mkdirs(directory); + mkdirs(directory+"/applications"); + mkdirs(directory+"/pixmaps"); + + String name = installer.getProperty("app.name"); + + // install shortcut + String shortcut = installer.getProperty("ostask.unix-desktop.shortcut"); + String pixmap = installer.getProperty("ostask.unix-desktop.pixmap"); + + if (shortcut != null) { + InputStream in = getClass().getResourceAsStream("/" + shortcut); + installer.copy(in, new File(directory+"/applications",shortcut).getPath(), null); + } + if (pixmap != null) { + InputStream in = getClass().getResourceAsStream("/" + pixmap); + installer.copy(in, new File(directory+"/pixmaps", pixmap).getPath(), null); + } + } + } + public class ManPageOSTask extends OSTask { public ManPageOSTask(Install installer) @@ -233,7 +279,7 @@ public OSTask[] getOSTasks(Install installer) { return new OSTask[] { new ScriptOSTask(installer), - new ManPageOSTask(installer) }; + new ManPageOSTask(installer), new DesktopOSTask(installer) }; } public void mkdirs(String directory) throws IOException This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-12 17:22:45
|
Revision: 1142 Author: ian_lewis Date: 2006-08-12 10:22:38 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1142&view=rev Log Message: ----------- moved the windows exe integration into it's own installer component Modified Paths: -------------- tags/05pre3/jsxe/Changelog tags/05pre3/jsxe/INSTALL tags/05pre3/jsxe/build.xml Modified: tags/05pre3/jsxe/Changelog =================================================================== --- tags/05pre3/jsxe/Changelog 2006-08-12 16:50:27 UTC (rev 1141) +++ tags/05pre3/jsxe/Changelog 2006-08-12 17:22:38 UTC (rev 1142) @@ -3,6 +3,8 @@ * 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...> Modified: tags/05pre3/jsxe/INSTALL =================================================================== --- tags/05pre3/jsxe/INSTALL 2006-08-12 16:50:27 UTC (rev 1141) +++ tags/05pre3/jsxe/INSTALL 2006-08-12 17:22:38 UTC (rev 1142) @@ -14,14 +14,27 @@ 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 @@ -44,7 +57,9 @@ 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. +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 ** Modified: tags/05pre3/jsxe/build.xml =================================================================== --- tags/05pre3/jsxe/build.xml 2006-08-12 16:50:27 UTC (rev 1141) +++ tags/05pre3/jsxe/build.xml 2006-08-12 17:22:38 UTC (rev 1142) @@ -77,6 +77,7 @@ <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.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"/> @@ -97,7 +98,7 @@ <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-man.manpage" value="jsxe.1"/>--> - <property name="comp.count" value="4"/> + <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 @@ -130,6 +131,16 @@ <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"/> @@ -449,27 +460,6 @@ </fileset> </copy> - <!-- copy the lib directory so that the jsXe.exe can be run - from the build dir --> - <mkdir dir="${build.dir}/lib"/> - <copy todir="${build.dir}/lib"> - <fileset dir="${build.lib}"> - <include name="**/*"/> - </fileset> - </copy> - - <!-- create the windows exe --> - <taskdef name="launch4j" - classname="net.sf.launch4j.ant.Launch4jTask" - classpath="${launch4j.classpath}"/> - - <launch4j configFile="${launch4j.config}" - outfile="${launch4j.jsxe.exe}" - jarPath="${launch4j.jsxe.jar}" - /> - - <copy file="${jsxe.exe}" todir="${installer.program.dir}" /> - <!-- create the tar.bz2 for the installer --> <tar basedir="${installer.program.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-program.tar"/> <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-program.tar" destfile="${installer.build.program.tar}"/> @@ -561,6 +551,47 @@ <!-- }}} --> + <!-- {{{ create the win tar.bz2 file --> + + <!-- copy the lib directory so that the jsXe.exe can be run + from the build dir --> + <mkdir dir="${build.dir}/lib"/> + <copy todir="${build.dir}/lib"> + <fileset dir="${build.lib}"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- create the windows exe --> + <taskdef name="launch4j" + classname="net.sf.launch4j.ant.Launch4jTask" + classpath="${launch4j.classpath}"/> + + <launch4j configFile="${launch4j.config}" + outfile="${launch4j.jsxe.exe}" + jarPath="${launch4j.jsxe.jar}" + /> + + <mkdir dir="${installer.win.dir}"/> + <copy file="${jsxe.exe}" todir="${installer.win.dir}" /> + + <tar basedir="${installer.win.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-win.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-win.tar" destfile="${installer.build.win.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-win.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.4.disk-size"> + <fileset dir="${installer.win.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.4.real-size"> + <fileset file="${installer.build.win.tar}"/> + </filesize> + + <!-- }}} --> + <!-- {{{ create the install.props file --> <propertyfile comment="${app.name}'s installer properties" file="${install.props}"> <entry key="app.name" value="${app.name}"/> @@ -593,6 +624,12 @@ <entry key="comp.3.disk-size" value="${comp.3.disk-size}"/> <entry key="comp.3.real-size" value="${comp.3.real-size}"/> <entry key="comp.3.fileset" value="${comp.3.fileset}"/> + + <entry key="comp.4.name" value="${comp.4.name}"/> + <entry key="comp.4.disk-size" value="${comp.4.disk-size}"/> + <entry key="comp.4.real-size" value="${comp.4.real-size}"/> + <entry key="comp.4.fileset" value="${comp.4.fileset}"/> + <entry key="comp.4.os" value="${comp.4.os}"/> </propertyfile> <!-- }}} --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-12 16:50:34
|
Revision: 1141 Author: ian_lewis Date: 2006-08-12 09:50:27 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1141&view=rev Log Message: ----------- Fixed the installer for unix/linux Modified Paths: -------------- tags/05pre3/jsxe/Changelog tags/05pre3/jsxe/build.xml tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java Modified: tags/05pre3/jsxe/Changelog =================================================================== --- tags/05pre3/jsxe/Changelog 2006-08-12 05:54:18 UTC (rev 1140) +++ tags/05pre3/jsxe/Changelog 2006-08-12 16:50:27 UTC (rev 1141) @@ -1,3 +1,9 @@ +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. + 08/09/2006 Ian Lewis <Ian...@me...> * Added a new option to the Global Options dialog for the number of undo Modified: tags/05pre3/jsxe/build.xml =================================================================== --- tags/05pre3/jsxe/build.xml 2006-08-12 05:54:18 UTC (rev 1140) +++ tags/05pre3/jsxe/build.xml 2006-08-12 16:50:27 UTC (rev 1141) @@ -569,6 +569,9 @@ <entry key="app.license.title" value="${app.license.title}"/> <entry key="app.license" value="${app.license}"/> <entry key="ostask.unix-script.label" value="${ostask.unix-script.label}"/> + + <entry key="extra.vm.args" value="-Djava.endorsed.dirs=lib"/> + <!--<entry key="ostask.unix-man.label" value="${ostask.unix-man.label}"/>--> <entry key="comp.count" value="${comp.count}"/> <entry key="comp.0.name" value="${comp.0.name}"/> Modified: tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java =================================================================== --- tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java 2006-08-12 05:54:18 UTC (rev 1140) +++ tags/05pre3/jsxe/installer/src/installer/OperatingSystem.java 2006-08-12 16:50:27 UTC (rev 1141) @@ -22,321 +22,326 @@ */ public abstract class OperatingSystem { - public abstract String getInstallDirectory(String name, String version); + public abstract String getInstallDirectory(String name, String version); - public abstract static class OSTask - { - protected Install installer; - protected String name; - protected String label; - protected String directory; - protected boolean enabled; + public abstract static class OSTask + { + protected Install installer; + protected String name; + protected String label; + protected String directory; + protected boolean enabled; - public OSTask(Install installer, String name) - { - this.installer = installer; - this.name = name; - this.label = installer.getProperty("ostask." + name + ".label"); - this.directory = getDefaultDirectory(installer); + public OSTask(Install installer, String name) + { + this.installer = installer; + this.name = name; + this.label = installer.getProperty("ostask." + name + ".label"); + this.directory = getDefaultDirectory(installer); - // on by default - enabled = true; - } + // on by default + enabled = true; + } - public String getName() - { - return name; - } + public String getName() + { + return name; + } - public String getLabel() - { - return label; - } + public String getLabel() + { + return label; + } - public String getDefaultDirectory(Install installer) - { - return null; - } + public String getDefaultDirectory(Install installer) + { + return null; + } - public String getDirectory() - { - return directory; - } + public String getDirectory() + { + return directory; + } - public boolean isEnabled() - { - return enabled; - } + public boolean isEnabled() + { + return enabled; + } - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } + public void setEnabled(boolean enabled) + { + this.enabled = enabled; + } - public void setDirectory(String directory) - { - this.directory = directory; - } + public void setDirectory(String directory) + { + this.directory = directory; + } - public abstract void perform(String installDir, - Vector filesets) throws IOException; - } + public abstract void perform(String installDir, + Vector filesets) throws IOException; + } - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[0]; - } + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[0]; + } - public void mkdirs(String directory) throws IOException - { - File file = new File(directory); - if(!file.exists()) - file.mkdirs(); - } + public void mkdirs(String directory) throws IOException + { + File file = new File(directory); + if(!file.exists()) + file.mkdirs(); + } - public static OperatingSystem getOperatingSystem() - { - if(os != null) - return os; + public static OperatingSystem getOperatingSystem() + { + if(os != null) + return os; - if(System.getProperty("mrj.version") != null) - os = new MacOS(); - else - { - String osName = System.getProperty("os.name"); - if(osName.indexOf("Windows") != -1) - os = new Windows(); - else if(osName.indexOf("OS/2") != -1) - os = new HalfAnOS(); - else if(osName.indexOf("VMS") != -1) - os = new VMS(); - else - os = new Unix(); - } + if(System.getProperty("mrj.version") != null) + os = new MacOS(); + else + { + String osName = System.getProperty("os.name"); + if(osName.indexOf("Windows") != -1) + os = new Windows(); + else if(osName.indexOf("OS/2") != -1) + os = new HalfAnOS(); + else if(osName.indexOf("VMS") != -1) + os = new VMS(); + else + os = new Unix(); + } - return os; - } + return os; + } - public static class Unix extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - String dir = "/usr/local/share/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + public static class Unix extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + String dir = "/usr/local/share/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - return new File(dir,name.toLowerCase() + "/" + version).getPath(); - } + return new File(dir,name.toLowerCase() + "/" + version).getPath(); + } - public class ScriptOSTask extends OSTask - { - public ScriptOSTask(Install installer) - { - super(installer,"unix-script"); - } + public class ScriptOSTask extends OSTask + { + public ScriptOSTask(Install installer) + { + super(installer,"unix-script"); + } - public String getDefaultDirectory(Install installer) - { - String dir = "/usr/local/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + public String getDefaultDirectory(Install installer) + { + String dir = "/usr/local/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - return new File(dir,"bin").getPath(); - } + return new File(dir,"bin").getPath(); + } - public void perform(String installDir, - Vector filesets) throws IOException - { - if(!enabled) - return; + public void perform(String installDir, + Vector filesets) throws IOException + { + if(!enabled) + return; - mkdirs(directory); + mkdirs(directory); - String name = installer.getProperty("app.name"); + String name = installer.getProperty("app.name"); + String vmArgs = installer.getProperty("extra.vm.args"); - // create app start script - String script = directory + File.separatorChar - + name.toLowerCase(); + // create app start script + String script = directory + File.separatorChar + + name.toLowerCase(); - // Delete existing copy - new File(script).delete(); + // Delete existing copy + new File(script).delete(); - // Write simple script - FileWriter out = new FileWriter(script); - out.write("#!/bin/sh\n"); - out.write("# Java heap size, in megabytes\n"); - out.write("JAVA_HEAP_SIZE=32\n"); - out.write("DEFAULT_JAVA_HOME=\"" - + System.getProperty("java.home") - + "\"\n"); - out.write("if [ \"$JAVA_HOME\" = \"\" ]; then\n"); - out.write("JAVA_HOME=\"$DEFAULT_JAVA_HOME\"\n"); - out.write("fi\n"); + // Write simple script + FileWriter out = new FileWriter(script); + out.write("#!/bin/sh\n"); + out.write("# Java heap size, in megabytes\n"); + out.write("JAVA_HEAP_SIZE=32\n"); + out.write("DEFAULT_JAVA_HOME=\"" + + System.getProperty("java.home") + + "\"\n"); + out.write("if [ \"$JAVA_HOME\" = \"\" ]; then\n"); + out.write("JAVA_HOME=\"$DEFAULT_JAVA_HOME\"\n"); + out.write("fi\n"); - out.write("exec \"$JAVA_HOME" - + "/bin/java\" -mx${JAVA_HEAP_SIZE}m ${" - + name.toUpperCase() + "} "); + out.write("exec \"$JAVA_HOME" + + "/bin/java\" -mx${JAVA_HEAP_SIZE}m "+vmArgs+" ${" + + name.toUpperCase() + "} "); - String jar = installDir + File.separator - + name.toLowerCase() + ".jar"; + // String jar = installDir + File.separator + // + name.toLowerCase() + ".jar"; + + String jar = installDir + File.separator + + name + ".jar"; - out.write("-jar \"" + jar + "\" $@\n"); + out.write("-jar \"" + jar + "\" $@\n"); - out.close(); + out.close(); - // Make it executable - String[] chmodArgs = { "chmod", "755", script }; - exec(chmodArgs); - } - } + // Make it executable + String[] chmodArgs = { "chmod", "755", script }; + exec(chmodArgs); + } + } - public class ManPageOSTask extends OSTask - { - public ManPageOSTask(Install installer) - { - super(installer,"unix-man"); - } + public class ManPageOSTask extends OSTask + { + public ManPageOSTask(Install installer) + { + super(installer,"unix-man"); + } - public String getDefaultDirectory(Install installer) - { - String dir = "/usr/local/"; - if(!new File(dir).canWrite()) - dir = System.getProperty("user.home"); + public String getDefaultDirectory(Install installer) + { + String dir = "/usr/local/"; + if(!new File(dir).canWrite()) + dir = System.getProperty("user.home"); - return new File(dir,"man/man1").getPath(); - } + return new File(dir,"man/man1").getPath(); + } - public void perform(String installDir, - Vector filesets) throws IOException - { - if(!enabled) - return; + public void perform(String installDir, + Vector filesets) throws IOException + { + if(!enabled) + return; - mkdirs(directory); + mkdirs(directory); - String name = installer.getProperty("app.name"); + String name = installer.getProperty("app.name"); - // install man page - String manpage = installer.getProperty("ostask.unix-man.manpage"); + // install man page + String manpage = installer.getProperty("ostask.unix-man.manpage"); - InputStream in = getClass().getResourceAsStream("/" + manpage); - installer.copy(in,new File(directory,manpage).getPath(), - null); - } - } + if (manpage != null) { + InputStream in = getClass().getResourceAsStream("/" + manpage); + installer.copy(in, new File(directory,manpage).getPath(), null); + } + } + } - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[] { new ScriptOSTask(installer), - new ManPageOSTask(installer) }; - } + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[] { new ScriptOSTask(installer), + new ManPageOSTask(installer) }; + } - public void mkdirs(String directory) throws IOException - { - File file = new File(directory); - if(!file.exists()) - { - String[] mkdirArgs = { "mkdir", "-m", "755", - "-p", directory }; - exec(mkdirArgs); - } - } + public void mkdirs(String directory) throws IOException + { + File file = new File(directory); + if(!file.exists()) + { + String[] mkdirArgs = { "mkdir", "-m", "755", + "-p", directory }; + exec(mkdirArgs); + } + } - public void exec(String[] args) throws IOException - { - Process proc = Runtime.getRuntime().exec(args); - proc.getInputStream().close(); - proc.getOutputStream().close(); - proc.getErrorStream().close(); - try - { - proc.waitFor(); - } - catch(InterruptedException ie) - { - } - } - } + public void exec(String[] args) throws IOException + { + Process proc = Runtime.getRuntime().exec(args); + proc.getInputStream().close(); + proc.getOutputStream().close(); + proc.getErrorStream().close(); + try + { + proc.waitFor(); + } + catch(InterruptedException ie) + { + } + } + } - public static class MacOS extends Unix - { - public String getInstallDirectory(String name, String version) - { - return "/Applications/" + name + " " + version; - } - } + public static class MacOS extends Unix + { + public String getInstallDirectory(String name, String version) + { + return "/Applications/" + name + " " + version; + } + } - public static class Windows extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "C:\\Program Files\\" + name + " " + version; - } + public static class Windows extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "C:\\Program Files\\" + name + " " + version; + } - public class JEditLauncherOSTask extends OSTask - { - public JEditLauncherOSTask(Install installer) - { - super(installer,"jedit-launcher"); - } + public class JEditLauncherOSTask extends OSTask + { + public JEditLauncherOSTask(Install installer) + { + super(installer,"jedit-launcher"); + } - public String getDefaultDirectory(Install installer) - { - return null; - } + public String getDefaultDirectory(Install installer) + { + return null; + } - public void perform(String installDir, - Vector filesets) - { - if(!enabled - || !filesets.contains("jedit-windows")) - return; + public void perform(String installDir, + Vector filesets) + { + if(!enabled + || !filesets.contains("jedit-windows")) + return; - // run jEditLauncher installation - File executable = new File(installDir,"jedit.exe"); - if(!executable.exists()) - return; + // run jEditLauncher installation + File executable = new File(installDir,"jedit.exe"); + if(!executable.exists()) + return; - String[] args = { executable.getPath(), "/i", - System.getProperty("java.home") - + File.separator - + "bin" }; + String[] args = { executable.getPath(), "/i", + System.getProperty("java.home") + + File.separator + + "bin" }; - try - { - Runtime.getRuntime().exec(args).waitFor(); - } - catch(IOException io) - { - } - catch(InterruptedException ie) - { - } - } - } + try + { + Runtime.getRuntime().exec(args).waitFor(); + } + catch(IOException io) + { + } + catch(InterruptedException ie) + { + } + } + } - public OSTask[] getOSTasks(Install installer) - { - return new OSTask[] { /* new JEditLauncherOSTask(installer) */ }; - } - } + public OSTask[] getOSTasks(Install installer) + { + return new OSTask[] { /* new JEditLauncherOSTask(installer) */ }; + } + } - public static class HalfAnOS extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "C:\\" + name + " " + version; - } - } + public static class HalfAnOS extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "C:\\" + name + " " + version; + } + } - public static class VMS extends OperatingSystem - { - public String getInstallDirectory(String name, String version) - { - return "./" + name.toLowerCase() + "/" + version; - } - } + public static class VMS extends OperatingSystem + { + public String getInstallDirectory(String name, String version) + { + return "./" + name.toLowerCase() + "/" + version; + } + } - // private members - private static OperatingSystem os; + // private members + private static OperatingSystem os; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-12 05:54:38
|
Revision: 1140 Author: ian_lewis Date: 2006-08-11 22:54:18 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1140&view=rev Log Message: ----------- Added support for wrapper executables using launch4j in favor of jsmooth Modified Paths: -------------- tags/05pre3/jsxe/INSTALL tags/05pre3/jsxe/build.xml Added Paths: ----------- tags/05pre3/jsxe/installer/jsxe-installer.ico tags/05pre3/jsxe/installer/launch4j.xml tags/05pre3/jsxe/jsxe.ico tags/05pre3/jsxe/launch4j.xml Removed Paths: ------------- tags/05pre3/jsxe/buildlib/jsmoothgen-ant.jar tags/05pre3/jsxe/jsXe.jsmooth Modified: tags/05pre3/jsxe/INSTALL =================================================================== --- tags/05pre3/jsxe/INSTALL 2006-08-12 03:04:42 UTC (rev 1139) +++ tags/05pre3/jsxe/INSTALL 2006-08-12 05:54:18 UTC (rev 1140) @@ -2,6 +2,7 @@ Java 1.4.2 Xerces 2.8.0 +launch4j (for building the installer from source) GETTING jsXe @@ -24,6 +25,8 @@ 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 @@ -38,13 +41,28 @@ (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. -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. + +** 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 @@ -52,14 +70,14 @@ 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: tags/05pre3/jsxe/build.xml =================================================================== --- tags/05pre3/jsxe/build.xml 2006-08-12 03:04:42 UTC (rev 1139) +++ tags/05pre3/jsxe/build.xml 2006-08-12 05:54:18 UTC (rev 1140) @@ -15,10 +15,10 @@ 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> @@ -48,6 +48,12 @@ <property name="build.messages" value="${build.dir}/messages"/> <property name="docs.dir" value="${src.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"/> @@ -61,8 +67,9 @@ <!--<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="jsmooth.project" value="${root.dir}/jsXe.jsmooth"/> - <property name="jsmooth.jar" value="${buildlib.dir}/jsmoothgen-ant.jar"/> + <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"/> @@ -74,6 +81,10 @@ <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"/> @@ -144,7 +155,7 @@ </path> <path id="run-classpath"> - <pathelement location="${build.dir}/${app.name}.jar"/> + <pathelement location="${jsxe.jar}"/> <fileset dir="${lib.dir}"> <include name="**/*.jar"/> </fileset> @@ -152,13 +163,6 @@ <!-- }}} --> <!-- {{{ conditionals --> - <available file="${jsmooth.jar}" property="jsmooth.avail"/> - <condition property="windows.build"> - <and> - <os family="windows"/> - <istrue value="${jsmooth.avail}"/> - </and> - </condition> <!-- set whether we have the source for the default views --> @@ -166,6 +170,7 @@ <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="${launch4j.dir}" property="launch4j.avail"/> <available classname="org.apache.bsf.BSFException" property="bsf.avail"/> <available classname="org.mozilla.javascript.JavaScriptException" property="js.avail"/> @@ -177,21 +182,6 @@ <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}"/> @@ -247,6 +237,7 @@ <classpath refid="classpath"/> <include name="**/*.java"/> </javac> + <copy todir="${build.dest}"> <fileset dir="${build.src}"> <include name="**/*.props"/> @@ -280,7 +271,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"/> @@ -361,8 +352,9 @@ <!-- {{{ ============ Builds the installer ============================= --> <target depends="compile, prepare-build, doc" name="build-installer" description="Builds the installer"> - <fail unless="js.avail" message="You must have the ${buildlib.dir}/js.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> - <fail unless="bsf.avail" message="You must have the ${buildlib.dir}/bsf.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="js.avail" message="You must have the ${buildlib.dir}/js.jar in your classpath to build the installer. It is located in the ${buildlib.dir} directory. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="bsf.avail" message="You must have the ${buildlib.dir}/bsf.jar in your classpath to build the installer. It is located in the ${buildlib.dir} directory. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="launch4j.avail" message="You must install launch4j in ${launch4j.dir} or change the launch4j.dir property in build.xml"/> <fail unless="treeview.avail" message="You must have the treeview source available to build the installer."/> <fail unless="sourceview.avail" message="You must have the sourceview source available to build the installer."/> @@ -448,7 +440,7 @@ </fileset> </copy> - <copy file="${build.dir}/${app.name}.jar" tofile="${installer.program.dir}/${app.name}.jar"/> + <copy file="${jsxe.jar}" todir="${installer.program.dir}"/> <!-- lib --> <mkdir dir="${installer.program.dir}/lib"/> <copy todir="${installer.program.dir}/lib"> @@ -457,9 +449,27 @@ </fileset> </copy> + <!-- copy the lib directory so that the jsXe.exe can be run + from the build dir --> + <mkdir dir="${build.dir}/lib"/> + <copy todir="${build.dir}/lib"> + <fileset dir="${build.lib}"> + <include name="**/*"/> + </fileset> + </copy> + <!-- create the windows exe --> - <antcall target="build-exe"/> + <taskdef name="launch4j" + classname="net.sf.launch4j.ant.Launch4jTask" + classpath="${launch4j.classpath}"/> + <launch4j configFile="${launch4j.config}" + outfile="${launch4j.jsxe.exe}" + jarPath="${launch4j.jsxe.jar}" + /> + + <copy file="${jsxe.exe}" todir="${installer.program.dir}" /> + <!-- create the tar.bz2 for the installer --> <tar basedir="${installer.program.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-program.tar"/> <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-program.tar" destfile="${installer.build.program.tar}"/> @@ -595,7 +605,7 @@ <!-- }}} --> <!-- {{{ create the install jar --> - <jar jarfile="${build.dir}/${app.name}-${app_version}-install.jar" manifest="${installer.build.dir}/installer.manifest"> + <jar jarfile="${installer.jar}" manifest="${installer.build.dir}/installer.manifest"> <fileset dir="${installer.build.dest}"> <include name="**/*"/> </fileset> @@ -603,18 +613,16 @@ <!-- }}} --> </target> - <target name="build-exe" if="windows.build"> - <taskdef name="jsmoothgen" - classname="net.charabia.jsmoothgen.ant.JSmoothGen" - classpath="${jsmooth.jar}"/> - - <jsmoothgen project="${jsmooth.project}" skeletonroot="${buildlib.dir}/skeletons"/> - <copy todir="${installer.program.dir}" file="${build.dir}/jsXe.exe"/> - </target> <!-- }}} --> <!-- {{{ ============ Generates a windows distribution ================= --> - <target depends="build-installer" name="win" if="windows.build" description="Build a windows distribution"> + <target depends="build-installer" name="win" description="Build a windows distribution"> + <taskdef name="launch4j" + classname="net.sf.launch4j.ant.Launch4jTask" + classpath="${launch4j.classpath}"/> + <launch4j configFile="${installer.launch4j.config}" + jar="${installer.jar}" + outfile="${installer.exe}"/> </target> <!-- }}} --> <!-- {{{ ============ Generates the binary distribution ================ --> @@ -661,7 +669,7 @@ </fileset> </copy> - <copy file="${build.dir}/${app.name}.jar" tofile="${distbin.dir}/${app.name}.jar"/> + <copy file="${jsxe.jar}" todir="${distbin.dir}"/> <!-- lib --> <mkdir dir="${distbin.dir}/lib"/> <copy todir="${distbin.dir}/lib"> @@ -695,7 +703,7 @@ </fileset> </copy> - <!-- api --> + <!-- api --> <mkdir dir="${distsrc.dir}/doc/api"/> <copy todir="${distsrc.dir}/doc/api"> <fileset dir="${build.javadocs}"> @@ -747,7 +755,7 @@ <include name="**/*"/> </fileset> </copy> - <copy todir="${distsrc.dir}" file="${jsmooth.project}"/> + <copy todir="${distsrc.dir}" file="${launch4j.config}"/> <!-- messages --> <mkdir dir="${distsrc.dir}/messages"/> Deleted: tags/05pre3/jsxe/buildlib/jsmoothgen-ant.jar =================================================================== (Binary files differ) Added: tags/05pre3/jsxe/installer/jsxe-installer.ico =================================================================== (Binary files differ) Property changes on: tags/05pre3/jsxe/installer/jsxe-installer.ico ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: tags/05pre3/jsxe/installer/launch4j.xml =================================================================== --- tags/05pre3/jsxe/installer/launch4j.xml (rev 0) +++ tags/05pre3/jsxe/installer/launch4j.xml 2006-08-12 05:54:18 UTC (rev 1140) @@ -0,0 +1,20 @@ +<launch4jConfig> + <dontWrapJar>false</dontWrapJar> + <headerType>0</headerType> + <jar>..\build\jsXe-05_pre3-install.jar</jar> + <outfile>..\build\jsxe-installer.exe</outfile> + <errTitle>jsXe Installer</errTitle> + <jarArgs></jarArgs> + <chdir></chdir> + <customProcName>true</customProcName> + <stayAlive>false</stayAlive> + <icon>jsxe-installer.ico</icon> + <jre> + <path></path> + <minVersion>1.4.2</minVersion> + <maxVersion></maxVersion> + <initialHeapSize>16</initialHeapSize> + <maxHeapSize>64</maxHeapSize> + <args></args> + </jre> +</launch4jConfig> \ No newline at end of file Property changes on: tags/05pre3/jsxe/installer/launch4j.xml ___________________________________________________________________ Name: svn:executable + * Deleted: tags/05pre3/jsxe/jsXe.jsmooth =================================================================== --- tags/05pre3/jsxe/jsXe.jsmooth 2006-08-12 03:04:42 UTC (rev 1139) +++ tags/05pre3/jsxe/jsXe.jsmooth 2006-08-12 05:54:18 UTC (rev 1140) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<jsmoothproject> -<JVMSearchPath>registry</JVMSearchPath> -<JVMSearchPath>javahome</JVMSearchPath> -<JVMSearchPath>jrepath</JVMSearchPath> -<JVMSearchPath>jdkpath</JVMSearchPath> -<JVMSearchPath>exepath</JVMSearchPath> -<JVMSearchPath>jview</JVMSearchPath> -<classPath>build\jsXe.jar</classPath> -<embeddedJar>false</embeddedJar> -<executableName>build\jsXe.exe</executableName> -<iconLocation>src\net\sourceforge\jsxe\icons\jsxe.jpg</iconLocation> -<initialMemoryHeap>16777216</initialMemoryHeap> -<javaProperties> -<name>java.endorsed.dirs</name> -<value>lib</value> -</javaProperties> -<mainClassName>net.sourceforge.jsxe.jsXe</mainClassName> -<maximumMemoryHeap>67108864</maximumMemoryHeap> -<maximumVersion></maximumVersion> -<minimumVersion>1.4.2</minimumVersion> -<skeletonName>Windowed Wrapper</skeletonName> -<skeletonProperties> -<key>Message</key> -<value>Java has not been found on your computer. Do you want to download it?</value> -</skeletonProperties> -<skeletonProperties> -<key>URL</key> -<value>http://www.java.com</value> -</skeletonProperties> -<skeletonProperties> -<key>SingleProcess</key> -<value>0</value> -</skeletonProperties> -<skeletonProperties> -<key>Debug</key> -<value>0</value> -</skeletonProperties> -</jsmoothproject> Added: tags/05pre3/jsxe/jsxe.ico =================================================================== (Binary files differ) Property changes on: tags/05pre3/jsxe/jsxe.ico ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: tags/05pre3/jsxe/launch4j.xml =================================================================== --- tags/05pre3/jsxe/launch4j.xml (rev 0) +++ tags/05pre3/jsxe/launch4j.xml 2006-08-12 05:54:18 UTC (rev 1140) @@ -0,0 +1,23 @@ +<launch4jConfig> + <dontWrapJar>true</dontWrapJar> + <headerType>0</headerType> + <jar>jsXe.jar</jar> + <outfile>build\jsXe.exe</outfile> + <errTitle>jsXe</errTitle> + <jarArgs></jarArgs> + <chdir></chdir> + <customProcName>true</customProcName> + <stayAlive>false</stayAlive> + <icon>jsxe.ico</icon> + <jre> + <path></path> + <minVersion>1.4.2</minVersion> + <maxVersion></maxVersion> + <initialHeapSize>16</initialHeapSize> + <maxHeapSize>64</maxHeapSize> + <args>-Djava.endorsed.dirs=lib + + +</args> + </jre> +</launch4jConfig> \ No newline at end of file Property changes on: tags/05pre3/jsxe/launch4j.xml ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-12 03:04:46
|
Revision: 1139 Author: ian_lewis Date: 2006-08-11 20:04:42 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1139&view=rev Log Message: ----------- Fixed xhtml compliance Modified Paths: -------------- trunk/web/htdocs/downloads.php Modified: trunk/web/htdocs/downloads.php =================================================================== --- trunk/web/htdocs/downloads.php 2006-08-11 20:51:11 UTC (rev 1138) +++ trunk/web/htdocs/downloads.php 2006-08-12 03:04:42 UTC (rev 1139) @@ -58,7 +58,7 @@ <p>You can also edit the JSXEDIR variable in the batch program to be the directory where you installed jsXe and then the - 'Start in' directory can be anywhere.</p></li> + 'Start in' directory can be anywhere.</p> </li> </ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 20:51:17
|
Revision: 1138 Author: ian_lewis Date: 2006-08-11 13:51:11 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1138&view=rev Log Message: ----------- added planned feature for xhtml renderer Modified Paths: -------------- trunk/web/htdocs/features.php Modified: trunk/web/htdocs/features.php =================================================================== --- trunk/web/htdocs/features.php 2006-08-11 19:02:56 UTC (rev 1137) +++ trunk/web/htdocs/features.php 2006-08-11 20:51:11 UTC (rev 1138) @@ -68,6 +68,7 @@ <ul> <li>A schema designer view that uses <a href="http://www.jgraph.com/">JGraph</a></li> <li>A docbook editor view using <a href="http://vex.sourceforge.net/">Vex</a></li> + <li>An XHTML renderer using <a href="https://xhtmlrenderer.dev.java.net/">Flying Saucer</a></li> <li>Support for transforming XML documents using XSLT stylesheets.</li> <li>Support for Unlimited Undo (version 0.5 beta)</li> <li>Tag completion using DTD/Schema introspection (version 0.5 beta)</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 19:03:05
|
Revision: 1137 Author: ian_lewis Date: 2006-08-11 12:02:56 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1137&view=rev Log Message: ----------- Updated the instructions on how to run jsXe Modified Paths: -------------- trunk/web/htdocs/downloads.php Modified: trunk/web/htdocs/downloads.php =================================================================== --- trunk/web/htdocs/downloads.php 2006-08-11 19:00:35 UTC (rev 1136) +++ trunk/web/htdocs/downloads.php 2006-08-11 19:02:56 UTC (rev 1137) @@ -71,10 +71,10 @@ version.</p> </li> - <li><b>Unix</b> + <li><b>Unix/Linux</b> <p>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 + jsXe.jar file. There is a shell script included in the source tree for this purpose.</p> <p>./bin/jsXe.sh</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 19:00:42
|
Revision: 1136 Author: ian_lewis Date: 2006-08-11 12:00:35 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1136&view=rev Log Message: ----------- Fixed xhtml compliance and layout Modified Paths: -------------- trunk/web/htdocs/get-involved.php Modified: trunk/web/htdocs/get-involved.php =================================================================== --- trunk/web/htdocs/get-involved.php 2006-08-11 18:17:27 UTC (rev 1135) +++ trunk/web/htdocs/get-involved.php 2006-08-11 19:00:35 UTC (rev 1136) @@ -48,7 +48,7 @@ <p>If you are interested in working on jsXe's webpage, please <a href="http://lists.sourceforge.net/mailman/listinfo/jsxe-devel">subscribe</a> and send a mail to the jsxe-devel mailing list. The developers can help - get you started.</p>. Web developers should have some knowledge of CSS and + get you started. Web developers should have some knowledge of CSS and PHP.</p> <h3>Mailing Lists</h3> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 18:17:33
|
Revision: 1135 Author: ian_lewis Date: 2006-08-11 11:17:27 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1135&view=rev Log Message: ----------- Removed unnecssary branches Removed Paths: ------------- branches/vendor/ branches/web/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 14:32:33
|
Revision: 1134 Author: ian_lewis Date: 2006-08-11 07:32:25 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1134&view=rev Log Message: ----------- Creating tag for the 0.5 pre3 release Added Paths: ----------- tags/05pre3/sourceview/ Copied: tags/05pre3/sourceview (from rev 1133, trunk/sourceview) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 14:31:58
|
Revision: 1133 Author: ian_lewis Date: 2006-08-11 07:31:51 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1133&view=rev Log Message: ----------- Creating tag for the 0.5 pre3 release Added Paths: ----------- tags/05pre3/treeview/ Copied: tags/05pre3/treeview (from rev 1132, trunk/treeview) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 14:31:01
|
Revision: 1132 Author: ian_lewis Date: 2006-08-11 07:30:54 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1132&view=rev Log Message: ----------- Creating tag for the 0.5 pre3 release Added Paths: ----------- tags/05pre3/jsxe/ Copied: tags/05pre3/jsxe (from rev 1131, trunk/jsxe) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-11 14:28:43
|
Revision: 1131 Author: ian_lewis Date: 2006-08-11 07:28:21 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1131&view=rev Log Message: ----------- creating directory for the tag for the 0.5pre3 release Added Paths: ----------- tags/05pre3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-10 20:11:20
|
Revision: 1130 Author: ian_lewis Date: 2006-08-10 13:10:50 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1130&view=rev Log Message: ----------- Added the jsXe installer Modified Paths: -------------- trunk/jsxe/INSTALL trunk/jsxe/README trunk/jsxe/build.xml Added Paths: ----------- trunk/jsxe/buildlib/bsf.jar trunk/jsxe/buildlib/js.jar trunk/jsxe/installer/ trunk/jsxe/installer/done-HalfAnOS.html trunk/jsxe/installer/done-MacOS.html trunk/jsxe/installer/done-Unix.html trunk/jsxe/installer/done-VMS.html trunk/jsxe/installer/done-Windows.html trunk/jsxe/installer/gpl.html trunk/jsxe/installer/readme.html trunk/jsxe/installer/src/ trunk/jsxe/installer/src/installer/ trunk/jsxe/installer/src/installer/BZip2Constants.java trunk/jsxe/installer/src/installer/CBZip2InputStream.java trunk/jsxe/installer/src/installer/CBZip2OutputStream.java trunk/jsxe/installer/src/installer/CRC.java trunk/jsxe/installer/src/installer/ConsoleInstall.java trunk/jsxe/installer/src/installer/ConsoleProgress.java trunk/jsxe/installer/src/installer/Install.java trunk/jsxe/installer/src/installer/InstallThread.java trunk/jsxe/installer/src/installer/InvalidHeaderException.java trunk/jsxe/installer/src/installer/NonInteractiveInstall.java trunk/jsxe/installer/src/installer/OperatingSystem.java trunk/jsxe/installer/src/installer/Progress.java trunk/jsxe/installer/src/installer/SwingInstall.java trunk/jsxe/installer/src/installer/TarBuffer.java trunk/jsxe/installer/src/installer/TarEntry.java trunk/jsxe/installer/src/installer/TarHeader.java trunk/jsxe/installer/src/installer/TarInputStream.java trunk/jsxe/installer/src/installer/TarOutputStream.java trunk/jsxe/installer/src/installer/VariableGridLayout.java Modified: trunk/jsxe/INSTALL =================================================================== --- trunk/jsxe/INSTALL 2006-08-09 21:53:09 UTC (rev 1129) +++ trunk/jsxe/INSTALL 2006-08-10 20:10:50 UTC (rev 1130) @@ -1,7 +1,7 @@ REQUIREMENTS Java 1.4.2 -Xerces 2.6.2 +Xerces 2.8.0 GETTING jsXe Modified: trunk/jsxe/README =================================================================== --- trunk/jsxe/README 2006-08-09 21:53:09 UTC (rev 1129) +++ trunk/jsxe/README 2006-08-10 20:10:50 UTC (rev 1130) @@ -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: trunk/jsxe/build.xml =================================================================== --- trunk/jsxe/build.xml 2006-08-09 21:53:09 UTC (rev 1129) +++ trunk/jsxe/build.xml 2006-08-10 20:10:50 UTC (rev 1130) @@ -7,11 +7,13 @@ 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/ @@ -23,7 +25,20 @@ <!-- {{{ ============ 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="3"/> + <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 pre3"/> + <!-- Used in filenames --> + <property name="app_version" value="05_pre3"/> + <!-- }}} --> + <!-- {{{ build directories --> <property name="root.dir" value="."/> <property name="build.dir" value="${root.dir}/build"/> <property name="src.dir" value="${root.dir}/src"/> @@ -39,41 +54,85 @@ <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="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="jsmooth.project" value="${root.dir}/jsXe.jsmooth"/> + <property name="jsmooth.jar" value="${buildlib.dir}/jsmoothgen-ant.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.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"/> + <!-- }}} --> + <!-- {{{ 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-man.manpage" value="jsxe.1"/>--> + <property name="comp.count" value="4"/> + + <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"/> + <!-- }}} --> + <!-- {{{ 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="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"/> + <!-- {{{ classpaths --> <path id="classpath"> <pathelement location="."/> <pathelement location="${build.dest}"/> @@ -90,14 +149,30 @@ <include name="**/*.jar"/> </fileset> </path> + <!-- }}} --> + <!-- {{{ conditionals --> + <available file="${jsmooth.jar}" property="jsmooth.avail"/> + <condition property="windows.build"> + <and> + <os family="windows"/> + <istrue value="${jsmooth.avail}"/> + </and> + </condition> + <!-- 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 classname="org.apache.bsf.BSFException" property="bsf.avail"/> + <available classname="org.mozilla.javascript.JavaScriptException" property="js.avail"/> + <available file="${installer.dir}" property="installer.avail"/> + <!-- }}} --> + <echo message="${app.name} ${app.version}"/> <echo message="----------------------------------------------------------"/> </target> @@ -279,12 +354,271 @@ <link href="${xerces.javadoc.link}"/> </javadoc> - <zip basedir="${build.docs}" includes="api/**" zipfile="${build.dir}/${app.name}-${app_version}-api.zip"/> + <zip basedir="${build.javadocs}" includes="**/*" zipfile="${build.dir}/${app.name}-${app_version}-api.zip"/> </target> <!-- }}} --> + <!-- {{{ ============ Builds the installer ============================= --> + <target depends="compile, prepare-build, doc" name="build-installer" description="Builds the installer"> + + <fail unless="js.avail" message="You must have the ${buildlib.dir}/js.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="bsf.avail" message="You must have the ${buildlib.dir}/bsf.jar in your classpath to build the installer. See http://ant.apache.org/manual/install.html#librarydependencies"/> + <fail unless="treeview.avail" message="You must have the treeview source available to build the installer."/> + <fail unless="sourceview.avail" message="You must have the sourceview source available to build the installer."/> + + <!-- {{{ filesize script definition --> + <!-- taken from the ant manual + modified to get the total size of a directory structure + and set it to a property in Kb --> + <scriptdef name="filesize" language="javascript"> + <element name="fileset" type="fileset"/> + <attribute name="property"/> + <![CDATA[ + // import statements + // importPackage(java.io); + importClass(java.io.File); + + // Create a <fileset dir="" includes=""/> + filesets = elements.get("fileset"); + + for (i = 0; i < filesets.size(); i++) { + fs = filesets.get(i); + + // Get the files (array) of that fileset + ds = fs.getDirectoryScanner(project); + srcFiles = ds.getIncludedFiles(); + + size = 0; + // iterate over that array + for (i=0; i<srcFiles.length; i++) { + + // get the values via Java API + var basedir = fs.getDir(project); + var filename = srcFiles[i]; + var file = new File(basedir, filename); + + size += file.length(); + } + project.setNewProperty(attributes.get("property"), Math.round(size/1024)); + } + ]]> + </scriptdef> + <!-- }}} --> + + <!-- copy the installer source --> + <mkdir dir="${installer.build.dir}"/> + <copy todir="${installer.build.dir}"> + <fileset dir="${installer.dir}"> + <include name="**/*.java"/> + </fileset> + </copy> + + <!-- build the installer --> + <mkdir dir="${installer.build.dest}"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" includeJavaRuntime="${javac.include.runtime}" optimize="${javac.optimize}" source="${javac.source}" destdir="${installer.build.dest}" srcdir="${installer.build.src}"> + <include name="**/*.java"/> + </javac> + + <!-- copy html files --> + <copy todir="${installer.build.dest}/installer"> + <fileset dir="${installer.dir}"> + <include name="**/*.html"/> + </fileset> + </copy> + + <!-- {{{ create the program tar.bz2 file --> + + <mkdir dir="${installer.program.dir}"/> + + <mkdir dir="${installer.program.dir}/jars"/> + + <!-- doc --> + <mkdir dir="${installer.program.dir}/doc"/> + <copy todir="${installer.program.dir}/doc"> + <fileset dir="${build.docs}"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- messages --> + <mkdir dir="${installer.program.dir}/messages"/> + <copy todir="${installer.program.dir}/messages"> + <fileset dir="${build.messages}"> + <include name="**/messages*"/> + </fileset> + </copy> + + <copy file="${build.dir}/${app.name}.jar" tofile="${installer.program.dir}/${app.name}.jar"/> + <!-- lib --> + <mkdir dir="${installer.program.dir}/lib"/> + <copy todir="${installer.program.dir}/lib"> + <fileset dir="${build.lib}"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- create the windows exe --> + <antcall target="build-exe"/> + + <!-- create the tar.bz2 for the installer --> + <tar basedir="${installer.program.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-program.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-program.tar" destfile="${installer.build.program.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-program.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.0.disk-size"> + <fileset dir="${installer.program.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.0.real-size"> + <fileset file="${installer.build.program.tar}"/> + </filesize> + + <!-- }}} --> + + <!-- {{{ create the treeview tar.bz2 file --> + + <mkdir dir="${installer.treeview.dir}"/> + <mkdir dir="${installer.treeview.dir}/jars"/> + <copy todir="${installer.treeview.dir}/jars" file="${build.plugin}/treeview.jar"/> + + <tar basedir="${installer.treeview.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-treeview.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-treeview.tar" destfile="${installer.build.treeview.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-treeview.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.1.disk-size"> + <fileset dir="${installer.treeview.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.1.real-size"> + <fileset file="${installer.build.treeview.tar}"/> + </filesize> + + <!-- }}} --> + + <!-- {{{ create the sourceview tar.bz2 file --> + + <mkdir dir="${installer.sourceview.dir}"/> + <mkdir dir="${installer.sourceview.dir}/jars"/> + <copy todir="${installer.sourceview.dir}/jars" file="${build.plugin}/sourceview.jar"/> + + <tar basedir="${installer.sourceview.dir}" includes="**/*" tarfile="${installer.build.dir}/${app.name}-${app_version}-sourceview.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-sourceview.tar" destfile="${installer.build.sourceview.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-sourceview.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.2.disk-size"> + <fileset dir="${installer.sourceview.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.2.real-size"> + <fileset file="${installer.build.sourceview.tar}"/> + </filesize> + + <!-- }}} --> + + <!-- {{{ create the api tar.bz2 file --> + + <mkdir dir="${installer.api.dir}"/> + <mkdir dir="${installer.api.dir}/api"/> + <copy todir="${installer.api.dir}/api"> + <fileset dir="${build.javadocs}"> + <include name="**/*"/> + </fileset> + </copy> + + <tar basedir="${installer.api.dir}" excludes="*.class" includes="api/**" tarfile="${installer.build.dir}/${app.name}-${app_version}-api.tar"/> + <bzip2 src="${installer.build.dir}/${app.name}-${app_version}-api.tar" destfile="${installer.build.api.tar}"/> + <delete file="${installer.build.dir}/${app.name}-${app_version}-api.tar"/> + + <!-- find the file size of the files on disk and compressed files --> + <filesize property="comp.3.disk-size"> + <fileset dir="${installer.api.dir}"> + <include name="**/*"/> + </fileset> + </filesize> + + <filesize property="comp.3.real-size"> + <fileset file="${installer.build.api.tar}"/> + </filesize> + + <!-- }}} --> + + <!-- {{{ create the install.props file --> + <propertyfile comment="${app.name}'s installer properties" file="${install.props}"> + <entry key="app.name" value="${app.name}"/> + <entry key="app.version" value="${app.version}"/> + <entry key="app.readme" value="${app.readme}"/> + <entry key="app.license.title" value="${app.license.title}"/> + <entry key="app.license" value="${app.license}"/> + <entry key="ostask.unix-script.label" value="${ostask.unix-script.label}"/> + <!--<entry key="ostask.unix-man.label" value="${ostask.unix-man.label}"/>--> + <entry key="comp.count" value="${comp.count}"/> + <entry key="comp.0.name" value="${comp.0.name}"/> + <entry key="comp.0.disk-size" value="${comp.0.disk-size}"/> + <entry key="comp.0.real-size" value="${comp.0.real-size}"/> + <entry key="comp.0.fileset" value="${comp.0.fileset}"/> + + <entry key="comp.1.name" value="${comp.1.name}"/> + <entry key="comp.1.disk-size" value="${comp.1.disk-size}"/> + <entry key="comp.1.real-size" value="${comp.1.real-size}"/> + <entry key="comp.1.fileset" value="${comp.1.fileset}"/> + + <entry key="comp.2.name" value="${comp.2.name}"/> + <entry key="comp.2.disk-size" value="${comp.2.disk-size}"/> + <entry key="comp.2.real-size" value="${comp.2.real-size}"/> + <entry key="comp.2.fileset" value="${comp.2.fileset}"/> + + <entry key="comp.3.name" value="${comp.3.name}"/> + <entry key="comp.3.disk-size" value="${comp.3.disk-size}"/> + <entry key="comp.3.real-size" value="${comp.3.real-size}"/> + <entry key="comp.3.fileset" value="${comp.3.fileset}"/> + </propertyfile> + <!-- }}} --> + + <!-- {{{ create the manifest --> + <manifest file="${installer.build.dir}/installer.manifest"> + <attribute name="Built-By" value="${user.name}"/> + <attribute name="Main-Class" value="${installer.main.class}"/> + <section name="common"> + <attribute name="Implementation-Title" value="${app.name}"/> + <attribute name="Implementation-Version" value="${app.version} ${TODAY}"/> + </section> + </manifest> + <!-- }}} --> + + <!-- {{{ create the install jar --> + <jar jarfile="${build.dir}/${app.name}-${app_version}-install.jar" manifest="${installer.build.dir}/installer.manifest"> + <fileset dir="${installer.build.dest}"> + <include name="**/*"/> + </fileset> + </jar> + <!-- }}} --> + + </target> + <target name="build-exe" if="windows.build"> + <taskdef name="jsmoothgen" + classname="net.charabia.jsmoothgen.ant.JSmoothGen" + classpath="${jsmooth.jar}"/> + + <jsmoothgen project="${jsmooth.project}" skeletonroot="${buildlib.dir}/skeletons"/> + <copy todir="${installer.program.dir}" file="${build.dir}/jsXe.exe"/> + </target> + <!-- }}} --> + <!-- {{{ ============ Generates a windows distribution ================= --> + <target depends="build-installer" name="win" if="windows.build" description="Build a windows distribution"> + + </target> + <!-- }}} --> <!-- {{{ ============ Generates the binary distribution ================ --> - <target depends="compile, prepare-build, doc" name="bin" description="Build binary distribution"> + <target depends="compile, prepare-build, doc" name="bin" description="Build binary distributions"> <!-- plugins --> <mkdir dir="${distbin.dir}/jars"/> @@ -301,6 +635,16 @@ <include name="**/*"/> </fileset> </copy> + + + <!-- api --> + <mkdir dir="${distbin.dir}/doc/api"/> + <copy todir="${distbin.dir}/doc/api"> + <fileset dir="${build.javadocs}"> + <include name="**/*"/> + </fileset> + </copy> + <!-- bin --> <mkdir dir="${distbin.dir}/bin"/> <copy todir="${distbin.dir}/bin"> @@ -326,18 +670,14 @@ </fileset> </copy> - <!-- build the windows executable --> - <antcall target="build-exe"/> - + <!-- create the zip distr --> <zip basedir="${build.dir}" excludes="*.class" includes="${app.name}-${app_version}-bin/**" zipfile="${build.dir}/${app.name}-${app_version}-bin.zip"/> - </target> - <target name="build-exe" if="windows.build"> - <taskdef name="jsmoothgen" - classname="net.charabia.jsmoothgen.ant.JSmoothGen" - classpath="${jsmooth.jar}"/> - <jsmoothgen project="${jsmooth.project}" skeletonroot="${buildlib.dir}/skeletons"/> - <copy todir="${distbin.dir}" file="${build.dir}/jsXe.exe"/> + <!-- create the tar.bz2 distr --> + <tar basedir="${build.dir}" excludes="*.class" includes="${app.name}-${app_version}-bin/**" tarfile="${build.dir}/${app.name}-${app_version}-bin.tar"/> + <bzip2 src="${build.dir}/${app.name}-${app_version}-bin.tar" destfile="${build.dir}/${app.name}-${app_version}-bin.tar.bz2"/> + <delete file="${build.dir}/${app.name}-${app_version}-bin.tar"/> + </target> <!-- }}} --> <!-- {{{ ============ Generates the source distribution ================ --> @@ -345,6 +685,7 @@ <antcall target="copy-treeview-source"/> <antcall target="copy-sourceview-source"/> + <antcall target="copy-installer-source"/> <!-- doc --> <mkdir dir="${distsrc.dir}/doc"/> @@ -354,6 +695,14 @@ </fileset> </copy> + <!-- api --> + <mkdir dir="${distsrc.dir}/doc/api"/> + <copy todir="${distsrc.dir}/doc/api"> + <fileset dir="${build.javadocs}"> + <include name="**/*"/> + </fileset> + </copy> + <!-- move these files to the root dir of the src distribution --> <move file="${distsrc.dir}/doc/COPYING" tofile="${distsrc.dir}/COPYING"/> <move file="${distsrc.dir}/doc/README" tofile="${distsrc.dir}/README"/> @@ -408,7 +757,14 @@ </fileset> </copy> + <!-- create the zip --> <zip basedir="${build.dir}" excludes="*.class" includes="${app.name}-${app_version}-src/**" zipfile="${build.dir}/${app.name}-${app_version}-src.zip"/> + + <!-- create the tar.bz2 distr --> + <tar basedir="${build.dir}" excludes="*.class" includes="${app.name}-${app_version}-src/**" tarfile="${build.dir}/${app.name}-${app_version}-src.tar"/> + <bzip2 src="${build.dir}/${app.name}-${app_version}-src.tar" destfile="${build.dir}/${app.name}-${app_version}-src.tar.bz2"/> + <delete file="${build.dir}/${app.name}-${app_version}-src.tar"/> + </target> <target name="copy-treeview-source" if="treeview.avail"> <copy todir="${distsrc.dir}/jars"> @@ -430,6 +786,13 @@ </fileset> </copy> </target> + <target name="copy-installer-source" if="installer.avail"> + <copy todir="${distsrc.dir}/installer"> + <fileset dir="${installer.dir}"> + <include name="**/*"/> + </fileset> + </copy> + </target> <!-- }}} --> <!-- {{{ ============ Deploys documentation to the web module ========== --> <target depends="doc" name="deploy-web-doc" if="web.avail" description="Deploy documentation to the web module"> Added: trunk/jsxe/buildlib/bsf.jar =================================================================== (Binary files differ) Property changes on: trunk/jsxe/buildlib/bsf.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jsxe/buildlib/js.jar =================================================================== (Binary files differ) Property changes on: trunk/jsxe/buildlib/js.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jsxe/installer/done-HalfAnOS.html =================================================================== --- trunk/jsxe/installer/done-HalfAnOS.html (rev 0) +++ trunk/jsxe/installer/done-HalfAnOS.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,8 @@ +<html><body> + +jsXe has been installed successfully.<p> + +To start jEdit, run the <tt>jsxe.cmd</tt> script located in the +installation directory. + +</body></html> Property changes on: trunk/jsxe/installer/done-HalfAnOS.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/done-MacOS.html =================================================================== --- trunk/jsxe/installer/done-MacOS.html (rev 0) +++ trunk/jsxe/installer/done-MacOS.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,12 @@ +<html><body> + +jsXe has been installed successfully.<p> + +To start jsXe, run the <tt>jsxe</tt> command in a terminal window: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> jsxe <i>filename</i> ...</td></tt></tr></table> + +To find out about supported command-line options, run: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> jsxe --help</tt></td></tr></table> +</body></html> Property changes on: trunk/jsxe/installer/done-MacOS.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/done-Unix.html =================================================================== --- trunk/jsxe/installer/done-Unix.html (rev 0) +++ trunk/jsxe/installer/done-Unix.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,12 @@ +<html><body> + +jsXe has been installed successfully.<p> + +To start jsXe, run the <tt>jedit</tt> command in a terminal window: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> jsxe <i>filename</i> ...</td></tt></tr></table> + +To find out about supported command-line options, run: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> jsxe --help</tt></td></tr></table> +</body></html> Property changes on: trunk/jsxe/installer/done-Unix.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/done-VMS.html =================================================================== --- trunk/jsxe/installer/done-VMS.html (rev 0) +++ trunk/jsxe/installer/done-VMS.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,13 @@ +<html><body> + +jsXe has been installed successfully.<p> + +To start jsXe, run the following command in a terminal window: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> java -jar <i>disk</i>:[<i>dir</i>]jsXe.jar <i>filename</i> ...</td></tt></tr></table> + +To find out about supported command-line options, run: + +<table><tr><td bgcolor="#e0e0e0"><tt><b>$</b> java -jar <i>disk</i>:[<i>dir</i>]jsXe.jar --help</td></tt></tr></table> + +</body></html> Property changes on: trunk/jsxe/installer/done-VMS.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/done-Windows.html =================================================================== --- trunk/jsxe/installer/done-Windows.html (rev 0) +++ trunk/jsxe/installer/done-Windows.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,7 @@ +<html><body> + +jsXe has been installed successfully.<p> + +To start jsXe, double-click on <code>jsXe.exe</code> in the jsXe installation directory. + +</body></html> Property changes on: trunk/jsxe/installer/done-Windows.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/gpl.html =================================================================== --- trunk/jsxe/installer/gpl.html (rev 0) +++ trunk/jsxe/installer/gpl.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,471 @@ +<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN"> +<HTML> +<HEAD> +<TITLE>GNU General Public License - GNU Project - Free Software Foundation (FSF)</TITLE> +</HEAD> +<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" VLINK="#9900DD"> + +Version 2, June 1991<p> + +<code> +Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br> +59 Temple Place - Suite 330, Boston, MA 02111-1307, USA<p> + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +</code> + + + +<H2>Preamble</H2> + +<P> + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + +</P> +<P> + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +</P> +<P> + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +</P> +<P> + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +</P> +<P> + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +</P> +<P> + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +</P> +<P> + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + +</P> +<P> + The precise terms and conditions for copying, distribution and +modification follow. + +</P> + + +<H2>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2> + + +<P> + +<STRONG>0.</STRONG> + This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". +<P> + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + +<P> + +<STRONG>1.</STRONG> + You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. +<P> + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. +<P> + +<STRONG>2.</STRONG> + You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: +<P> + +<UL> + +<LI><STRONG>a)</STRONG> + You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + +<P> +<LI><STRONG>b)</STRONG> + You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + +<P> +<LI><STRONG>c)</STRONG> + If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +</UL> + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. +<P> + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. +<P> + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +<P> + +<STRONG>3.</STRONG> + You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + +<!-- we use this doubled UL to get the sub-sections indented, --> +<!-- while making the bullets as unobvious as possible. --> +<UL> + +<LI><STRONG>a)</STRONG> + Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + +<P> +<LI><STRONG>b)</STRONG> + Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + +<P> +<LI><STRONG>c)</STRONG> + Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) +</UL> + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. +<P> + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. +<P> + +<STRONG>4.</STRONG> + You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + +<P> + +<STRONG>5.</STRONG> + You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +<P> + +<STRONG>6.</STRONG> + Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + +<P> + +<STRONG>7.</STRONG> + If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. +<P> + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. +<P> + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. +<P> + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +<P> + +<STRONG>8.</STRONG> + If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +<P> + +<STRONG>9.</STRONG> + The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. +<P> + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + +<P> + + +<STRONG>10.</STRONG> + If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + + +<P><STRONG>NO WARRANTY</STRONG></P> + +<P> + +<STRONG>11.</STRONG> + BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +<P> + +<STRONG>12.</STRONG> + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +<P> + +<!-- +<H2>END OF TERMS AND CONDITIONS</H2> + + + +<H2>How to Apply These Terms to Your New Programs</H2> + +<P> + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + +</P> +<P> + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + +</P> + +<code> +<VAR>one line to give the program's name and an idea of what it does.</VAR> +Copyright (C) <VAR>yyyy</VAR> <VAR>name of author</VAR> + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</code> + +<P> +Also add information on how to contact you by electronic and paper mail. + +</P> +<P> +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + +</P> + +<code> +Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR><p> +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. +</code> + +<P> +The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> should show +the appropriate parts of the General Public License. Of course, the +commands you use may be called something other than <SAMP>`show w'</SAMP> and +<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever +suits your program. + +</P> +<P> +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + +</P> + +<code> +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision' +(which makes passes at compilers) written +by James Hacker.<p> + +<VAR>signature of Ty Coon</VAR>, 1 April 1989 +Ty Coon, President of Vice +</code> + +<P> +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. +--> +</BODY> +</HTML> Property changes on: trunk/jsxe/installer/gpl.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/readme.html =================================================================== --- trunk/jsxe/installer/readme.html (rev 0) +++ trunk/jsxe/installer/readme.html 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,25 @@ +<html> +<body> + +Simply fill out the required +information at each screen and click <b>Next</b>. Once all installation +parameters have been specified, the <b>Next</b> button changes to +read <b>Install</b>. Clicking it will then begin the installation +process.<p> + +The <b>Cancel</b> button will quit the installer without installing +anything; <b>Previous</b> will take you to the previous screen +(use it if you change your mind about a setting). + +<hr> + +jsXe is free software, released under the terms of the GNU General +Public License. The full text of the license is shown in the next page +of the installer.<p> + +Several class libraries bundled with jsXe are have other +licenses; once jsXe is installed, see the <code>README</code> +file for details. + +</body> +</html> Property changes on: trunk/jsxe/installer/readme.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/src/installer/BZip2Constants.java =================================================================== --- trunk/jsxe/installer/src/installer/BZip2Constants.java (rev 0) +++ trunk/jsxe/installer/src/installer/BZip2Constants.java 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,84 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package installer; + +/** + * Base class for both the compress and decompress classes. Holds common arrays, + * and static data. + * + * @author <a href="mailto:ke...@af...">Keiron Liddle</a> + */ +interface BZip2Constants +{ + int BASE_BLOCK_SIZE = 100000; + int MAX_ALPHA_SIZE = 258; + int MAX_CODE_LEN = 23; + int RUNA = 0; + int RUNB = 1; + int N_GROUPS = 6; + int G_SIZE = 50; + int N_ITERS = 4; + int MAX_SELECTORS = ( 2 + ( 900000 / G_SIZE ) ); + int NUM_OVERSHOOT_BYTES = 20; + + int[] RAND_NUMS = new int[] + { + 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, + 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, + 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, + 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, + 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, + 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, + 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, + 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, + 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, + 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, + 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, + 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, + 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, + 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, + 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, + 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, + 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, + 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, + 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, + 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, + 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, + 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, + 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, + 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, + 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, + 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, + 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, + 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, + 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, + 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, + 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, + 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, + 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, + 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, + 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, + 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, + 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, + 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, + 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, + 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, + 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, + 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, + 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, + 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, + 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, + 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, + 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, + 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, + 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, + 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, + 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, + 936, 638 + }; +} Property changes on: trunk/jsxe/installer/src/installer/BZip2Constants.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/installer/src/installer/CBZip2InputStream.java =================================================================== --- trunk/jsxe/installer/src/installer/CBZip2InputStream.java (rev 0) +++ trunk/jsxe/installer/src/installer/CBZip2InputStream.java 2006-08-10 20:10:50 UTC (rev 1130) @@ -0,0 +1,953 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package installer; + +import java.io.IOException; +import java.io.InputStream; + +/** + * An input stream that decompresses from the BZip2 format (without the file + * header chars) to be read as any other stream. + * + * @author <a href="mailto:ke...@af...">Keiron Liddle</a> + */ +public class CBZip2InputStream + extends InputStream + implements BZip2Constants +{ + private static final int START_BLOCK_STATE = 1; + private static final int RAND_PART_A_STATE = 2; + private static final int RAND_PART_B_STATE = 3; + private static final int RAND_PART_C_STATE = 4; + private static final int NO_RAND_PART_A_STATE = 5; + private static final int NO_RAND_PART_B_STATE = 6; + private static final int NO_RAND_PART_C_STATE = 7; + + private CRC m_crc = new CRC(); + private boolean[] m_inUse = new boolean[ 256 ]; + private char[] m_seqToUnseq = new char[ 256 ]; + private char[] m_unseqToSeq = new char[ 256 ]; + private char[] m_selector = new char[ MAX_SELECTORS ]; + private char[] m_selectorMtf = new char[ MAX_SELECTORS ]; + + /* + * freq table collected to save a pass over the data + * during decompression. + */ + private int[] m_unzftab = new int[ 256 ]; + + private int[][] m_limit = new int[ N_GROUPS ][ MAX_ALPHA_SIZE ]; + private int[][] m_base = new int[ N_GROUPS ][ MAX_ALPHA_SIZE ]; + private int[][] m_perm = new int[ N_GROUPS ][ MAX_ALPHA_SIZE ]; + private int[] m_minLens = new int[ N_GROUPS ]; + + private boolean m_streamEnd; + private int m_currentChar = -1; + + private int m_currentState = START_BLOCK_STATE; + private int m_rNToGo; + private int m_rTPos; + private int m_tPos; + + private int i2; + private int count; + private int chPrev; + private int ch2; + private int j2; + private char z; + + private boolean m_blockRandomised; + + /* + * always: in the range 0 .. 9. + * The current block size is 100000 * this number. + */ + private int m_blockSize100k; + private int m_bsBuff; + private int m_bsLive; + + private InputStream m_inp... [truncated message content] |
|
From: <ian...@us...> - 2006-08-09 21:53:17
|
Revision: 1129 Author: ian_lewis Date: 2006-08-09 14:53:09 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1129&view=rev Log Message: ----------- Added back undo for adding and removing nodes from the tree Modified Paths: -------------- trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java Added Paths: ----------- trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java Modified: trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java 2006-08-09 21:51:10 UTC (rev 1128) +++ trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java 2006-08-09 21:53:09 UTC (rev 1129) @@ -541,7 +541,7 @@ } int index = index(node); m_children.remove(node); - // addUndoableEdit(new RemoveNodeChange(this, node, index)); + addUndoableEdit(new RemoveNodeChange(this, node, index)); } else { //Remove from previous parent AdapterNode previousParent = node.getParentNode(); @@ -942,9 +942,9 @@ if (node != null) { int index = index(node); m_children.remove(node); - // if (index != -1) { - // addUndoableEdit(new RemoveNodeChange(this, node, index)); - // } + if (index != -1) { + addUndoableEdit(new RemoveNodeChange(this, node, index)); + } } }//}}} @@ -994,7 +994,7 @@ //{{{ fireNodeAdded() private void fireNodeAdded(AdapterNode source, AdapterNode child, int index) { - // addUndoableEdit(new AddNodeChange(source, child, index)); + addUndoableEdit(new AddNodeChange(source, child, index)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1006,7 +1006,7 @@ //{{{ fireNodeRemoved() private void fireNodeRemoved(AdapterNode source, AdapterNode child, int index) { - // addUndoableEdit(new RemoveNodeChange(source, child, index)); + addUndoableEdit(new RemoveNodeChange(source, child, index)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { Added: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java (rev 0) +++ trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java 2006-08-09 21:53:09 UTC (rev 1129) @@ -0,0 +1,90 @@ +/* +AddNodeChange.java +:tabSize=4:indentSize=4:noTabs=true: +:folding=explicit:collapseFolds=1: + +Copyright (C) 2006 Ian Lewis (Ian...@me...) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Optionally, you may find a copy of the GNU General Public License +from http://www.fsf.org/copyleft/gpl.txt +*/ + +package net.sourceforge.jsxe.dom.undo; + +//{{{ imports + +//{{{ jsXe classes +import net.sourceforge.jsxe.dom.AdapterNode; +import net.sourceforge.jsxe.util.Log; +//}}} + +//{{{ Swing classes +import javax.swing.undo.*; +//}}} + +//{{{ DOM classes +import org.w3c.dom.DOMException; +//}}} + +//}}} + +/** + * An undoable edit sigifying an addition of a child to an AdapterNode. + * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) + * @version $Id$ + * @see net.sourceforge.jsxe.dom.XMLDocument + * @see net.sourceforge.jsxe.dom.AdapterNode + */ +public class AddNodeChange extends AbstractUndoableEdit { + + private AdapterNode m_node; + private AdapterNode m_child; + private int m_index; + + //{{{ AddNodeChange constructor + public AddNodeChange(AdapterNode node, AdapterNode child, int index) { + m_node = node; + m_child = child; + m_index = index; + }//}}} + + //{{{ undo() + + public void undo() throws CannotUndoException { + super.undo(); + try { + Log.log(Log.DEBUG, this, "undo()"); + m_node.remove(m_child); + } catch (DOMException e) { + Log.log(Log.ERROR, this, e); + throw new CannotUndoException(); + } + }//}}} + + //{{{ redo() + + public void redo() throws CannotRedoException { + super.redo(); + try { + Log.log(Log.DEBUG, this, "redo()"); + m_node.addAdapterNodeAt(m_child, m_index); + } catch (DOMException e) { + Log.log(Log.ERROR, this, e); + throw new CannotRedoException(); + } + }//}}} + +} \ No newline at end of file Property changes on: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AddNodeChange.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java (rev 0) +++ trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java 2006-08-09 21:53:09 UTC (rev 1129) @@ -0,0 +1,90 @@ +/* +RemoveNodeChange.java +:tabSize=4:indentSize=4:noTabs=true: +:folding=explicit:collapseFolds=1: + +Copyright (C) 2006 Ian Lewis (Ian...@me...) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Optionally, you may find a copy of the GNU General Public License +from http://www.fsf.org/copyleft/gpl.txt +*/ + +package net.sourceforge.jsxe.dom.undo; + +//{{{ imports + +//{{{ jsXe classes +import net.sourceforge.jsxe.dom.AdapterNode; +import net.sourceforge.jsxe.util.Log; +//}}} + +//{{{ Swing classes +import javax.swing.undo.*; +//}}} + +//{{{ DOM classes +import org.w3c.dom.DOMException; +//}}} + +//}}} + +/** + * An undoable edit sigifying a removal of a child from an AdapterNode. + * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) + * @version $Id$ + * @see net.sourceforge.jsxe.dom.XMLDocument + * @see net.sourceforge.jsxe.dom.AdapterNode + */ +public class RemoveNodeChange extends AbstractUndoableEdit { + + private AdapterNode m_node; + private AdapterNode m_child; + private int m_index; + + //{{{ RemoveNodeChange constructor + public RemoveNodeChange(AdapterNode node, AdapterNode child, int index) { + m_node = node; + m_child = child; + m_index = index; + }//}}} + + //{{{ undo() + + public void undo() throws CannotUndoException { + super.undo(); + try { + Log.log(Log.DEBUG, this, "undo()"); + m_node.addAdapterNodeAt(m_child, m_index); + } catch (DOMException e) { + Log.log(Log.ERROR, this, e); + throw new CannotUndoException(); + } + }//}}} + + //{{{ redo() + + public void redo() throws CannotRedoException { + super.redo(); + try { + Log.log(Log.DEBUG, this, "redo()"); + m_node.remove(m_child); + } catch (DOMException e) { + Log.log(Log.ERROR, this, e); + throw new CannotRedoException(); + } + }//}}} + +} \ No newline at end of file Property changes on: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/RemoveNodeChange.java ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-09 21:51:14
|
Revision: 1128 Author: ian_lewis Date: 2006-08-09 14:51:10 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1128&view=rev Log Message: ----------- Fixed scope problem with isOk Modified Paths: -------------- trunk/treeview/src/treeview/action/AddNodeAction.java Modified: trunk/treeview/src/treeview/action/AddNodeAction.java =================================================================== --- trunk/treeview/src/treeview/action/AddNodeAction.java 2006-08-09 18:35:36 UTC (rev 1127) +++ trunk/treeview/src/treeview/action/AddNodeAction.java 2006-08-09 21:51:10 UTC (rev 1128) @@ -117,9 +117,9 @@ AdapterNode addedNode = null; if (selectedNode != null) { try { + boolean isOk = true; if (m_element != null) { XMLDocument document = selectedNode.getOwnerDocument(); - boolean isOk = true; try { document.beginCompoundEdit(); if (m_element.getAttributes().size() > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-09 18:35:50
|
Revision: 1127 Author: ian_lewis Date: 2006-08-09 11:35:36 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1127&view=rev Log Message: ----------- Added a new option to the global options dialog for the number of undo operations to remember Modified Paths: -------------- trunk/jsxe/Changelog trunk/jsxe/messages/messages trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java Modified: trunk/jsxe/Changelog =================================================================== --- trunk/jsxe/Changelog 2006-08-08 20:40:44 UTC (rev 1126) +++ trunk/jsxe/Changelog 2006-08-09 18:35:36 UTC (rev 1127) @@ -1,6 +1,11 @@ +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...> - * Addded undo/redo support for attributes. + * Added undo/redo support for attributes. 08/07/2006 Ian Lewis <Ian...@me...> Modified: trunk/jsxe/messages/messages =================================================================== --- trunk/jsxe/messages/messages 2006-08-08 20:40:44 UTC (rev 1126) +++ trunk/jsxe/messages/messages 2006-08-09 18:35:36 UTC (rev 1127) @@ -67,7 +67,9 @@ Global.Options.network-cache=Ask first, then cache remote files Global.Options.network-always=Always download without asking Global.Options.network=DTD and schema downloading: -Global.Options.Menu.Spill.Over=Number of items before menus spill over +Global.Options.Menu.Spill.Over=Number of items before menus spill over: +Global.Options.Undos.To.Remember=Number of undos to remember: +Global.Options.Undos.To.Remember.ToolTip=<HTML>jsXe will remember this number of undo operations in memory.<BR> However, it cannot remember undo operations after switching views</HTML> Shortcuts.Options.Title=Shortcuts Shortcuts.Options.Select.Label=Edit Shortcuts: Modified: trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java 2006-08-08 20:40:44 UTC (rev 1126) +++ trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java 2006-08-09 18:35:36 UTC (rev 1127) @@ -29,6 +29,7 @@ import net.sourceforge.jsxe.CatalogManager; import net.sourceforge.jsxe.gui.Messages; import javax.swing.JComboBox; +import javax.swing.JTextField; import java.util.Vector; //}}} @@ -92,6 +93,18 @@ Messages.getMessage("Global.Options.Menu.Spill.Over.ToolTip")); //}}} + //{{{ undos to remember + + int undo = jsXe.getIntegerProperty("undo.limit", 100); + + m_undosToRemember = new JTextField(Integer.toString(undo)); + + addComponent(Messages.getMessage("Global.Options.Undos.To.Remember"), + m_undosToRemember, + Messages.getMessage("Global.Options.Undos.To.Remember.ToolTip")); + + //}}} + //{{{ network String[] networkValues = { @@ -124,6 +137,11 @@ } catch (NumberFormatException nfe) { //Bad input, don't save. } + try { + jsXe.setIntegerProperty("undo.limit", Integer.parseInt(m_undosToRemember.getText())); + } catch (NumberFormatException nfe) { + //Bad input, don't save. + } jsXe.setIntegerProperty("xml.cache",network.getSelectedIndex()); CatalogManager.propertiesChanged(); }//}}} @@ -136,6 +154,7 @@ //{{{ Private Members private JComboBox menuSpillOverComboBox; private JComboBox maxRecentFilesComboBox; + private JTextField m_undosToRemember; private JComboBox network; //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-08 20:40:50
|
Revision: 1126 Author: ian_lewis Date: 2006-08-08 13:40:44 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1126&view=rev Log Message: ----------- Updated changelog Modified Paths: -------------- trunk/treeview/Changelog Modified: trunk/treeview/Changelog =================================================================== --- trunk/treeview/Changelog 2006-08-08 20:39:34 UTC (rev 1125) +++ trunk/treeview/Changelog 2006-08-08 20:40:44 UTC (rev 1126) @@ -1,3 +1,7 @@ +08/08/2006 Ian Lewis <Ian...@me...> + + * Fixed undo when adding/editing a node that is specified in a DTD/Schema. + 08/07/2006 Ian Lewis <Ian...@me...> * The Edit menu has been moved to jsXe core. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-08 20:39:38
|
Revision: 1125 Author: ian_lewis Date: 2006-08-08 13:39:34 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1125&view=rev Log Message: ----------- Fixed when adding nodes specified in a DTD/Schema Modified Paths: -------------- trunk/treeview/src/treeview/action/AddNodeAction.java trunk/treeview/src/treeview/action/EditNodeAction.java Modified: trunk/treeview/src/treeview/action/AddNodeAction.java =================================================================== --- trunk/treeview/src/treeview/action/AddNodeAction.java 2006-08-08 20:38:58 UTC (rev 1124) +++ trunk/treeview/src/treeview/action/AddNodeAction.java 2006-08-08 20:39:34 UTC (rev 1125) @@ -52,6 +52,7 @@ import net.sourceforge.jsxe.LocalizedAction; import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.TabbedView; +import net.sourceforge.jsxe.dom.XMLDocument; import net.sourceforge.jsxe.dom.AdapterNode; import net.sourceforge.jsxe.dom.completion.ElementDecl; import net.sourceforge.jsxe.dom.completion.EntityDecl; @@ -117,26 +118,41 @@ if (selectedNode != null) { try { if (m_element != null) { - if (m_element.getAttributes().size() > 0) { - EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(), - m_element, - new HashMap(), - m_element.empty, - m_element.completionInfo.getEntityHash(), - new ArrayList(), //don't support IDs for now. - selectedNode.getOwnerDocument()); - dialog.show(); - addedNode = selectedNode.addAdapterNode(dialog.getNewNode()); - } else { - addedNode = selectedNode.addAdapterNode(m_element.name, null, AdapterNode.ELEMENT_NODE, selectedNode.childCount()); + XMLDocument document = selectedNode.getOwnerDocument(); + boolean isOk = true; + try { + document.beginCompoundEdit(); + if (m_element.getAttributes().size() > 0) { + EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(), + m_element, + new HashMap(), + m_element.empty, + m_element.completionInfo.getEntityHash(), + new ArrayList(), //don't support IDs for now. + document); + dialog.show(); + isOk = (dialog.getNewNode() != null); + if (isOk) { + addedNode = selectedNode.addAdapterNode(dialog.getNewNode()); + } + } else { + addedNode = selectedNode.addAdapterNode(m_element.name, null, AdapterNode.ELEMENT_NODE, selectedNode.childCount()); + } + } finally { + document.endCompoundEdit(); } } else { //add the node of the correct type to the end of the children of this node addedNode = selectedNode.addAdapterNode(m_name, m_value, m_nodeType, selectedNode.childCount()); } - tree.expandPath(tree.getLeadSelectionPath()); - //The TreeModel doesn't automatically call treeNodesInserted() yet - tree.updateUI(); + + //if we hit cancel in the dialog we don't want to do this. + if (isOk) { + tree.expandPath(tree.getLeadSelectionPath()); + //The TreeModel doesn't automatically call treeNodesInserted() yet + tree.updateUI(); + } + } catch (DOMException dome) { JOptionPane.showMessageDialog(tree, dome, "XML Error", JOptionPane.WARNING_MESSAGE); Modified: trunk/treeview/src/treeview/action/EditNodeAction.java =================================================================== --- trunk/treeview/src/treeview/action/EditNodeAction.java 2006-08-08 20:38:58 UTC (rev 1124) +++ trunk/treeview/src/treeview/action/EditNodeAction.java 2006-08-08 20:39:34 UTC (rev 1125) @@ -54,6 +54,7 @@ import net.sourceforge.jsxe.gui.Messages; import net.sourceforge.jsxe.gui.TabbedView; import net.sourceforge.jsxe.dom.AdapterNode; +import net.sourceforge.jsxe.dom.XMLDocument; import net.sourceforge.jsxe.dom.completion.ElementDecl; //}}} @@ -86,18 +87,24 @@ AdapterNode addedNode = null; if (selectedNode != null && selectedNode.getNodeType() == AdapterNode.ELEMENT_NODE) { try { - ElementDecl element = selectedNode.getOwnerDocument().getElementDecl(selectedNode.getNodeName()); + XMLDocument document = selectedNode.getOwnerDocument(); + ElementDecl element = document.getElementDecl(selectedNode.getNodeName()); if (element != null) { - //Edit tag dialog needs to be reworked - EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(), - element, - new HashMap(), - element.empty, - element.completionInfo.getEntityHash(), - new ArrayList(), //don't support IDs for now. - selectedNode.getOwnerDocument(), - selectedNode); - dialog.show(); + + try { + document.beginCompoundEdit(); + EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(), + element, + new HashMap(), + element.empty, + element.completionInfo.getEntityHash(), + new ArrayList(), //don't support IDs for now. + selectedNode.getOwnerDocument(), + selectedNode); + dialog.show(); + } finally { + document.endCompoundEdit(); + } //The TreeModel doesn't automatically call treeNodesInserted() yet tree.updateUI(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-08 20:39:02
|
Revision: 1124 Author: ian_lewis Date: 2006-08-08 13:38:58 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1124&view=rev Log Message: ----------- Added fix if the owner document is null Modified Paths: -------------- trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java Modified: trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java 2006-08-08 20:15:25 UTC (rev 1123) +++ trunk/jsxe/src/net/sourceforge/jsxe/dom/AdapterNode.java 2006-08-08 20:38:58 UTC (rev 1124) @@ -37,6 +37,7 @@ //{{{ Java Base Classes import java.util.*; +import javax.swing.undo.UndoableEdit; //}}} //{{{ DOM classes @@ -540,7 +541,7 @@ } int index = index(node); m_children.remove(node); - // getOwnerDocument().addUndoableEdit(new RemoveNodeChange(this, node, index)); + // addUndoableEdit(new RemoveNodeChange(this, node, index)); } else { //Remove from previous parent AdapterNode previousParent = node.getParentNode(); @@ -942,7 +943,7 @@ int index = index(node); m_children.remove(node); // if (index != -1) { - // getOwnerDocument().addUndoableEdit(new RemoveNodeChange(this, node, index)); + // addUndoableEdit(new RemoveNodeChange(this, node, index)); // } } }//}}} @@ -993,7 +994,7 @@ //{{{ fireNodeAdded() private void fireNodeAdded(AdapterNode source, AdapterNode child, int index) { - // getOwnerDocument().addUndoableEdit(new AddNodeChange(source, child, index)); + // addUndoableEdit(new AddNodeChange(source, child, index)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1005,7 +1006,7 @@ //{{{ fireNodeRemoved() private void fireNodeRemoved(AdapterNode source, AdapterNode child, int index) { - // getOwnerDocument().addUndoableEdit(new RemoveNodeChange(source, child, index)); + // addUndoableEdit(new RemoveNodeChange(source, child, index)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1017,7 +1018,7 @@ //{{{ fireLocalNameChanged() private void fireLocalNameChanged(AdapterNode source, String oldValue, String newValue) { - getOwnerDocument().addUndoableEdit(new NodeNameChange(this, oldValue, newValue)); + addUndoableEdit(new NodeNameChange(this, oldValue, newValue)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1029,7 +1030,7 @@ //{{{ fireNamespaceChanged() private void fireNamespaceChanged(AdapterNode source, String oldValue, String newValue) { - getOwnerDocument().addUndoableEdit(new NodePrefixChange(this, oldValue, newValue)); + addUndoableEdit(new NodePrefixChange(this, oldValue, newValue)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1041,9 +1042,8 @@ //{{{ fireNodeValueChanged() private void fireNodeValueChanged(AdapterNode source, String oldValue, String newValue) { + addUndoableEdit(new NodeValueChange(this, oldValue, newValue)); - getOwnerDocument().addUndoableEdit(new NodeValueChange(this, oldValue, newValue)); - ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { AdapterNodeListener listener = (AdapterNodeListener)iterator.next(); @@ -1054,7 +1054,7 @@ //{{{ fireAttributeChanged() private void fireAttributeChanged(AdapterNode source, String attr, String oldValue, String newValue) { - getOwnerDocument().addUndoableEdit(new AttributeChange(this, attr, oldValue, newValue)); + addUndoableEdit(new AttributeChange(this, attr, oldValue, newValue)); ListIterator iterator = m_listeners.listIterator(); while (iterator.hasNext()) { @@ -1144,6 +1144,17 @@ } }//}}} + //{{{ addUndoableEdit() + private void addUndoableEdit(UndoableEdit edit) { + XMLDocument doc = getOwnerDocument(); + + //edits are not added if the document is null. The + //edits are just not undoable. + if (doc != null) { + doc.addUndoableEdit(edit); + } + }//}}} + private AdapterNode m_parentNode; private XMLDocument m_rootDocument; private XMLDocument m_lastRootDocument; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ian...@us...> - 2006-08-08 20:15:30
|
Revision: 1123 Author: ian_lewis Date: 2006-08-08 13:15:25 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1123&view=rev Log Message: ----------- Added undo/redo support for attributes Added Paths: ----------- trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java Added: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java (rev 0) +++ trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java 2006-08-08 20:15:25 UTC (rev 1123) @@ -0,0 +1,106 @@ +/* +AttributeChange.java +:tabSize=4:indentSize=4:noTabs=true: +:folding=explicit:collapseFolds=1: + +Copyright (C) 2006 Ian Lewis (Ian...@me...) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Optionally, you may find a copy of the GNU General Public License +from http://www.fsf.org/copyleft/gpl.txt +*/ + +package net.sourceforge.jsxe.dom.undo; + +//{{{ imports + +//{{{ jsXe classes +import net.sourceforge.jsxe.dom.AdapterNode; +//}}} + +//{{{ Swing classes +import javax.swing.undo.*; +//}}} + +//{{{ DOM classes +import org.w3c.dom.DOMException; +//}}} + +//}}} + +/** + * An undoable edit sigifying a change to an attribute into an element + * AdapterNode.. + * + * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) + * @version $Id$ + * @see net.sourceforge.jsxe.dom.XMLDocument + * @see net.sourceforge.jsxe.dom.AdapterNode + */ +public class AttributeChange extends AbstractUndoableEdit { + + private AdapterNode m_node; + private String m_name; + private String m_oldValue; + private String m_newValue; + + //{{{ AttributeChange constructor + /** + * @param name The qualified name of the attribute. + * @param oldValue The old value of the attribute. If null then the attribute was added. + * @param newValue The new value of the attribute. If null then the attribute was removed + */ + public AttributeChange(AdapterNode node, String name, String oldValue, String newValue) { + m_node = node; + m_name = name; + m_oldValue = oldValue; + m_newValue = newValue; + }//}}} + + //{{{ undo() + + public void undo() throws CannotUndoException { + super.undo(); + try { + if (m_oldValue != null) { + m_node.setAttribute(m_name, m_oldValue); + } else { + //if the old value is null then the attribute was added. + //we need to remove it here. + m_node.removeAttribute(m_name); + } + } catch (DOMException e) { + throw new CannotUndoException(); + } + }//}}} + + //{{{ redo() + + public void redo() throws CannotRedoException { + super.redo(); + try { + if (m_newValue != null) { + m_node.setAttribute(m_name, m_newValue); + } else { + //if the new value is null then the attribute was removed + //we need to remove it here. + m_node.removeAttribute(m_name); + } + } catch (DOMException e) { + throw new CannotRedoException(); + } + }//}}} + +} \ No newline at end of file Property changes on: trunk/jsxe/src/net/sourceforge/jsxe/dom/undo/AttributeChange.java ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
