diff options
33 files changed, 238 insertions, 217 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml index 35707336..a6006395 100644 --- a/BKUApplet/pom.xml +++ b/BKUApplet/pom.xml @@ -2,13 +2,13 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUApplet</artifactId> <name>BKU Applet</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <build> <plugins> <plugin> @@ -118,27 +118,27 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUCommonGUI</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml index 64236425..b52d045c 100644 --- a/BKUAppletExt/pom.xml +++ b/BKUAppletExt/pom.xml @@ -2,44 +2,44 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUAppletExt</artifactId> <name>BKU Applet Extension</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <description /> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALXService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUApplet</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUGuiExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTALExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> </dependencies> <build> diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml index acd70cff..1e2bf974 100644 --- a/BKUCertificates/pom.xml +++ b/BKUCertificates/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <groupId>at.gv.egiz</groupId> <artifactId>BKUCertificates</artifactId> diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml index b0ac6418..62837b34 100644 --- a/BKUCommonGUI/pom.xml +++ b/BKUCommonGUI/pom.xml @@ -2,23 +2,23 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUCommonGUI</artifactId> <name>BKU GUI</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- see BKUFonts.pom diff --git a/BKUFonts/.classpath b/BKUFonts/.classpath index 54382402..d2236dff 100644 --- a/BKUFonts/.classpath +++ b/BKUFonts/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/fonts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/BKUFonts/.project b/BKUFonts/.project index 62c74cfb..484ff825 100644 --- a/BKUFonts/.project +++ b/BKUFonts/.project @@ -16,12 +16,12 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> + <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.wst.validation.validationbuilder</name> <arguments> </arguments> </buildCommand> diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml index 0326c28d..62aa8728 100644 --- a/BKUFonts/pom.xml +++ b/BKUFonts/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <groupId>at.gv.egiz</groupId> <artifactId>BKUFonts</artifactId> diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml index 73e9df63..90d1889f 100644 --- a/BKUGuiExt/pom.xml +++ b/BKUGuiExt/pom.xml @@ -3,22 +3,22 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <groupId>at.gv.egiz</groupId> <artifactId>BKUGuiExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <name>BKU GUI Extension</name> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALXService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml index 7122df96..7afea63d 100644 --- a/BKUHelp/pom.xml +++ b/BKUHelp/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <groupId>at.gv.egiz</groupId> <artifactId>BKUHelp</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <name>BKU Help</name> <build> <resources> diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 66b4e1d0..ec93eeb4 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -2,19 +2,19 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKULocal</artifactId> <packaging>war</packaging> <name>BKU Local</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <scm> - <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</developerConnection> - <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</connection> - <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</url> + <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKULocal</developerConnection> + <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKULocal</connection> + <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKULocal</url> </scm> <build> <plugins> @@ -72,42 +72,42 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUGuiExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTALExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUViewer</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <artifactId>BKUHelp</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/BKULocal/src/main/resources/log4j.properties b/BKULocal/src/main/resources/log4j.properties index a56f2683..86ddc7b4 100644 --- a/BKULocal/src/main/resources/log4j.properties +++ b/BKULocal/src/main/resources/log4j.properties @@ -17,8 +17,6 @@ # loglever DEBUG, appender STDOUT log4j.rootLogger=DEBUG, STDOUT -log4j.logger.at.gv.egiz.smcc=TRACE - # STDOUT appender log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index fa3fa191..cdfd675b 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -3,14 +3,14 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUOnline</artifactId> <packaging>war</packaging> <name>BKU Online</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <pluginRepositories> <pluginRepository> @@ -28,12 +28,12 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUViewer</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <artifactId>BKUCertificates</artifactId> @@ -43,7 +43,7 @@ <dependency> <artifactId>BKUHelp</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -67,13 +67,13 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <!-- | TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService @@ -82,7 +82,7 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALXService</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <!-- | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970 @@ -117,13 +117,13 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUApplet</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUAppletExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <scope>provided</scope> </dependency> <!-- @@ -143,9 +143,9 @@ </dependencies> <scm> - <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</developerConnection> - <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</connection> - <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</url> + <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKUOnline</developerConnection> + <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKUOnline</connection> + <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2/BKUOnline</url> </scm> <build> <plugins> diff --git a/BKUOnline/src/main/webapp/PINManagement.jsp b/BKUOnline/src/main/webapp/PINManagement.jsp index e48b8405..3555f99e 100644 --- a/BKUOnline/src/main/webapp/PINManagement.jsp +++ b/BKUOnline/src/main/webapp/PINManagement.jsp @@ -75,8 +75,7 @@ HelpURL : '../help/', SessionID : '<%=request.getSession().getId()%>', RedirectURL : '../', - RedirectTarget: '_parent', - EnforceRecommendedPINLength: 'true' + RedirectTarget: '_parent' }; var version = '1.6.0_04'; deployJava.runApplet(attributes, parameters, version); diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml index fb3cae63..0324030e 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml @@ -30,64 +30,47 @@ <bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"
factory-method="getInstance">
- <property name="concreteFactories">
- <map>
- <entry key-ref="nullOperationRequest" value-ref="nullOperationCommandFactory"/>
- <entry key-ref="infoboxReadRequest" value-ref="infoboxReadCommandFactory"/>
- <entry key-ref="infoboxUpdateRequest" value-ref="infoboxUpdateCommandFactory"/>
- <entry key-ref="createXMLSignatureRequest" value-ref="createXMLSignatureCommandFactory"/>
- <entry key-ref="getStatusRequest" value-ref="getStatusCommandFactory"/>
- </map>
+ <property name="commandImpl">
+ <map>
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"
+ value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxReadRequest"
+ value="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandImpl" />
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxUpdateRequest"
+ value="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandImpl" />
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"
+ value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:GetStatusRequest"
+ value="at.gv.egiz.bku.slcommands.impl.GetStatusCommandImpl" />
+ </map>
</property>
</bean>
- <bean id="nullOperationCommandFactory" class="at.gv.egiz.bku.slcommands.impl.NullOperationCommandFactory"/>
- <bean id="nullOperationRequest" class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>
- <constructor-arg value="NullOperationRequest"/>
- </bean>
- <bean id="infoboxReadCommandFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandFactory">
- <property name="infoboxFactory" ref="infoboxFactory"/>
- </bean>
- <bean id="infoboxReadRequest" class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>
- <constructor-arg value="InfoboxReadRequest"/>
- </bean>
- <bean id="infoboxUpdateCommandFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandFactory">
- <property name="infoboxFactory" ref="infoboxFactory"/>
- </bean>
- <bean id="infoboxUpdateRequest" class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>
- <constructor-arg value="InfoboxUpdateRequest"/>
- </bean>
- <bean id="createXMLSignatureCommandFactory" class="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandFactory"/>
- <bean id="createXMLSignatureRequest" class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>
- <constructor-arg value="CreateXMLSignatureRequest"/>
- </bean>
- <bean id="getStatusCommandFactory" class="at.gv.egiz.bku.slcommands.impl.GetStatusCommandFactory"/>
- <bean id="getStatusRequest" class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>
- <constructor-arg value="GetStatusRequest"/>
- </bean>
-
- <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory">
- <property name="infoboxFactories">
+ <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"
+ factory-method="getInstance">
+ <property name="infoboxImpl">
<map>
- <entry key="Certificates" value-ref="certificatesInfoboxFactory"/>
- <entry key="IdentityLink" value-ref="identityLinkInfoboxFactory"/>
- <entry key="CardChannel" value-ref="cardChannelInfoboxFactory"/>
- <entry key="SV-Personendaten" value-ref="svPersonendatenInfoboxFactory"/>
+ <entry
+ key="Certificates"
+ value="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxImpl" />
+ <entry
+ key="IdentityLink"
+ value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
+ <entry
+ key="CardChannel"
+ value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />
+ <entry
+ key="SV-Personendaten"
+ value="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxImpl" />
</map>
</property>
</bean>
- <bean id="certificatesInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxFactory"/>
- <bean id="identityLinkInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxFactory"/>
- <bean id="cardChannelInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxFactory"/>
- <bean id="svPersonendatenInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxFactory"/>
-
-
<bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
scope="singleton">
<constructor-arg ref="STALFactory"></constructor-arg>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml index 7871b67a..f5ba5926 100644 --- a/BKUViewer/pom.xml +++ b/BKUViewer/pom.xml @@ -2,19 +2,19 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUViewer</artifactId> <name>BKU Viewer</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <description /> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-logging</groupId> diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index 02e65f53..11b9925c 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUWebStart</artifactId> <packaging>jar</packaging> <name>BKU Web Start</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <url>http://mocca.egovlabs.gv.at/</url> <description>Bürgerkartenumgebung</description> diff --git a/STAL/pom.xml b/STAL/pom.xml index 66d6567f..42d57360 100644 --- a/STAL/pom.xml +++ b/STAL/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> <name>STAL</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <dependencies> <dependency> <groupId>commons-logging</groupId> diff --git a/STALExt/pom.xml b/STALExt/pom.xml index bd5f9b46..c2e78f49 100644 --- a/STALExt/pom.xml +++ b/STALExt/pom.xml @@ -2,19 +2,19 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>STALExt</artifactId> <name>STAL Extension</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <description /> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/STALService/pom.xml b/STALService/pom.xml index 6c25bbe2..535418aa 100644 --- a/STALService/pom.xml +++ b/STALService/pom.xml @@ -3,19 +3,19 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> <name>STAL Service</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <description /> <dependencies> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <!--dependency> <groupId>at.gv.egiz</groupId> diff --git a/STALXService/pom.xml b/STALXService/pom.xml index 402f40c6..014406ba 100644 --- a/STALXService/pom.xml +++ b/STALXService/pom.xml @@ -2,24 +2,24 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>STALXService</artifactId> <name>STAL-X Service</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <url>http://maven.apache.org</url> <dependencies> <dependency> <artifactId>STALService</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <artifactId>STALExt</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml index 2ac6c5fc..0899ab23 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> <name>BKU Common</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <build> <plugins> diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java index 82c1be53..93e5bb1c 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java @@ -274,12 +274,7 @@ public class DataUrlConnectionImpl implements DataUrlConnectionSPI { InputStreamReader reader = new InputStreamReader(formParameter.getData(), (formParameter.getCharSet() != null) ? formParameter.getCharSet() - : "UTF-8"); - // Note, using UTF-8 as fallback for decoding is safe. - // If the request was x-www-form-urlencoded, - // UTF-8 has been used for encoding of non-ASCII characters. - // If the request was multipart/form-data and contains any transfer parameters, - // the data URL request is going to be multipart/form-data encoded (see below). + : "UTF-8"); // assume request was application/x-www-form-urlencoded, formParam therefore UTF-8 while ((len = reader.read(cbuf)) != -1) { urlEnc.write(cbuf, 0, len); } diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java index 6e84867e..8e3f6ece 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java @@ -88,11 +88,6 @@ public class SLCommandFactory { private Map<String, Class<? extends SLCommand>> slRequestTypeMap = new HashMap<String, Class<? extends SLCommand>>(); /** - * The mapping of a requests's qualified name to a concrete command factories. - */ - private Map<QName, AbstractSLCommandFactory> slCommandFactories = new HashMap<QName, AbstractSLCommandFactory>(); - - /** * Configures the singleton instance with command implementations * @param commandImplMap * @throws ClassNotFoundException @@ -106,19 +101,7 @@ public class SLCommandFactory { slRequestTypeMap.put(key, impl); } } - - public void setConcreteFactories(Map<QName, AbstractSLCommandFactory> factories) { - if (log.isDebugEnabled()) { - StringBuilder sb = new StringBuilder(); - sb.append("Registered sl command factory for"); - for (QName qname : factories.keySet()) { - sb.append("\n " + qname + " : " + factories.get(qname).getClass()); - } - log.debug(sb); - } - slCommandFactories = factories; - } - + /** * Register an {@link SLCommand} implementation class of a Security Layer * command with the given <code>namespaceUri</code> and <code>localname</code> @@ -380,16 +363,37 @@ public class SLCommandFactory { log.info("Unsupported security layer request version : " + qName.getNamespaceURI()); throw new SLVersionException(qName.getNamespaceURI()); } + + Class<? extends SLCommand> implClass = getImplClass(qName); + if (implClass == null) { + // command not supported + log.info("Unsupported command received: " + qName.toString()); + throw new SLCommandException(4011, + SLExceptionMessages.EC4011_NOTIMPLEMENTED, new Object[]{qName.toString()}); + } - AbstractSLCommandFactory concreteFactory = slCommandFactories.get(qName); - if (concreteFactory == null) { - // command not supported - log.info("Unsupported command received: " + qName.toString()); - throw new SLCommandException(4011, - SLExceptionMessages.EC4011_NOTIMPLEMENTED, new Object[]{qName.toString()}); + + + // try to instantiate + SLCommand slCommand; + try { + slCommand = implClass.newInstance(); + log.debug("SLCommand " + slCommand.getName() + " created."); + } catch (InstantiationException e) { + // unexpected error + log.error("Failed to instantiate security layer command implementation.", + e); + throw new SLRuntimeException(e); + } catch (IllegalAccessException e) { + // unexpected error + log.error("Failed to instantiate security layer command implementation.", + e); + throw new SLRuntimeException(e); } - return concreteFactory.createSLCommand(context, (JAXBElement<?>) object); + slCommand.init(context, (JAXBElement) object); + + return slCommand; } }
\ No newline at end of file diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java index b8e4030d..8a7edb71 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java @@ -32,25 +32,6 @@ public abstract class AbstractInfoboxCommandImpl<T> extends SLCommandImpl<T> { * The infobox implementation. */ protected Infobox infobox; - - /** - * The infobox factory. - */ - protected InfoboxFactory infoboxFactory; - - /** - * @return the infoboxFactory - */ - public InfoboxFactory getInfoboxFactory() { - return infoboxFactory; - } - - /** - * @param infoboxFactory the infoboxFactory to set - */ - public void setInfoboxFactory(InfoboxFactory infoboxFactory) { - this.infoboxFactory = infoboxFactory; - } @Override public void init(SLCommandContext ctx, Object request) @@ -59,7 +40,7 @@ public abstract class AbstractInfoboxCommandImpl<T> extends SLCommandImpl<T> { String infoboxIdentifier = getInfoboxIdentifier(getRequestValue()); - infobox = infoboxFactory.createInfobox(infoboxIdentifier); + infobox = InfoboxFactory.getInstance().createInfobox(infoboxIdentifier); } /** diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java index fdf94297..e9736f6d 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java @@ -17,6 +17,7 @@ package at.gv.egiz.bku.slcommands.impl; import java.util.HashMap; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,24 +39,68 @@ public class InfoboxFactory { private static Log log = LogFactory.getLog(InfoboxFactory.class); /** - * The mapping of Infobox name to concrete Infobox factory. + * The singleton instance of this InfoboxFactory. */ - private HashMap<String, AbstractInfoboxFactory> infoboxFactories = new HashMap<String, AbstractInfoboxFactory>(); - + private static InfoboxFactory instance; + /** - * @param infoboxFactories the infoboxFactories to set + * @return an instance of this InfoboxFactory */ - public void setInfoboxFactories( - HashMap<String, AbstractInfoboxFactory> factories) { - if (log.isDebugEnabled()) { - StringBuilder sb = new StringBuilder(); - sb.append("Registered infobox factories for"); - for (String name : factories.keySet()) { - sb.append("\n " + name + " : " + factories.get(name).getClass()); - } - log.debug(sb); + public synchronized static InfoboxFactory getInstance() { + if (instance == null) { + instance = new InfoboxFactory(); + } + return instance; + } + + /** + * The mapping of infobox identifier to implementation class. + */ + private HashMap<String, Class<? extends Infobox>> implementations; + + /** + * Private constructor. + */ + private InfoboxFactory() { + } + + /** + * Sets the mapping of infobox identifier to implementation class name. + * + * @param infoboxImplMap + * a mapping of infobox identifiers to implementation class names + * + * @throws ClassNotFoundException + * if implementation class is not an instance of {@link Infobox} + */ + @SuppressWarnings("unchecked") + public void setInfoboxImpl(Map<String, String> infoboxImplMap) throws ClassNotFoundException { + HashMap<String, Class<? extends Infobox>> implMap = new HashMap<String, Class<? extends Infobox>>(); + ClassLoader cl = getClass().getClassLoader(); + for (String key : infoboxImplMap.keySet()) { + Class<? extends Infobox> impl = (Class<? extends Infobox>) cl.loadClass(infoboxImplMap.get(key)); + log.debug("Registering infobox '" + key + "' implementation '" + impl.getCanonicalName() + "'."); + implMap.put(key, impl); + } + implementations = implMap; + } + + /** + * Returns the configured implementation class for the given + * <code>infoboxIdentifier</code>. + * + * @param infoboxIdentifier + * the infobox identifier + * + * @return the implementation class for the given infobox identifier or + * <code>null</code> if there is no implementation class configured + */ + public Class<? extends Infobox> getImplClass(String infoboxIdentifier) { + if (implementations != null) { + return implementations.get(infoboxIdentifier); + } else { + return null; } - this.infoboxFactories = factories; } /** @@ -74,15 +119,31 @@ public class InfoboxFactory { */ public Infobox createInfobox(String infoboxIdentifier) throws SLCommandException, SLRuntimeException { - AbstractInfoboxFactory factory = infoboxFactories.get(infoboxIdentifier); - if (factory == null) { + Class<? extends Infobox> implClass = getImplClass(infoboxIdentifier); + if (implClass == null) { + // infobox not supported log.info("Unsupported infobox '" + infoboxIdentifier + "."); throw new SLCommandException(4002, SLExceptionMessages.EC4002_INFOBOX_UNKNOWN, new Object[] { infoboxIdentifier }); } - return factory.createInfobox(); + // try to instantiate + Infobox infobox; + try { + infobox = implClass.newInstance(); + log.debug("Infobox '" + infobox.getIdentifier() + "' created."); + } catch (InstantiationException e) { + // unexpected error + log.error("Failed to instantiate infobox implementation.", e); + throw new SLRuntimeException(e); + } catch (IllegalAccessException e) { + // unexpected error + log.error("Failed to instantiate infobox implementation.", e); + throw new SLRuntimeException(e); + } + + return infobox; } diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/AlgorithmMethodFactoryImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/AlgorithmMethodFactoryImpl.java index 9a958323..8391e450 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/AlgorithmMethodFactoryImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/AlgorithmMethodFactoryImpl.java @@ -45,7 +45,7 @@ public class AlgorithmMethodFactoryImpl implements AlgorithmMethodFactory { /** * Use SHA-2? */ - private static boolean SHA2 = true; + private static boolean SHA2 = false; /**
* The signature algorithm URI.
diff --git a/bkucommon/src/test/java/moaspss/TestCreateAndVerifySignature.java b/bkucommon/src/test/java/moaspss/TestCreateAndVerifySignature.java index a9397d31..8d995530 100644 --- a/bkucommon/src/test/java/moaspss/TestCreateAndVerifySignature.java +++ b/bkucommon/src/test/java/moaspss/TestCreateAndVerifySignature.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; import at.buergerkarte.namespaces.securitylayer._1.ErrorResponseType; -//@Ignore +@Ignore public class TestCreateAndVerifySignature { protected Element parseCreateXMLSignatureRequest(InputStream is) @@ -141,7 +141,7 @@ public class TestCreateAndVerifySignature { } MOASPClient spClient = new MOASPClient(); - JAXBElement<VerifyXMLSignatureResponseType> verifySignature = spClient.verifySignature(cxsResp, ".", "qualifiedSignature+Test"); + JAXBElement<VerifyXMLSignatureResponseType> verifySignature = spClient.verifySignature(cxsResp, ".", "qualifiedSignature"); VerifyXMLSignatureResponseType vxsResp = verifySignature.getValue(); int signatureCheck = vxsResp.getSignatureCheck().getCode().intValue(); if (signatureCheck != 0) { diff --git a/bkucommon/src/test/resources/MOA-SPSS-1.3.wsdl b/bkucommon/src/test/resources/MOA-SPSS-1.3.wsdl index 25accfce..8ec61420 100644 --- a/bkucommon/src/test/resources/MOA-SPSS-1.3.wsdl +++ b/bkucommon/src/test/resources/MOA-SPSS-1.3.wsdl @@ -51,7 +51,7 @@ </binding> <service name="SignatureVerificationService"> <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding"> - <soap:address location="http://localhost:8080/moa-spss/services/SignatureVerification"/> + <soap:address location="http://localhost:8088/moa-spss/services/SignatureVerification"/> </port> </service> </definitions> @@ -4,7 +4,7 @@ <groupId>at.gv.egiz</groupId> <artifactId>bku</artifactId> <packaging>pom</packaging> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <name>BKU</name> <url>http://bku.egiz.gv.at</url> <modules> @@ -48,9 +48,9 @@ </developer> </developers> <scm> - <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</connection> - <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</developerConnection> - <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</url> + <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2</connection> + <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2</developerConnection> + <url>svn://svn.egovlabs.gv.at/svnroot/mocca/branches/mocca-1.2.11-sha2</url> </scm> <organization> <name>E-Government Innovation Center (EGIZ)</name> @@ -250,7 +250,7 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUWebStart</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <type>zip</type> </dependency> </dependencies> diff --git a/smcc/pom.xml b/smcc/pom.xml index 1a2a8566..d3ee751f 100644 --- a/smcc/pom.xml +++ b/smcc/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> <name>smcc</name> <packaging>jar</packaging> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <url>http://bku.egiz.gv.at</url> <build> <plugins> diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml index 1913c3e0..e5f8c492 100644 --- a/smccSTAL/pom.xml +++ b/smccSTAL/pom.xml @@ -2,13 +2,13 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> <name>smcc STAL</name> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <build> <plugins> <plugin> @@ -24,17 +24,17 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUCommonGUI</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </dependency> <dependency> <groupId>iaik</groupId> diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml index 5e71d69d..34631a6f 100644 --- a/smccSTALExt/pom.xml +++ b/smccSTALExt/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <groupId>at.gv.egiz</groupId> <artifactId>smccSTALExt</artifactId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <name>smcc STAL Extension</name> <dependencies> <dependency> diff --git a/utils/pom.xml b/utils/pom.xml index 9c5e4fa0..9b1ff93a 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>utils</artifactId> <name>BKU Utils</name> <packaging>jar</packaging> - <version>1.2.11</version> + <version>1.2.11-sha2-SNAPSHOT</version> <url>http://bku.egiz.gv.at</url> <build> <plugins> |