TempelPlus Windows 7 32bit confi parandused

git-svn-id: https://arendus.sk.ee/svn/svnpki/Tempelplus/trunk@3134 984e8997-5708-0410-b877-c265616a6196
SK-EID · Jul 11, 2014 · 150d034 · 150d034
1 parent 49832a6
commit 150d034
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/configurations/Windows 7 32bit/TempelPlus.bat b/configurations/Windows 7 32bit/TempelPlus.bat
@@ -0,0 +1,17 @@
+@echo off
+
+cd %~dp0
+SET JAVA="C:\java\jdk1.7.0_13\bin\java"
+
+echo Starting TempelPlus from Windows Batch
+echo Using Java: %JAVA%
+
+SET firstNineParameters= %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+REM Shift 10 times
+FOR /L %%A IN (1,1,10) DO SHIFT
+
+SET lastNineParameters=%0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+SET parameters= %firstNineParameters% %lastNineParameters%
+
+%JAVA% -Dfile.encoding=UTF-8 -Xmx1024m -jar Run.jar %parameters%
diff --git a/configurations/Windows 7 32bit/TempelPlus.conf b/configurations/Windows 7 32bit/TempelPlus.conf
@@ -22,7 +22,7 @@ date_format=dd.MM.yyyy HH:mm:ss
 pin_enter=config
 pin=12345
 #Kasutatav bcprov faili nimi
-bc_prov=bcprov-jdk15on-147.jar
+bc_prov=bcprov-jdk15on-148.jar
 #Ekstraktimisel/dekrüpteerimisel saadud väljundfailide salvestamise viis: 
 #false - iga ddoc/cdoc konteineri failid salvestatakse eraldi konteineri nimega kausta; 
 #true - failid salvestatakse output_directory asukohta või selle puudumisel lähtefailiga samasse kataloogi.

diff --git a/configurations/Windows 7 32bit/tempelplus-wrapper.properties b/configurations/Windows 7 32bit/tempelplus-wrapper.properties
@@ -6,16 +6,19 @@ TEMPELPLUS_PATH=C:\\jenkins\\workspace\\Tempel Plus Windows 7 32bit
 #TestData folder path
 TESTDATA_PATH=C:\\jenkins\\workspace\\TestData\\
 #set recipient
-RECIPIENT=TP-Test üõäöžš
-#set cn
-SUBJECT_CN=TP-Test üõäöžš
+RECIPIENT="Tempelplus2\u2019/\\!?(äöõü\u017E\u0161=#%)"
+#SUBJECT CN COMMON NAME FOR TESTDATA DDOCS
+SUBJECT_CN="Tempelplus\u2019/\\!?(äöõü\u017E\u0161=#%)"
 #additional parameters of signing
 ADDITIONAL_PARAMETERS= -role SKtest -country Eesti -state Harjumaa -city Tallinn -postcode 54321
+#ddoc/bdoc
+TEST_MODE=ddoc
+TEMPELPLUS_LINUX_BIT=64
 
 #Where are certificates in TestData folder?
 #digitempel certificate
-CERT1=Certificates/ita1.cer
+CERT1=Certificates/pulk.cer
 #broken certificate
 CERT2=Certificates/broken.cer
 #random test certificate
-CERT3=Certificates/Testnumber_Seitsmes.cer
+CERT3=Certificates/ita1.cer