diff options
Diffstat (limited to 'BKULocal')
21 files changed, 685 insertions, 525 deletions
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java index a9f21087..69fd09ec 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.gui; import at.gv.egiz.bku.gui.BKUGUIFacade; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java index 8730a611..31670f61 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.gui; import at.gv.egiz.bku.gui.ViewerHelpListener; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java index 803e0cf9..2fdecd20 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java @@ -1,20 +1,28 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.spring; import at.gv.egiz.bku.conf.MoccaConfigurationFacade; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTAL.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTAL.java index 0b8511e3..8562677c 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTAL.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTAL.java @@ -1,19 +1,27 @@ /* -* Copyright 2009 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + + package at.gv.egiz.bku.local.stal; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTALFactory.java index 1dee8e2b..837c15f9 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTALFactory.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/ExclusiveAccessSTALFactory.java @@ -1,19 +1,27 @@ /* -* Copyright 2009 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + + package at.gv.egiz.bku.local.stal; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java index d2e49039..f9dab561 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.stal; import at.gv.egiz.bku.gui.BKUGUIFacade; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java index cc0d8fc2..8a572614 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.stal; import at.gv.egiz.bku.viewer.ResourceFontLoader; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java index 749a455a..14c30d21 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.stal; import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java index a1f77a85..3ced30a6 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.stal; import org.slf4j.Logger; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java index 7c6e165f..d607f67f 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.webapp; import java.io.ByteArrayInputStream; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/MoccaContextListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/MoccaContextListener.java index 428190eb..24ef75a9 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/MoccaContextListener.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/MoccaContextListener.java @@ -1,19 +1,27 @@ /* -* Copyright 2009 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + + package at.gv.egiz.bku.local.webapp; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java index 1d079786..1989237f 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.webapp; import at.gv.egiz.bku.local.stal.LocalSTALFactory; diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java index 62f393a8..93307d95 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java @@ -1,19 +1,27 @@ /* - * Copyright 2008 Federal Chancellery Austria and - * Graz University of Technology + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the Licence is distributed on an "AS IS" basis, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. */ + + package at.gv.egiz.bku.local.webapp; import javax.servlet.http.HttpServlet; diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/accessControlConfig.xml b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/accessControlConfig.xml index 586a8190..7f2eb7de 100644 --- a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/accessControlConfig.xml +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/accessControlConfig.xml @@ -1,96 +1,106 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2008 Federal Chancellery Austria and Graz University of
- Technology Licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the
- License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
-<AccessControl>
- <Chains>
- <!--
- The input chain defines filters that are applied before command
- execution
- -->
- <Chain Id="InputChain">
- <Rules>
- <!-- there is no command implemented that requires input filtering -->
- <Rule Id="InputChain-AllowAll">
- <Action>
- <RuleAction>allow</RuleAction>
- </Action>
- <UserInteraction>confirm</UserInteraction>
- </Rule>
- </Rules>
- </Chain>
-
- <!--
- The output chain defines filters that are applied after command
- execution
- -->
- <Chain Id="OutputChain">
- <Rules>
- <Rule Id="OutputChain-Egov">
- <AuthClass>anonymous</AuthClass>
- <Action>
- <RuleAction>allow</RuleAction>
- </Action>
- <UserInteraction>confirm</UserInteraction>
- </Rule>
- <Rule Id="OutputChain-Command">
- <AuthClass>anonymous</AuthClass>
- <Action>
- <ChainRef>Command</ChainRef>
- </Action>
- </Rule>
- </Rules>
- </Chain>
- <Chain Id="Command">
- <Rules>
- <Rule Id="cmd-rule-1">
- <AuthClass>certified</AuthClass>
- <Command Name="Infobox.*">
- <Param Name="InfoboxIdentifier">IdentityLink</Param>
- <Param Name="PersonIdentifier">derived</Param>
- </Command>
- <Action>
- <RuleAction>allow</RuleAction>
- </Action>
- <UserInteraction>confirm</UserInteraction>
- </Rule>
- <Rule Id="cmd-rule-localhost">
- <AuthClass>anonymous</AuthClass>
- <IPv4Address>127.0.0.1</IPv4Address>
- <Command Name="Infobox.*">
- <Param Name="InfoboxIdentifier">IdentityLink</Param>
- <Param Name="PersonIdentifier">derived</Param>
- </Command>
- <Action>
- <RuleAction>allow</RuleAction>
- </Action>
- <UserInteraction>confirm</UserInteraction>
- </Rule>
- <Rule Id="cmd-rule-2">
- <AuthClass>anonymous</AuthClass>
- <Command Name="Infobox.*">
- <Param Name="InfoboxIdentifier">IdentityLink</Param>
- </Command>
- <Action>
- <RuleAction>deny</RuleAction>
- </Action>
- <UserInteraction>info</UserInteraction>
- </Rule>
- <Rule Id="cmd-rule-3">
- <Action>
- <RuleAction>allow</RuleAction>
- </Action>
- </Rule>
- </Rules>
- </Chain>
- </Chains>
-</AccessControl>
+<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. + + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ + + Unless required by applicable law or agreed to in writing, software + distributed under the Licence is distributed on an "AS IS" basis, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. +--> +<AccessControl> + <Chains> + <!-- + The input chain defines filters that are applied before command + execution + --> + <Chain Id="InputChain"> + <Rules> + <!-- there is no command implemented that requires input filtering --> + <Rule Id="InputChain-AllowAll"> + <Action> + <RuleAction>allow</RuleAction> + </Action> + <UserInteraction>confirm</UserInteraction> + </Rule> + </Rules> + </Chain> + + <!-- + The output chain defines filters that are applied after command + execution + --> + <Chain Id="OutputChain"> + <Rules> + <Rule Id="OutputChain-Egov"> + <AuthClass>anonymous</AuthClass> + <Action> + <RuleAction>allow</RuleAction> + </Action> + <UserInteraction>confirm</UserInteraction> + </Rule> + <Rule Id="OutputChain-Command"> + <AuthClass>anonymous</AuthClass> + <Action> + <ChainRef>Command</ChainRef> + </Action> + </Rule> + </Rules> + </Chain> + <Chain Id="Command"> + <Rules> + <Rule Id="cmd-rule-1"> + <AuthClass>certified</AuthClass> + <Command Name="Infobox.*"> + <Param Name="InfoboxIdentifier">IdentityLink</Param> + <Param Name="PersonIdentifier">derived</Param> + </Command> + <Action> + <RuleAction>allow</RuleAction> + </Action> + <UserInteraction>confirm</UserInteraction> + </Rule> + <Rule Id="cmd-rule-localhost"> + <AuthClass>anonymous</AuthClass> + <IPv4Address>127.0.0.1</IPv4Address> + <Command Name="Infobox.*"> + <Param Name="InfoboxIdentifier">IdentityLink</Param> + <Param Name="PersonIdentifier">derived</Param> + </Command> + <Action> + <RuleAction>allow</RuleAction> + </Action> + <UserInteraction>confirm</UserInteraction> + </Rule> + <Rule Id="cmd-rule-2"> + <AuthClass>anonymous</AuthClass> + <Command Name="Infobox.*"> + <Param Name="InfoboxIdentifier">IdentityLink</Param> + </Command> + <Action> + <RuleAction>deny</RuleAction> + </Action> + <UserInteraction>info</UserInteraction> + </Rule> + <Rule Id="cmd-rule-3"> + <Action> + <RuleAction>allow</RuleAction> + </Action> + </Rule> + </Rules> + </Chain> + </Chains> +</AccessControl> diff --git a/BKULocal/src/main/resources/log4j.properties b/BKULocal/src/main/resources/log4j.properties index 86ddc7b4..de1d82fd 100644 --- a/BKULocal/src/main/resources/log4j.properties +++ b/BKULocal/src/main/resources/log4j.properties @@ -1,17 +1,23 @@ -# Copyright 2008 Federal Chancellery Austria and -# Graz University of Technology +# Copyright 2011 by Graz University of Technology, Austria +# MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint +# initiative of the Federal Chancellery Austria and Graz University of Technology. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 +# Licensed under the EUPL, Version 1.1 or - as soon they will be approved by +# the European Commission - subsequent versions of the EUPL (the "Licence"); +# You may not use this work except in compliance with the Licence. +# You may obtain a copy of the Licence at: +# http://www.osor.eu/eupl/ # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, +# distributed under the Licence is distributed on an "AS IS" basis, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# See the Licence for the specific language governing permissions and +# limitations under the Licence. +# +# This product combines work with different licenses. See the "NOTICE" text +# file for details on the various modules and licenses. +# The "NOTICE" text file is part of the distribution. Any derivative works +# that you distribute must include a readable copy of the "NOTICE" text file. # assume log4j to be configured by servlet container (java web start) # loglever DEBUG, appender STDOUT diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml index fbbf1e1f..f2953982 100644 --- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml +++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml @@ -1,208 +1,218 @@ -<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Copyright 2008 Federal Chancellery Austria and Graz University of
- Technology Licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the
- License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
- <!-- configuration -->
- <bean id="configurationResource"
- class="org.springframework.web.context.support.ServletContextParameterFactoryBean">
- <property name="initParamName" value="configurationResource" />
- </bean>
-
- <bean id="configuration" class="at.gv.egiz.bku.spring.ConfigurationFactoryBean">
- <property name="configurationResource" ref="configurationResource" />
- </bean>
-
- <bean id="smccConfiguration" class="at.gv.egiz.bku.local.spring.SMCCConfigurationFactoryBean">
- <property name="configuration" ref="configuration"/>
- </bean>
-
- <bean id="readerFactory" class="at.gv.egiz.smcc.reader.ReaderFactory">
- <property name="configuration" ref="smccConfiguration"/>
- </bean>
-
- <bean id="sslPKIProfile" class="at.gv.egiz.bku.spring.PKIProfileFactoryBean">
- <property name="configuration" ref="configuration"/>
- <property name="trustProfileId" value="SSL"/>
- </bean>
-
- <bean id="sslSocketFactory" class="at.gv.egiz.bku.spring.SSLSocketFactoryBean">
- <property name="configuration" ref="configuration"/>
- <property name="pkiProfile" ref="sslPKIProfile"/>
- </bean>
-
- <bean id="hostnameVerifier" class="at.gv.egiz.bku.spring.ConfigurableHostnameVerifier">
- <property name="configuration" ref="configuration"/>
- </bean>
-
- <bean id="urlDereferencer" class="at.gv.egiz.bku.utils.urldereferencer.URLDereferencerImpl"
- factory-method="getInstance">
- <property name="SSLSocketFactory" ref="sslSocketFactory"/>
- <property name="hostnameVerifier" ref="hostnameVerifier"/>
- </bean>
-
- <!-- security manager for the command invoker -->
- <bean id="securityManager" class="at.gv.egiz.bku.spring.SecurityManagerFactoryBean">
- <property name="configuration" ref="configuration" />
- </bean>
-
- <!-- command invoker -->
- <bean id="slCommandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">
- <property name="securityManager" ref="securityManager" />
- </bean>
-
- <!-- Security Layer command factory -->
-
- <bean id="abstractCommandFactory" class="at.gv.egiz.bku.slcommands.AbstractSLCommandFactory"
- abstract="true">
- <property name="configuration" ref="configuration"/>
- </bean>
-
- <bean id="certificatesInfoboxFactory"
- class="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxFactory" />
- <bean id="identityLinkInfoboxFactory"
- class="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxFactory">
- <property name="identityLinkTransformer">
- <bean class="at.gv.egiz.idlink.IdentityLinkTransformer">
- <property name="urlDereferencer" ref="urlDereferencer"/>
- </bean>
- </property>
- </bean>
- <!-- not supported -->
- <!--
- <bean id="cardChannelInfoboxFactory"
- class="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxFactory" />
- -->
- <bean id="svPersonendatenInfoboxFactory"
- class="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxFactory" />
-
- <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory">
- <property name="infoboxFactories">
- <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" />
- </map>
- </property>
- </bean>
-
- <bean id="nullOperationCommandFactory"
- class="at.gv.egiz.bku.slcommands.impl.NullOperationCommandFactory"
- parent="abstractCommandFactory" />
- <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"
- parent="abstractCommandFactory">
- <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"
- parent="abstractCommandFactory">
- <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"
- parent="abstractCommandFactory" />
- <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"
- parent="abstractCommandFactory" />
- <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="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>
- </bean>
-
- <!-- STAL factory -->
- <bean id="stalFactory" class="at.gv.egiz.bku.local.stal.ExclusiveAccessSTALFactory">
- <property name="stalFactory">
- <bean class="at.gv.egiz.bku.local.stal.LocalSTALFactory" scope="singleton">
- <property name="helpURL" value="http://localhost:3495/help/" />
- <property name="configuration" ref="configuration" />
- </bean>
- </property>
- </bean>
-
- <!-- binding processor factories -->
- <bean id="httpBindingProcessorFactory" class="at.gv.egiz.bku.binding.HTTPBindingProcessorFactory">
- <property name="configuration" ref="configuration" />
- <property name="urlDereferencer" ref="urlDereferencer" />
- <property name="sslSocketFactory" ref="sslSocketFactory" />
- <property name="hostnameVerifier" ref="hostnameVerifier" />
- <property name="slCommandFactory" ref="slCommandFactory" />
- </bean>
-
- <!-- binding processor manager -->
- <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
- scope="singleton">
- <property name="stalFactory" ref="stalFactory" />
- <property name="slCommandInvoker" ref="slCommandInvoker" />
- <property name="factories">
- <list>
- <ref bean="httpBindingProcessorFactory"/>
- </list>
- </property>
- </bean>
-
- <bean id="attributeExporter"
- class="org.springframework.web.context.support.ServletContextAttributeExporter">
- <property name="attributes">
- <map>
- <entry key="bindingProcessorManager">
- <ref bean="bindingProcessorManager" />
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- Shutdown Event handler -->
- <bean id="shutdownHandler" class="at.gv.egiz.bku.spring.ShutdownHandler">
- <property name="bindingProcessorManager" ref="bindingProcessorManager" />
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. + + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ + + Unless required by applicable law or agreed to in writing, software + distributed under the Licence is distributed on an "AS IS" basis, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd"> + + <!-- configuration --> + <bean id="configurationResource" + class="org.springframework.web.context.support.ServletContextParameterFactoryBean"> + <property name="initParamName" value="configurationResource" /> + </bean> + + <bean id="configuration" class="at.gv.egiz.bku.spring.ConfigurationFactoryBean"> + <property name="configurationResource" ref="configurationResource" /> + </bean> + + <bean id="smccConfiguration" class="at.gv.egiz.bku.local.spring.SMCCConfigurationFactoryBean"> + <property name="configuration" ref="configuration"/> + </bean> + + <bean id="readerFactory" class="at.gv.egiz.smcc.reader.ReaderFactory"> + <property name="configuration" ref="smccConfiguration"/> + </bean> + + <bean id="sslPKIProfile" class="at.gv.egiz.bku.spring.PKIProfileFactoryBean"> + <property name="configuration" ref="configuration"/> + <property name="trustProfileId" value="SSL"/> + </bean> + + <bean id="sslSocketFactory" class="at.gv.egiz.bku.spring.SSLSocketFactoryBean"> + <property name="configuration" ref="configuration"/> + <property name="pkiProfile" ref="sslPKIProfile"/> + </bean> + + <bean id="hostnameVerifier" class="at.gv.egiz.bku.spring.ConfigurableHostnameVerifier"> + <property name="configuration" ref="configuration"/> + </bean> + + <bean id="urlDereferencer" class="at.gv.egiz.bku.utils.urldereferencer.URLDereferencerImpl" + factory-method="getInstance"> + <property name="SSLSocketFactory" ref="sslSocketFactory"/> + <property name="hostnameVerifier" ref="hostnameVerifier"/> + </bean> + + <!-- security manager for the command invoker --> + <bean id="securityManager" class="at.gv.egiz.bku.spring.SecurityManagerFactoryBean"> + <property name="configuration" ref="configuration" /> + </bean> + + <!-- command invoker --> + <bean id="slCommandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl"> + <property name="securityManager" ref="securityManager" /> + </bean> + + <!-- Security Layer command factory --> + + <bean id="abstractCommandFactory" class="at.gv.egiz.bku.slcommands.AbstractSLCommandFactory" + abstract="true"> + <property name="configuration" ref="configuration"/> + </bean> + + <bean id="certificatesInfoboxFactory" + class="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxFactory" /> + <bean id="identityLinkInfoboxFactory" + class="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxFactory"> + <property name="identityLinkTransformer"> + <bean class="at.gv.egiz.idlink.IdentityLinkTransformer"> + <property name="urlDereferencer" ref="urlDereferencer"/> + </bean> + </property> + </bean> + <!-- not supported --> + <!-- + <bean id="cardChannelInfoboxFactory" + class="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxFactory" /> + --> + <bean id="svPersonendatenInfoboxFactory" + class="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxFactory" /> + + <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"> + <property name="infoboxFactories"> + <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" /> + </map> + </property> + </bean> + + <bean id="nullOperationCommandFactory" + class="at.gv.egiz.bku.slcommands.impl.NullOperationCommandFactory" + parent="abstractCommandFactory" /> + <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" + parent="abstractCommandFactory"> + <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" + parent="abstractCommandFactory"> + <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" + parent="abstractCommandFactory" /> + <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" + parent="abstractCommandFactory" /> + <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="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> + </bean> + + <!-- STAL factory --> + <bean id="stalFactory" class="at.gv.egiz.bku.local.stal.ExclusiveAccessSTALFactory"> + <property name="stalFactory"> + <bean class="at.gv.egiz.bku.local.stal.LocalSTALFactory" scope="singleton"> + <property name="helpURL" value="http://localhost:3495/help/" /> + <property name="configuration" ref="configuration" /> + </bean> + </property> + </bean> + + <!-- binding processor factories --> + <bean id="httpBindingProcessorFactory" class="at.gv.egiz.bku.binding.HTTPBindingProcessorFactory"> + <property name="configuration" ref="configuration" /> + <property name="urlDereferencer" ref="urlDereferencer" /> + <property name="sslSocketFactory" ref="sslSocketFactory" /> + <property name="hostnameVerifier" ref="hostnameVerifier" /> + <property name="slCommandFactory" ref="slCommandFactory" /> + </bean> + + <!-- binding processor manager --> + <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl" + scope="singleton"> + <property name="stalFactory" ref="stalFactory" /> + <property name="slCommandInvoker" ref="slCommandInvoker" /> + <property name="factories"> + <list> + <ref bean="httpBindingProcessorFactory"/> + </list> + </property> + </bean> + + <bean id="attributeExporter" + class="org.springframework.web.context.support.ServletContextAttributeExporter"> + <property name="attributes"> + <map> + <entry key="bindingProcessorManager"> + <ref bean="bindingProcessorManager" /> + </entry> + </map> + </property> + </bean> + + <!-- Shutdown Event handler --> + <bean id="shutdownHandler" class="at.gv.egiz.bku.spring.ShutdownHandler"> + <property name="bindingProcessorManager" ref="bindingProcessorManager" /> + </bean> + </beans>
\ No newline at end of file diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml index b8bc8818..acfb5278 100644 --- a/BKULocal/src/main/webapp/WEB-INF/web.xml +++ b/BKULocal/src/main/webapp/WEB-INF/web.xml @@ -1,19 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2008 Federal Chancellery Austria and - Graz University of Technology + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, + distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. --> <web-app id="bkulocal" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>http-security-layer-request</display-name> diff --git a/BKULocal/src/main/webapp/de/index.html b/BKULocal/src/main/webapp/de/index.html index d2032e44..2620820b 100644 --- a/BKULocal/src/main/webapp/de/index.html +++ b/BKULocal/src/main/webapp/de/index.html @@ -1,18 +1,24 @@ <!-- - Copyright 2008 Federal Chancellery Austria and - Graz University of Technology + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, + distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> diff --git a/BKULocal/src/main/webapp/index.html b/BKULocal/src/main/webapp/index.html index ff4b2a99..cd191ea2 100644 --- a/BKULocal/src/main/webapp/index.html +++ b/BKULocal/src/main/webapp/index.html @@ -1,18 +1,24 @@ <!-- - Copyright 2008 Federal Chancellery Austria and - Graz University of Technology + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, + distributed under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> diff --git a/BKULocal/src/site/site.xml b/BKULocal/src/site/site.xml index 7500b6cc..020a04d5 100644 --- a/BKULocal/src/site/site.xml +++ b/BKULocal/src/site/site.xml @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. + Copyright 2011 by Graz University of Technology, Austria + MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + initiative of the Federal Chancellery Austria and Graz University of Technology. + + Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + the European Commission - subsequent versions of the EUPL (the "Licence"); + You may not use this work except in compliance with the Licence. + You may obtain a copy of the Licence at: + http://www.osor.eu/eupl/ + + Unless required by applicable law or agreed to in writing, software + distributed under the Licence is distributed on an "AS IS" basis, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the Licence for the specific language governing permissions and + limitations under the Licence. + + This product combines work with different licenses. See the "NOTICE" text + file for details on the various modules and licenses. + The "NOTICE" text file is part of the distribution. Any derivative works + that you distribute must include a readable copy of the "NOTICE" text file. --> <project name="MOCCA"> diff --git a/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java b/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java index c6b69781..da6c8664 100644 --- a/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java +++ b/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java @@ -1,19 +1,27 @@ /* -* Copyright 2008 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + + package at.gv.egiz.bku.local.stal; import java.io.ByteArrayOutputStream; |