# HG changeset patch
# User nolith
# Date 1181893038 -7200
# Branch trunk
# Node ID 5f24ee46836c925571045892bd9958b2310c8bd6
# Parent  f0aa5d9d40e1b509746afb21bd3e4f0977025872
[svn] [CHANGE] now Java5 is the default JVM

diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 .classpath
--- a/.classpath	Thu Jun 14 18:41:45 2007 +0200
+++ b/.classpath	Fri Jun 15 09:37:18 2007 +0200
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java 6"/>
 	<classpathentry kind="lib" path="libs/itext-2.0.4.jar"/>
 	<classpathentry kind="lib" path="libs/commons-cli-1.0.jar"/>
-	<classpathentry kind="lib" path="libs/bcprov-jdk16-136.jar"/>
+	<classpathentry kind="lib" path="libs/bcprov-jdk15-136.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 .externalToolBuilders/PortableNotary build.xml [Builder].launch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.externalToolBuilders/PortableNotary build.xml [Builder].launch	Fri Jun 15 09:37:18 2007 +0200
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="PortableNotary"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/PortableNotary/build.xml"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/PortableNotary/build.xml}"/>
+</launchConfiguration>
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 .project
--- a/.project	Thu Jun 14 18:41:45 2007 +0200
+++ b/.project	Fri Jun 15 09:37:18 2007 +0200
@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/PortableNotary build.xml [Builder].launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 .settings/org.eclipse.jdt.core.prefs
--- a/.settings/org.eclipse.jdt.core.prefs	Thu Jun 14 18:41:45 2007 +0200
+++ b/.settings/org.eclipse.jdt.core.prefs	Fri Jun 15 09:37:18 2007 +0200
@@ -1,12 +1,12 @@
-#Tue Jun 05 19:35:00 CEST 2007
+#Fri Jun 15 09:23:50 CEST 2007
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 .settings/org.eclipse.jdt.ui.prefs
--- a/.settings/org.eclipse.jdt.ui.prefs	Thu Jun 14 18:41:45 2007 +0200
+++ b/.settings/org.eclipse.jdt.ui.prefs	Fri Jun 15 09:37:18 2007 +0200
@@ -1,4 +1,4 @@
-#Thu Jun 14 10:07:53 CEST 2007
+#Fri Jun 15 09:34:40 CEST 2007
 eclipse.preferences.version=1
 internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n   Copyright 2007 Alessio Caiazza &lt;nolith@abisso.org&gt;\n\n   Licensed under the Apache License, Version 2.0 (the "License");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http\://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an "AS IS" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n   ${project_name} - ${file_name}\n   Copyright ${year} Alessio Caiazza &lt;nolith@abisso.org&gt;\n\n   Licensed under the Apache License, Version 2.0 (the "License");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http\://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an "AS IS" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n*/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 build.xml
--- a/build.xml	Thu Jun 14 18:41:45 2007 +0200
+++ b/build.xml	Fri Jun 15 09:37:18 2007 +0200
@@ -2,7 +2,7 @@
 <!-- build file for PortableNotary program -->
 <!-- Created by: Alessio Caiazza &lt;ac@abisso.org&gt;	-->
 
-<project name="PortableNotary" default="run" basedir=".">
+<project name="PortableNotary" default="build" basedir=".">
 	<property name="src" value="./src"/>
 	<property name="src.right" value="./source"/>
 	<property name="build" value="./bin"/>
@@ -11,19 +11,20 @@
 	<property name="out.jar" value="./PortableNotary.jar"/>
 	<property name="itext" value="${libs}/itext-2.0.4.jar"/>
 	<property name="commons-cli" value="${libs}/commons-cli-1.0.jar"/>
-	<property name="bcprov" value="${libs}/bcprov-jdk16-136.jar"/>
+	<property name="bcprov" value="${libs}/bcprov-jdk15-136.jar"/>
 	<property name="compile.debug"			 value="true"/>
 	<!-- trick for legacy JVM -->
-	<condition property="source.version" value="1.5" else="1.6">
-		<equals arg1="${java6}" arg2="false"/>
+	<condition property="source.version" value="1.6" else="1.5">
+		<equals arg1="${java5}" arg2="false"/>
 	</condition>
 	<condition property="ifdef.token" value="/*" else="">
-		<equals arg1="${java6}" arg2="false"/>
+		<equals arg1="${java5}" arg2="false"/>
 	</condition>
 	<condition property="enddef.token" value="*/" else="">
-		<equals arg1="${java6}" arg2="false"/>
+		<equals arg1="${java5}" arg2="false"/>
 	</condition>
 	
+	<!-- http://informagen.com/JarBundler/ -->
 	<taskdef name="jarbundler" 
 	         classname="net.sourceforge.jarbundler.JarBundler" />
 	<property name="launch4j.dir" location="/Developer/Java/launch4j" />
@@ -60,7 +61,7 @@
 
 	<target name="download_deps">
 		<mkdir dir="${libs}"/>
-		<get src="http://www.bouncycastle.org/download/bcprov-jdk16-136.jar" dest="${bcprov}" verbose="on" usetimestamp="on" />
+		<get src="http://www.bouncycastle.org/download/bcprov-jdk15-136.jar" dest="${bcprov}" verbose="on" usetimestamp="on" />
 		<get src="http://prdownloads.sourceforge.net/itext/itext-2.0.4.jar" dest="${itext}" verbose="on" usetimestamp="on" />
 		<get src="http://apache.markoer.org/jakarta/commons/cli/binaries/cli-1.0.tar.gz" dest="${libs}/cli-1.0.tar.gz" verbose="on" usetimestamp="on" />
 		<gunzip src="${libs}/cli-1.0.tar.gz" />
diff -r f0aa5d9d40e1b509746afb21bd3e4f0977025872 -r 5f24ee46836c925571045892bd9958b2310c8bd6 src/org/abisso/PortableNotary/PortableNotary.java
--- a/src/org/abisso/PortableNotary/PortableNotary.java	Thu Jun 14 18:41:45 2007 +0200
+++ b/src/org/abisso/PortableNotary/PortableNotary.java	Fri Jun 15 09:37:18 2007 +0200
@@ -102,14 +102,14 @@
 		    
 		    if (line.hasOption("p")) { //$NON-NLS-1$
 //[ifdef]
-		    	   password = new String(System.console().readPassword(
-		    			   Messages.getString("PortableNotary.EnterPassword"))); //$NON-NLS-1$
-		    	   if (save)
-			        	pref.setKeystore_pass(password);
+	    		System.err.println(Messages.getString("PortableNotary.RequireJava6")); //$NON-NLS-1$
+	    		System.exit(LEGACY_JVM);
 //[enddef]
 /* //[enddef]		    	
-		    		System.err.println(Messages.getString("PortableNotary.RequireJava6")); //$NON-NLS-1$
-		    		System.exit(LEGACY_JVM);
+	    	   password = new String(System.console().readPassword(
+	    			   Messages.getString("PortableNotary.EnterPassword"))); //$NON-NLS-1$
+	    	   if (save)
+		        	pref.setKeystore_pass(password);
 //[ifdef] */
 		    }