optimized handbook project

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@986 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 40 insertions, 15 deletions

diff --git a/spss/handbook/clients/webservice/conf/http.properties b/spss/handbook/clients/webservice/conf/http.properties
index 1506169ed..22f2d2cda 100644
--- a/spss/handbook/clients/webservice/conf/http.properties
+++ b/spss/handbook/clients/webservice/conf/http.properties
@@ -16,10 +16,10 @@ signServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureCreation
 # Name des zu sendenden Signaturerstellungsrequests (entweder absolute
 # oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
 # Arbeitsverzeichnis der Java VM interpretiert)
-signRequest = clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
+signRequest = resources/requests/CreateXMLSignatureRequest.Simple.xml
+#signRequest=resources/requests/CreateXMLSignatureRequest.Refs.xml
+#signRequest=resources/requests/CreateXMLSignatureRequest.Transforms.xml
+#signRequest=resources/requests/CreateXMLSignatureRequest.Supplements.xml
 
 
 #
@@ -36,13 +36,13 @@ verifyServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureVerific
 # Name des zu sendenden Signaturprüfrequests (entweder absolute
 # oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
 # Arbeitsverzeichnis der Java VM interpretiert)
-verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
+verifyRequest=resources/requests/VerifyCMSSignatureRequest.Simple.xml
+#verifyRequest=resources/requests/VerifyCMSSignatureRequest.Extended.xml
+#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Simple.xml
+#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
+#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Supplements.xml
+#verifyRequest=resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
+#verifyRequest=resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
 
 #
 # JSSE-Konfiguration
@@ -54,8 +54,8 @@ ssl.truststore.type = JKS
 
 # Relativer oder absoluter Pfad zum JSSE-Truststore. Ein relativer Pfad 
 # wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.truststore.loc = clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
-#ssl.truststore.loc = clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
+ssl.truststore.loc = resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
+#ssl.truststore.loc = resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
 
 # Passwort für den JSSE-Truststore.
 ssl.truststore.pwd = servers
@@ -66,8 +66,8 @@ ssl.keystore.type = PKCS12
 
 # Relativer oder absoluter Pfad zum JSSE-Keystore. Ein relativer Pfad 
 # wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.keystore.loc = clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
-#ssl.keystore.loc = clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
+ssl.keystore.loc = resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
+#ssl.keystore.loc = resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
 
 # Passwort für den JSSE-Keystore.
 ssl.keystore.pwd = kunde1
diff --git a/spss/handbook/clients/webservice/conf/log4j.properties b/spss/handbook/clients/webservice/conf/log4j.properties
new file mode 100644
index 000000000..acef53003
--- /dev/null
+++ b/spss/handbook/clients/webservice/conf/log4j.properties
@@ -0,0 +1,25 @@
+# commons-logging setup

+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory

+

+# define log4j root loggers

+log4j.rootLogger=info, stdout

+#log4j.rootLogger=info, stdout, R

+#log4j.logger.moa=info

+#log4j.logger.moa.spss.server=debug

+#log4j.logger.iaik.server=info

+#log4j.logger.moa.id.auth=debug

+#log4j.logger.moa.id.proxy=debug

+

+# configure the stdout appender

+log4j.appender.stdout=org.apache.log4j.ConsoleAppender

+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

+log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n

+

+# configure the rolling file appender (R)

+log4j.appender.R=org.apache.log4j.RollingFileAppender

+log4j.appender.R.File=${catalina.home}/logs/moa-id.log

+log4j.appender.R.MaxFileSize=10000KB

+log4j.appender.R.MaxBackupIndex=1

+log4j.appender.R.layout=org.apache.log4j.PatternLayout

+log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n

+