# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fu_weber-20111214093938-a39naqh7j9ymob3t
# target_branch: https://launchpad.net/goobi-production/1.7
# testament_sha1: 61c5133ddc63e0f0caa5a80b66139cdcd5ce82f5
# timestamp: 2011-12-14 10:40:22 +0100
# message: Bugfix 782051 and modules.xml
# base_revision_id: ralf.claussnitzer@slub-dresden.de-20111213130926-\
#   e68p1deib1yonwwg
# 
# Begin patch
=== added file 'config/modules.xml'
--- config/modules.xml	1970-01-01 00:00:00 +0000
+++ config/modules.xml	2011-12-14 09:39:38 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleDesc>
+	<Params name="TestService" url="http://localhost:1234" description="TestService">
+	</Params>
+</ModuleDesc>

=== modified file 'src/de/sub/goobi/helper/BeanHelper.java'
--- src/de/sub/goobi/helper/BeanHelper.java	2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/BeanHelper.java	2011-12-14 09:39:38 +0000
@@ -101,6 +101,8 @@
 			stepneu.setTypBeimAnnehmenAbschliessen(step.isTypBeimAnnehmenAbschliessen());
 			stepneu.setTypBeimAnnehmenModul(step.isTypBeimAnnehmenModul());
 			stepneu.setTypBeimAnnehmenModulUndAbschliessen(step.isTypBeimAnnehmenModulUndAbschliessen());
+			// Fixing a bug found by Frank-Ulrich Weber
+			stepneu.setTypModulName(step.getTypModulName());
 			stepneu.setTypExportDMS(step.isTypExportDMS());
 			stepneu.setTypExportRus(step.isTypExportRus());
 			stepneu.setTypImagesLesen(step.isTypImagesLesen());

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSMoi10AAgrfgAAyUGP///dD
ToC////wUAS49pkDUKm2UlBJJNJk0niZNNTyRmpjU9Rk9U9J6nqA0yGQ5gE0wCZDAAEwTAAABiKN
R6p4jT1NE9EGg0A00BkaaBoOYBNMAmQwABMEwAAASiE00xMiMiabRTwpN6TU02k2iYmJ6jRBFBUv
ab6ZD2f5FbSwvB0xlRirYEWXJg7q6zNtyRkNNCSOzUa5oIUM3BOrzOL1Noy7tevz9ZDUN2y7cgof
apQI23+IJWPU2GfGITX+sFTWOQX50+fNm6oiIlSKmoYzDAYA/y2VA4J9g6Jyppv9mqax/sIB+ap6
cQ5+Nus+RRJnsI34RCparHRqT3wpA+xiosc9kazA3kSUBRRHJxG722PkIwlA9f4Xa9PjcGB29t4g
OERZcXuETMjQbOFG5d15dqTJJYMEMg9VXE6XNVK9HRoKLMNtjOPAHFiEhXMFIuMdmQxgpAgR5kQX
sE7m53FhgEWq3pxdKImrRMBcaWfhkkjgnMAzGKFc1/BUXCgOUCAEL/SgD0xXJgzSggqho0bvvbXc
pc3ZSpIikrbWJ7m92V76zGxLAzMS0uRhOLQnWzKp/s7b5I2tpIe6ahxDIva5HMoDaSJFGF4biBOF
pnjXXfRQ0gRMCBsoWlWjjvArYQyU3riBUjnFHKcNfcezS+WcNprMUsS42MByGwoAwDHWRgSLDcXJ
AD0A8LOWzrvcEikaY2WMHvYjmAtQtZCsqIo2xx4sMy4S1GYYgxsHDFb3dvcNwNfSDG4L54qKKp9H
uan56jSvAjfgMZrP8kMF+B2j5HvtK81uorhaeMAXgSYqMhEx27pgNpicPI+Put67PA0RSl9W5Bfb
7FqthJGYaACj+EyXutwb+S53BynXnsLQPMqH3aDr85PHxhSJNKo7zwxQ9SF5YUS3z59x3E+06yex
2xs7cwgqrkgr02EerBc4gjiDqOg+NFWmqv1pCZeEoT4b0lu1BRiB0OR1Hg08L1VjPbr4yTvrkcy0
mkDwaLMNM46kccKyI9/gBiOCnLNhmbyl2VrPBsaCFxR/mHhpYnvRQga+CgKiv2uUG8bX/o1B/xdy
kG/5C5yysQqhZEOxlzOG85DU0aDBqj6pP5HY3GLmJ4r5H7lBxmwmGhYKW0l60iF2wjHoD6AA2UGe
9QKrXkQ4s29jltHEfHkhou5a0nFvojq9Mh67KYdCyspp0bs4Tfh5n0A3p5m6C7EPOQbk3BIJMCuh
cHMHtGEGByEyZ0uD6SuDSaXId0yeiHn7k/AHSq84xRSEbsAZD2yLmBA+nIjJyZwQl9IOiE9gZQq6
hIdV11foLAbaiZszTxtI9UFT4YtRl7qT5I+JntUUGliYhdCWduMaGsC2DGIiZKg1C0HHDrm9yJ2B
/q1JZhzsolVT9GI+MbvwIC96sgCt0lbwKMGuYmNRlZOI1pb4CQI5KQlcuHtKLOWsojg4kexGPO8I
GhcS6g73JddfrmbooTSX2GPUM+qhh9fWBgG3p9YtAswplSGQbmynT3kqLjtAmfzUSolb2uDhmRoy
ryA6L6l9L8y7AlUkn/F3JFOFCQIyiLXQ