Tried JNLP, not workingas expected, so diabled. Artifacts remain.
Bug fixes committer: Jonathan Bernard <jdbernard@gmail.com>
This commit is contained in:
parent
2b850b9586
commit
0914ea5b6c
@ -8,4 +8,5 @@
|
||||
./clean_trailing_whitespace.sh nbproject/*.xml
|
||||
./clean_trailing_whitespace.sh nbproject/project.*
|
||||
./clean_trailing_whitespace.sh nbproject/*.properties
|
||||
./clean_trailing_whitespace.sh nbproject/configs/*.properties
|
||||
./clean_trailing_whitespace.sh nbproject/private/private.*
|
||||
|
21
master.jnlp
Executable file
21
master.jnlp
Executable file
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jnlp spec="1.0+" codebase="${jnlp.codebase}" href="launch.jnlp">
|
||||
<information>
|
||||
<title>${APPLICATION.TITLE}</title>
|
||||
<vendor>${APPLICATION.VENDOR}</vendor>
|
||||
<homepage href="${APPLICATION.HOMEPAGE}"/>
|
||||
<description>${APPLICATION.DESC}</description>
|
||||
<description kind="short">${APPLICATION.DESC.SHORT}</description>
|
||||
<!--${JNLP.ICONS}-->
|
||||
<!--${JNLP.OFFLINE.ALLOWED}-->
|
||||
</information>
|
||||
<!--${JNLP.SECURITY}-->
|
||||
<resources>
|
||||
<!--${JNLP.RESOURCES.RUNTIME}-->
|
||||
<!--${JNLP.RESOURCES.MAIN.JAR}-->
|
||||
<!--${JNLP.RESOURCES.JARS}-->
|
||||
</resources>
|
||||
<application-desc main-class="${jnlp.main.class}">
|
||||
<!--${JNLP.APPLICATION.ARGS}-->
|
||||
</application-desc>
|
||||
</jnlp>
|
@ -20,6 +20,7 @@ is divided into following sections:
|
||||
|
||||
-->
|
||||
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="TimeStamper-impl">
|
||||
<import file="jnlp-impl.xml"/>
|
||||
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
|
||||
<!--
|
||||
======================
|
||||
@ -409,7 +410,7 @@ is divided into following sections:
|
||||
<!-- Empty placeholder for easier customization. -->
|
||||
<!-- You can override this target in the ../build.xml file. -->
|
||||
</target>
|
||||
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
|
||||
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>
|
||||
<!--
|
||||
=================
|
||||
EXECUTION SECTION
|
||||
|
4
nbproject/configs/JWS_generated.properties
Executable file
4
nbproject/configs/JWS_generated.properties
Executable file
@ -0,0 +1,4 @@
|
||||
#Tue Sep 09 15:11:02 CDT 2008
|
||||
$label=Web Start
|
||||
$target.debug=jws-debug
|
||||
$target.run=jws-run
|
@ -3,6 +3,6 @@ build.xml.script.CRC32=6e5ad54e
|
||||
build.xml.stylesheet.CRC32=be360661
|
||||
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
|
||||
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
|
||||
nbproject/build-impl.xml.data.CRC32=6a978a17
|
||||
nbproject/build-impl.xml.script.CRC32=b108e4f5
|
||||
nbproject/build-impl.xml.data.CRC32=52850847
|
||||
nbproject/build-impl.xml.script.CRC32=adeac2b5
|
||||
nbproject/build-impl.xml.stylesheet.CRC32=487672f9
|
||||
|
461
nbproject/jnlp-impl.xml
Executable file
461
nbproject/jnlp-impl.xml
Executable file
@ -0,0 +1,461 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
|
||||
|
||||
Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
|
||||
|
||||
|
||||
The contents of this file are subject to the terms of either the GNU
|
||||
General Public License Version 2 only ("GPL") or the Common
|
||||
Development and Distribution License("CDDL") (collectively, the
|
||||
"License"). You may not use this file except in compliance with the
|
||||
License. You can obtain a copy of the License at
|
||||
http://www.netbeans.org/cddl-gplv2.html
|
||||
or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
|
||||
specific language governing permissions and limitations under the
|
||||
License. When distributing the software, include this License Header
|
||||
Notice in each file and include the License file at
|
||||
nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
|
||||
particular file as subject to the "Classpath" exception as provided
|
||||
by Sun in the GPL Version 2 section of the License file that
|
||||
accompanied this code. If applicable, add the following below the
|
||||
License Header, with the fields enclosed by brackets [] replaced by
|
||||
your own identifying information:
|
||||
"Portions Copyrighted [year] [name of copyright owner]"
|
||||
|
||||
Contributor(s):
|
||||
|
||||
The Original Software is NetBeans. The Initial Developer of the Original
|
||||
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
|
||||
Microsystems, Inc. All Rights Reserved.
|
||||
|
||||
If you wish your version of this file to be governed by only the CDDL
|
||||
or only the GPL Version 2, indicate your decision by adding
|
||||
"[Contributor] elects to include this software in this distribution
|
||||
under the [CDDL or GPL Version 2] license." If you do not indicate a
|
||||
single choice of license, a recipient has the option to distribute
|
||||
your version of this file under either the CDDL, the GPL Version 2 or
|
||||
to extend the choice of license to its licensees as provided above.
|
||||
However, if you add GPL Version 2 code and therefore, elected the GPL
|
||||
Version 2 license, then the option applies only if the new code is
|
||||
made subject to such option by the copyright holder.
|
||||
-->
|
||||
|
||||
<project name="jnlp-impl" default="default" basedir="..">
|
||||
|
||||
<property name="master.jnlp.file" location="master.jnlp"/>
|
||||
<property name="launch.jnlp.file" value="launch.jnlp"/>
|
||||
<property name="jnlp.dest.dir" location="dist"/>
|
||||
|
||||
<!-- helper file to create list of arguments, etc. -->
|
||||
<property name="helper.file" location="helper.txt"/>
|
||||
|
||||
<target name="default">
|
||||
<echo message="Default target is not set."/>
|
||||
</target>
|
||||
|
||||
<!-- Main target -->
|
||||
|
||||
<target name="jnlp" depends="-init-check,-test-jnlp-enabled" if="is.jnlp.enabled">
|
||||
<delete file="dist/lib/javaws.jar" failonerror="false"/>
|
||||
<antcall target="generate-jnlp"/>
|
||||
</target>
|
||||
|
||||
<!-- Generate master -->
|
||||
|
||||
<target name="-check-for-master.jnlp">
|
||||
<available file="${master.jnlp.file}" property="master.jnlp.exists"/>
|
||||
</target>
|
||||
<target name="jnlp-init-generate-master" depends="-check-for-master.jnlp" unless="master.jnlp.exists">
|
||||
<echo file="${master.jnlp.file}" encoding="UTF-8"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jnlp spec="1.0+" codebase="$${jnlp.codebase}" href="launch.jnlp">
|
||||
<information>
|
||||
<title>$${APPLICATION.TITLE}</title>
|
||||
<vendor>$${APPLICATION.VENDOR}</vendor>
|
||||
<homepage href="$${APPLICATION.HOMEPAGE}"/>
|
||||
<description>$${APPLICATION.DESC}</description>
|
||||
<description kind="short">$${APPLICATION.DESC.SHORT}</description>
|
||||
<!--$${JNLP.ICONS}-->
|
||||
<!--$${JNLP.OFFLINE.ALLOWED}-->
|
||||
</information>
|
||||
<!--$${JNLP.SECURITY}-->
|
||||
<resources>
|
||||
<!--$${JNLP.RESOURCES.RUNTIME}-->
|
||||
<!--$${JNLP.RESOURCES.MAIN.JAR}-->
|
||||
<!--$${JNLP.RESOURCES.JARS}-->
|
||||
</resources>
|
||||
<application-desc main-class="$${jnlp.main.class}">
|
||||
<!--$${JNLP.APPLICATION.ARGS}-->
|
||||
</application-desc>
|
||||
</jnlp>
|
||||
]]></echo>
|
||||
</target>
|
||||
|
||||
<!-- Initial check -->
|
||||
|
||||
<target name="-init-check">
|
||||
<fail unless="application.title" message="Must set application title."/>
|
||||
<fail unless="application.vendor" message="Must set application vendor."/>
|
||||
</target>
|
||||
|
||||
<!-- Icons -->
|
||||
|
||||
<target name="-init-icons" depends="-preinit-icons,-set-icon-elem,-set-splash-elem">
|
||||
<property name="jnlp.icon.elem" value=""/>
|
||||
<property name="application.splash.elem" value=""/>
|
||||
<property name="icon.separator" value=""/>
|
||||
<property name="jnlp.icons.value" value="${jnlp.icon.elem}${icon.separator}${application.splash.elem}"/>
|
||||
</target>
|
||||
<target name="-preinit-icons" depends="-copy-app-icon,-copy-app-splash"/>
|
||||
<target name="-copy-app-icon" if="jnlp.icon" depends="-get-app-icon-name">
|
||||
<copy file="${jnlp.icon}" todir="${jnlp.dest.dir}" failonerror="false"/>
|
||||
<available file="${jnlp.dest.dir}${file.separator}${jnlp.icon.name}" property="jnlp.icon.copied"/>
|
||||
</target>
|
||||
<target name="-copy-app-splash" if="application.splash" depends="-get-app-splash-name">
|
||||
<copy file="${application.splash}" todir="${jnlp.dest.dir}" failonerror="false"/>
|
||||
<available file="${jnlp.dest.dir}${file.separator}${application.splash.name}" property="application.splash.copied"/>
|
||||
</target>
|
||||
<target name="-get-app-icon-name" if="jnlp.icon">
|
||||
<dirname file="${jnlp.icon}" property="jnlp.icon.basedir"/>
|
||||
<pathconvert property="jnlp.icon.name" setonempty="false">
|
||||
<path location="${jnlp.icon}"/>
|
||||
<map from="${jnlp.icon.basedir}${file.separator}" to=""/>
|
||||
</pathconvert>
|
||||
</target>
|
||||
<target name="-get-app-splash-name" if="application.splash">
|
||||
<dirname file="${application.splash}" property="application.splash.basedir"/>
|
||||
<pathconvert property="application.splash.name" setonempty="false">
|
||||
<path location="${application.splash}"/>
|
||||
<map from="${application.splash.basedir}${file.separator}" to=""/>
|
||||
</pathconvert>
|
||||
</target>
|
||||
<target name="-set-icon-elem" if="jnlp.icon.copied">
|
||||
<property name="jnlp.icon.elem" value=' <icon href="${jnlp.icon.name}" kind="default"/>'/>
|
||||
</target>
|
||||
<target name="-set-splash-elem" if="application.splash.copied" depends="-set-icon-elem">
|
||||
<property name="application.splash.elem" value=' <icon href="${application.splash.name}" kind="splash"/>'/>
|
||||
<condition property="icon.separator" value="${line.separator}">
|
||||
<isset property="jnlp.icon.elem"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<!-- Offline-Allowed -->
|
||||
|
||||
<target name="-init-offline" if="offline.allowed.set" depends="-preinit-offline">
|
||||
<property name="jnlp.offline.allowed.value" value=" <offline-allowed/>"/>
|
||||
</target>
|
||||
<target name="-preinit-offline">
|
||||
<condition property="offline.allowed.set">
|
||||
<equals arg1="${jnlp.offline-allowed}" arg2="true" trim="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<!-- Descriptions -->
|
||||
|
||||
<target name="-init-descriptions" depends="-descriptions-props-check,-init-desc-value,-init-desc-value-short">
|
||||
<property name="application.desc.value" value="${application.title}"/>
|
||||
<property name="application.desc.short.value" value="${application.title}"/>
|
||||
</target>
|
||||
<target name="-descriptions-props-check">
|
||||
<condition property="application.desc.set">
|
||||
<and>
|
||||
<isset property="application.desc"/>
|
||||
<not>
|
||||
<equals arg1="${application.desc}" arg2="" trim="true"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="application.desc.short.set">
|
||||
<and>
|
||||
<isset property="application.desc.short"/>
|
||||
<not>
|
||||
<equals arg1="${application.desc.short}" arg2="" trim="true"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-init-desc-value" if="application.desc.set">
|
||||
<property name="application.desc.value" value="${application.desc}"/>
|
||||
</target>
|
||||
<target name="-init-desc-value-short" if="application.desc.short.set">
|
||||
<property name="application.desc.short.value" value="${application.desc.short}"/>
|
||||
</target>
|
||||
|
||||
<!-- Security -->
|
||||
|
||||
<target name="-init-security" depends="-check-signing-possible" if="jnlp.signed.true+signjarstask.available">
|
||||
<property name="jnlp.security" value=" <security>${line.separator} <all-permissions/>${line.separator} </security>"/>
|
||||
</target>
|
||||
<target name="-security-props-check">
|
||||
<condition property="jnlp.signed.true">
|
||||
<istrue value="${jnlp.signed}"/>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-jnlp-init-keystore" depends="-jnlp-init-keystore-props,-check-keystore-exists" unless="jnlp.signjar.keystore.exists">
|
||||
<echo message="${application.vendor}" file="${helper.file}"/>
|
||||
<loadfile property="application.vendor.filtered" srcfile="${helper.file}">
|
||||
<filterchain>
|
||||
<deletecharacters chars=","/>
|
||||
</filterchain>
|
||||
</loadfile>
|
||||
<delete file="${helper.file}"/>
|
||||
<property name="jnlp.signjar.vendor" value="CN=${application.vendor.filtered}"/>
|
||||
<echo message="Going to create default keystore in ${jnlp.signjar.keystore}"/>
|
||||
<genkey dname="${jnlp.signjar.vendor}" alias="${jnlp.signjar.alias}" keystore="${jnlp.signjar.keystore}"
|
||||
storepass="${jnlp.signjar.storepass}" keypass="${jnlp.signjar.keypass}"/>
|
||||
</target>
|
||||
<target name="-check-keystore-exists">
|
||||
<available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}"/>
|
||||
</target>
|
||||
<target name="-jnlp-init-keystore-props">
|
||||
<property name="jnlp.signjar.keystore" value="${basedir}/build/nb-jws.ks"/>
|
||||
<property name="jnlp.signjar.storepass" value="storepass"/>
|
||||
<property name="jnlp.signjar.keypass" value="keypass"/>
|
||||
<property name="jnlp.signjar.alias" value="nb-jws"/>
|
||||
</target>
|
||||
|
||||
<!-- Generating JNLP file -->
|
||||
|
||||
<target name="generate-jnlp" depends="jnlp-init-generate-master,-init-codebase,-init-resources-runtime,-init-security,-init-resources-jars,-init-application-args,-init-icons,-init-offline,-init-descriptions,jnlp-init-notinited">
|
||||
<copy file="${master.jnlp.file}" tofile="${jnlp.dest.dir}/${launch.jnlp.file}__" overwrite="true" encoding="UTF-8">
|
||||
<filterchain>
|
||||
<replacestring from="$${jnlp.codebase}" to="${jnlp.codebase.value}"/>
|
||||
<replacestring from="<!--$${JNLP.ICONS}-->" to="${jnlp.icons.value}"/>
|
||||
<replacestring from="<!--$${JNLP.SECURITY}-->" to="${jnlp.security}"/>
|
||||
<replacestring from="<!--$${JNLP.OFFLINE.ALLOWED}-->" to="${jnlp.offline.allowed.value}"/>
|
||||
<replacestring from="<!--$${JNLP.RESOURCES.RUNTIME}-->" to="${jnlp.resources.runtime.value}"/>
|
||||
<replacestring from="<!--$${JNLP.RESOURCES.MAIN.JAR}-->" to="${jnlp.resources.main.jar.value}"/>
|
||||
<replacestring from="<!--$${JNLP.RESOURCES.JARS}-->" to="${jnlp.resources.jars.value}"/>
|
||||
<replacestring from="<!--$${JNLP.APPLICATION.ARGS}-->" to="${jnlp.application.args.value}"/>
|
||||
<replacestring from="$${APPLICATION.TITLE}" to="${application.title}"/>
|
||||
<replacestring from="$${APPLICATION.VENDOR}" to="${application.vendor}"/>
|
||||
<replacestring from="$${APPLICATION.DESC}" to="${application.desc.value}"/>
|
||||
<replacestring from="$${APPLICATION.DESC.SHORT}" to="${application.desc.short.value}"/>
|
||||
<replacestring from="$${APPLICATION.HOMEPAGE}" to="${application.homepage}"/>
|
||||
<replacestring from="$${jnlp.main.class}" to="${main.class}"/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
<antcall target="-strip-empty-lines"/>
|
||||
<antcall target="-generate-html-page"/>
|
||||
</target>
|
||||
<target name="jnlp-init-notinited">
|
||||
<property name="jnlp.security" value=""/>
|
||||
<property name="jnlp.offline.allowed.value" value=""/>
|
||||
<property name="application.homepage" value=""/>
|
||||
<property name="jnlp.application.args.value" value=""/>
|
||||
</target>
|
||||
<target name="-strip-empty-lines">
|
||||
<move file="${jnlp.dest.dir}/${launch.jnlp.file}__" tofile="${jnlp.dest.dir}/${launch.jnlp.file}" overwrite="true" encoding="UTF-8">
|
||||
<filterchain>
|
||||
<linecontainsregexp>
|
||||
<regexp pattern=".+"/>
|
||||
</linecontainsregexp>
|
||||
</filterchain>
|
||||
</move>
|
||||
</target>
|
||||
|
||||
<!-- Codebase processing -->
|
||||
|
||||
<target name="-init-codebase" depends="-codebase-props-check,-init-non-user-codebase,-init-user-codebase"/>
|
||||
<target name="-codebase-props-check">
|
||||
<condition property="local.codebase">
|
||||
<or>
|
||||
<not>
|
||||
<isset property="jnlp.codebase.type"/>
|
||||
</not>
|
||||
<equals arg1="${jnlp.codebase.type}" arg2="local" trim="true"/>
|
||||
</or>
|
||||
</condition>
|
||||
<condition property="non.user.codebase">
|
||||
<or>
|
||||
<not>
|
||||
<isset property="jnlp.codebase.type"/>
|
||||
</not>
|
||||
<equals arg1="${jnlp.codebase.type}" arg2="local" trim="true"/>
|
||||
<equals arg1="${jnlp.codebase.type}" arg2="web" trim="true"/>
|
||||
</or>
|
||||
</condition>
|
||||
<condition property="user.codebase">
|
||||
<equals arg1="${jnlp.codebase.type}" arg2="user" trim="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-init-non-user-codebase" if="non.user.codebase">
|
||||
<property name="jnlp.codebase.value" value="${jnlp.codebase.url}"/>
|
||||
</target>
|
||||
<target name="-init-user-codebase" if="user.codebase">
|
||||
<property name="jnlp.codebase.value" value="${jnlp.codebase.user}"/>
|
||||
</target>
|
||||
|
||||
<!-- j2se resources -->
|
||||
|
||||
<target name="-init-resources-runtime" depends="-init-runtime-props">
|
||||
<property name="run.jvmargs.value" value=""/>
|
||||
<property name="initial-heap-size.value" value=""/>
|
||||
<property name="max-heap-size.value" value=""/>
|
||||
<property name="jnlp.resources.runtime.value"
|
||||
value=' <j2se version="${javac.target}+"${initial-heap-size.value}${max-heap-size.value}${run.jvmargs.value}/>'/>
|
||||
</target>
|
||||
<target name="-init-runtime-props" depends="-runtime-props-check,-init-run-jvmargs-value,-init-initial-heap-size-value,-init-max-heap-size-value"/>
|
||||
<target name="-runtime-props-check">
|
||||
<condition property="run.jvmargs.set">
|
||||
<and>
|
||||
<isset property="run.jvmargs"/>
|
||||
<not>
|
||||
<equals arg1="${run.jvmargs}" arg2="" trim="true"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="jnlp.initial-heap-size.set">
|
||||
<and>
|
||||
<isset property="jnlp.initial-heap-size"/>
|
||||
<not>
|
||||
<equals arg1="${jnlp.initial-heap-size}" arg2="" trim="true"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="jnlp.max-heap-size.set">
|
||||
<and>
|
||||
<isset property="jnlp.max-heap-size"/>
|
||||
<not>
|
||||
<equals arg1="${jnlp.max-heap-size}" arg2="" trim="true"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-init-run-jvmargs-value" if="run.jvmargs.set">
|
||||
<property name="run.jvmargs.value" value=' java-vm-args="${run.jvmargs}"'/>
|
||||
</target>
|
||||
<target name="-init-initial-heap-size-value" if="jnlp.initial-heap-size.set">
|
||||
<property name="initial-heap-size.value" value=' initial-heap-size="${jnlp.initial-heap-size}"'/>
|
||||
</target>
|
||||
<target name="-init-max-heap-size-value" if="jnlp.max-heap-size.set">
|
||||
<property name="max-heap-size.value" value=' max-heap-size="${jnlp.max-heap-size}"'/>
|
||||
</target>
|
||||
|
||||
<!-- JAR resources -->
|
||||
|
||||
<target name="-init-resources-jars" depends="-preinit-resources-unsigned-jars,-preinit-resources-signed-jars,-preinit-resources-main-jar"/>
|
||||
<target name="-preinit-resources-unsigned-jars" depends="-exclude-javaws-from-cp,-check-signing-possible" unless="jnlp.signed.true+signjarstask.available">
|
||||
<pathconvert pathsep="${line.separator}" property="jnlp.resources.jars.value">
|
||||
<path path="${run.classpath.without.javaws.jar}"/>
|
||||
<mapper type="regexp" from="^.*[/\\]([^/\\]+\.jar)"
|
||||
to=' <jar href="lib/\1" download="eager"/>'/>
|
||||
</pathconvert>
|
||||
</target>
|
||||
<target name="-preinit-resources-main-jar">
|
||||
<pathconvert pathsep="${line.separator}" property="jnlp.resources.main.jar.value">
|
||||
<path location="${dist.jar}"/>
|
||||
<mapper type="regexp" from="^.*[/\\]([^/\\]+\.jar)"
|
||||
to=' <jar href="\1" main="true" download="eager"/>'/>
|
||||
</pathconvert>
|
||||
</target>
|
||||
<target name="-exclude-javaws-from-cp">
|
||||
<pathconvert property="path.element.to.be.removed">
|
||||
<path path="${run.classpath}"/>
|
||||
<mapper type="regexp" from="(^.*[/\\]javaws.jar)" to="\1"/>
|
||||
</pathconvert>
|
||||
<pathconvert property="run.classpath.without.javaws.jar">
|
||||
<path path="${run.classpath}"/>
|
||||
<map from="${path.element.to.be.removed}" to=""/>
|
||||
</pathconvert>
|
||||
</target>
|
||||
<target name="-check-task-available">
|
||||
<condition property="signjarstask.available">
|
||||
<isset property="netbeans.home"/>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-check-signing-possible" depends="-security-props-check,-check-task-available">
|
||||
<condition property="jnlp.signed.true+signjarstask.available">
|
||||
<and>
|
||||
<isset property="jnlp.signed.true"/>
|
||||
<isset property="signjarstask.available"/>
|
||||
</and>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-unavailable-task-warning" depends="-check-task-available" unless="signjarstask.available">
|
||||
<echo message="Signtask is not available, jar files will not be signed. Task is available only when running inside NetBeans IDE."/>
|
||||
<echo message="You can fix the problem by adding following jar file to Ant classpath: [NetBeans install dir]/java2/ant/nblib/org-netbeans-modules-javawebstart-signtask.jar"/>
|
||||
</target>
|
||||
<target name="-preinit-resources-signed-jars" depends="-unavailable-task-warning,-sign-jars" if="jnlp.signed.true+signjarstask.available">
|
||||
<property name="jnlp.resources.jars.value" value="${jnlp.signed.jars}${jnlp.components}"/>
|
||||
</target>
|
||||
<target name="-sign-jars" depends="-jnlp-init-keystore,-check-signing-possible" if="jnlp.signed.true+signjarstask.available">
|
||||
<jnlpsignjars keystore="${jnlp.signjar.keystore}" storepass="${jnlp.signjar.storepass}"
|
||||
keypass="${jnlp.signjar.keypass}" alias="${jnlp.signjar.alias}" mainjar="${dist.jar}" destdir="dist"
|
||||
codebase="${jnlp.codebase.value}" signedjarsprop="jnlp.signed.jars"
|
||||
componentsprop="jnlp.components">
|
||||
<fileset dir="dist/lib">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</jnlpsignjars>
|
||||
</target>
|
||||
|
||||
<!-- Application arguments -->
|
||||
|
||||
<target name="-init-application-args" if="application.args">
|
||||
<echo message="${application.args}" file="${helper.file}"/>
|
||||
<loadfile srcfile="${helper.file}" property="jnlp.application.args.value">
|
||||
<filterchain>
|
||||
<tokenfilter delimoutput="\n">
|
||||
<stringtokenizer/>
|
||||
<replaceregex pattern="(.+)" replace=" <argument>\1</argument>"/>
|
||||
</tokenfilter>
|
||||
</filterchain>
|
||||
</loadfile>
|
||||
<delete file="${helper.file}"/>
|
||||
</target>
|
||||
|
||||
<!-- Running/Debugging -->
|
||||
|
||||
<target name="jws-run" depends="jar,-verify-jnlp-enabled,-verify-codebase" description="Start javaws execution">
|
||||
<exec executable="${java.home}/bin/javaws">
|
||||
<arg file="${jnlp.dest.dir}/${launch.jnlp.file}"/>
|
||||
</exec>
|
||||
</target>
|
||||
<target name="jws-debug" if="netbeans.home" depends="jar,-verify-jnlp-enabled,-verify-codebase,-debug-start-debugger,-debug-javaws-debuggee"
|
||||
description="Debug javaws project in IDE"/>
|
||||
<target name="-debug-javaws-debuggee">
|
||||
<exec executable="${java.home}/bin/javaws">
|
||||
<env key="JAVAWS_VM_ARGS" value="-Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
|
||||
<arg file="${jnlp.dest.dir}/${launch.jnlp.file}"/>
|
||||
</exec>
|
||||
</target>
|
||||
<target name="-verify-codebase" depends="-codebase-props-check" unless="local.codebase">
|
||||
<fail message="Project cannot be run with non-local codebase. Open project properties dialog and set Web Start Codebase to Local Execution."/>
|
||||
</target>
|
||||
<target name="-verify-jnlp-enabled" depends="-test-jnlp-enabled" unless="is.jnlp.enabled">
|
||||
<fail message="Project cannot be run with selected Run Configuration when Java Web Start is disabled."/>
|
||||
</target>
|
||||
|
||||
<!-- Test JNLP enabled-->
|
||||
|
||||
<target name="-test-jnlp-enabled">
|
||||
<condition property="is.jnlp.enabled">
|
||||
<equals arg1="${jnlp.enabled}" arg2="true" casesensitive="false" trim="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<!-- Generate simple HTML test page -->
|
||||
|
||||
<target name="-generate-html-page">
|
||||
<echo file="${jnlp.dest.dir}/launch.html"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Test page for launching the application via JNLP</title>
|
||||
</head>
|
||||
<body>
|
||||
<h3>Test page for launching the application via JNLP</h3>
|
||||
<a href="launch.jnlp">Launch the application</a>
|
||||
<!-- or use following script element to launch via Deployment Toolkit
|
||||
<script src="http://java.com/js/deployJava.js"></script>
|
||||
<script>
|
||||
var url="http://[fill in your URL]/launch.jnlp";
|
||||
deployJava.createWebStartLaunchButton(url, "1.6");
|
||||
</script>
|
||||
-->
|
||||
</body>
|
||||
</html>
|
||||
]]></echo>
|
||||
</target>
|
||||
|
||||
</project>
|
0
nbproject/private/config.properties
Executable file
0
nbproject/private/config.properties
Executable file
@ -1,2 +1,6 @@
|
||||
jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
|
||||
user.properties.file=/home/jdbernard/.netbeans/6.1/build.properties
|
||||
do.depend=false
|
||||
do.jar=true
|
||||
javac.debug=true
|
||||
javadoc.preview=true
|
||||
jaxws.endorsed.dir=C:\\Program Files\\NetBeans 6.1\\java2\\modules\\ext\\jaxws21\\api
|
||||
user.properties.file=C:\\Documents and Settings\\jbernard\\.netbeans\\6.1\\build.properties
|
||||
|
@ -1,4 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
|
||||
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
|
||||
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
|
||||
<file>file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/src/jdbernard/timestamper/TimeStamperApp.java</file>
|
||||
<file>file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/src/jdbernard/timestamper/TimeStamperView.java</file>
|
||||
</open-files>
|
||||
</project-private>
|
||||
|
@ -1,8 +1,8 @@
|
||||
application.desc=A simple java desktop application based on Swing Application Framework
|
||||
application.homepage=http://appframework.dev.java.net
|
||||
application.title=Basic Application Example
|
||||
application.vendor=Sun Microsystems Inc.
|
||||
application.version=1.3
|
||||
application.desc=Simple application used to track activities throughout time.
|
||||
application.homepage=
|
||||
application.title=TimeStamper
|
||||
application.vendor=Jonathan Bernard
|
||||
application.version=1.4
|
||||
build.classes.dir=${build.dir}/classes
|
||||
build.classes.excludes=**/*.java,**/*.form
|
||||
# This directory is removed when the project is cleaned:
|
||||
@ -49,6 +49,12 @@ javadoc.splitindex=true
|
||||
javadoc.use=true
|
||||
javadoc.version=false
|
||||
javadoc.windowtitle=
|
||||
jnlp.codebase.type=local
|
||||
jnlp.codebase.url=file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/dist/
|
||||
jnlp.enabled=false
|
||||
jnlp.icon=C:\\Documents and Settings\\jbernard\\My Documents\\Development\\TimeStamper\\src\\jdbernard\\timestamper\\resources\\icons\\appointment-new-16x16.png
|
||||
jnlp.offline-allowed=true
|
||||
jnlp.signed=true
|
||||
main.class=jdbernard.timestamper.TimeStamperApp
|
||||
manifest.file=manifest.mf
|
||||
meta.inf.dir=${src.dir}/META-INF
|
||||
|
@ -2,6 +2,11 @@
|
||||
<project xmlns="http://www.netbeans.org/ns/project/1">
|
||||
<type>org.netbeans.modules.java.j2seproject</type>
|
||||
<configuration>
|
||||
<buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
|
||||
<extension file="jnlp-impl.xml" id="jws">
|
||||
<dependency dependsOn="jnlp" target="jar"/>
|
||||
</extension>
|
||||
</buildExtensions>
|
||||
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
|
||||
<name>TimeStamper</name>
|
||||
<minimum-ant-version>1.6.5</minimum-ant-version>
|
||||
|
@ -15,6 +15,7 @@ import java.util.logging.FileHandler;
|
||||
import java.util.logging.Handler;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.logging.SimpleFormatter;
|
||||
import org.jdesktop.application.Application;
|
||||
import org.jdesktop.application.SingleFrameApplication;
|
||||
|
||||
@ -44,6 +45,7 @@ implements Application.ExitListener {
|
||||
|
||||
try {
|
||||
FileHandler fh = new FileHandler("TimeStamper.log", true);
|
||||
fh.setFormatter(new SimpleFormatter());
|
||||
fh.setLevel(Level.ALL);
|
||||
} catch (IOException ioe) {
|
||||
log.warning("Could not open log file for writing. Switching console"
|
||||
@ -141,7 +143,7 @@ implements Application.ExitListener {
|
||||
|
||||
try {
|
||||
activeTimeline = Timeline.readFromFile(filename);
|
||||
// TODO: re-init gui for new timeline
|
||||
currentTimelineFile = filename;
|
||||
} catch (IOException ioe) {
|
||||
log.warning("Could not load from the file: " +
|
||||
ioe.getLocalizedMessage());
|
||||
|
@ -26,15 +26,15 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="totalTimeNow" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace pref="23" max="32767" attributes="0"/>
|
||||
<EmptySpace pref="58" max="32767" attributes="0"/>
|
||||
<Component id="currentTimeLabel" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Component id="currentTaskLabel" min="-2" max="-2" attributes="1"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="startTimeLabel" pref="95" max="32767" attributes="1"/>
|
||||
<Component id="startTimeLabel" pref="116" max="32767" attributes="1"/>
|
||||
</Group>
|
||||
<Component id="taskTextField" alignment="0" pref="266" max="32767" attributes="1"/>
|
||||
<Component id="taskTextField" alignment="0" pref="275" max="32767" attributes="1"/>
|
||||
</Group>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="1" attributes="0">
|
||||
|
@ -19,6 +19,7 @@ import org.jdesktop.application.Action;
|
||||
import org.jdesktop.application.ResourceMap;
|
||||
import org.jdesktop.application.SingleFrameApplication;
|
||||
import org.jdesktop.application.FrameView;
|
||||
import sun.security.jca.GetInstance;
|
||||
|
||||
/**
|
||||
* The application's main frame.
|
||||
@ -72,16 +73,7 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
|
||||
boldTaskFont = thinTaskFont.deriveFont(Font.BOLD);
|
||||
|
||||
// refresh new timeline
|
||||
Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline();
|
||||
Timeline.TimelineMarker lastMarker = t.getLastMarker(new Date());
|
||||
|
||||
if (lastMarker != null) {
|
||||
mostRecentTask = lastMarker.getTimestamp();
|
||||
startTimeLabel.setText(Timeline.shortFormat.format(lastMarker.getTimestamp()));
|
||||
|
||||
taskTextField.setText(lastMarker.getMark());
|
||||
notesDialog.setNotes(lastMarker.getNotes());
|
||||
}
|
||||
refreshDialog();
|
||||
}
|
||||
|
||||
/** This method is called from within the constructor to
|
||||
@ -401,7 +393,10 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
|
||||
((TimeStamperApp) getApplication()).loadTimeline(
|
||||
fileChooser.getSelectedFile().getAbsolutePath());
|
||||
|
||||
// refresh new timeline
|
||||
refreshDialog();
|
||||
}
|
||||
|
||||
public void refreshDialog() {
|
||||
Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline();
|
||||
Timeline.TimelineMarker lastMarker = t.getLastMarker(new Date());
|
||||
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
Application.name = TimeStamper
|
||||
Application.title = TimeStamper
|
||||
Application.version = 1.3
|
||||
Application.version = 1.4
|
||||
Application.vendor = Jonathan Bernard
|
||||
Application.homepage =
|
||||
Application.description = A simple Java desktop application based on Swing Application Framework.
|
||||
Application.vendorId = Sun
|
||||
Application.id = ${Application.name}
|
||||
Application.description = Simple application used to track activities throughout time.
|
||||
Application.vendorId = Jonathan Bernard
|
||||
Application.id = TimeStamper
|
||||
Application.lookAndFeel = system
|
||||
Application.icon=/jdbernard/timestamper/resources/icons/appointment-new-16x16.png
|
||||
quit.Action.text=Exit
|
||||
|
Loading…
x
Reference in New Issue
Block a user