Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Conflicts:
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/WEB-INF/spring/root-context.xml

src/main/webapp/WEB-INF/ckez-bind-lang-addon.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language-addon>
+    <!-- The name of this addon. It must be unique -->
+    <addon-name>ckezbind</addon-name>
+    <!-- Specifies what other addon this depends
+    <depends></depends>
+    -->
+    <!-- Which language this addon will be added to -->
+    <language-name>xul/html</language-name>
+ 
+    <component>
+        <component-name>ckeditor</component-name>
+        <extends>ckeditor</extends>
+        <annotation>
+            <annotation-name>ZKBIND</annotation-name>
+            <property-name>value</property-name>
+            <attribute>
+                <attribute-name>ACCESS</attribute-name>
+                <attribute-value>both</attribute-value>
+            </attribute>
+            <attribute>
+                <attribute-name>SAVE_EVENT</attribute-name>
+                <attribute-value>onChange</attribute-value>
+            </attribute>
+            <attribute>
+                <attribute-name>LOAD_REPLACEMENT</attribute-name>
+                <attribute-value>value</attribute-value>
+            </attribute>
+            <attribute>
+                <attribute-name>LOAD_TYPE</attribute-name>
+                <attribute-value>java.lang.String</attribute-value>
+            </attribute>
+        </annotation>
+    </component>
+</language-addon>

src/main/webapp/WEB-INF/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.dialect=org.hibernate.dialect.MySQLDialect
-jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=utf8
 jdbc.username=root
 jdbc.password=xsacfgd

src/main/webapp/WEB-INF/mapa-lang-addon.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language-addon>
+    <addon-name>mapa</addon-name>
+    <language-name>xul/html</language-name>
+  
+    <component>
+        <component-name>mapa</component-name>
+        <component-class>info.bukova.isspst.ui.Mapa</component-class>
+        <widget-class>info.bukova.isspst.ui.Mapa</widget-class>
+    </component>
+</language-addon>

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -88,7 +88,13 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="addressDao" class="info.bukova.isspst.dao.jpa.AddressDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
+    <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
+    
 	<bean id="userService" class="info.bukova.isspst.services.users.UserServiceImpl">
 		<property name="dao" ref="userDao"/>
 		<property name="encoder" ref="passwordEncoder"/>
@@ -97,5 +103,31 @@
 	<bean id="roleService" class="info.bukova.isspst.services.users.RoleServiceImpl">
 		<property name="dao" ref="roleDao"/>
 	</bean>
+	
+	<bean id="adbService" class="info.bukova.isspst.services.addressbook.AdbServiceImpl">
+		<property name="dao" ref="addressDao"/>
+		<property name="validator" ref="validator"/>
+	</bean>
+	
+	<bean id="addressFinderAres" class="info.bukova.isspst.services.addressbook.AddressFinderAres">
+		<property name="aresUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_std.cgi"/>
+		<property name="unmarsheller" ref="unmarshallerAres"/>
+	</bean>
+	
+	<bean id="addressFinderTaxID" class="info.bukova.isspst.services.addressbook.AddressFinderTaxID">
+		<property name="aresDicUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_bas.cgi"/>
+	</bean>
+	
+	<bean id="xmlCtxAres" class="org.castor.spring.xml.XMLContextFactoryBean">
+		<property name="mappingLocations">
+			<list>
+				<value>info/bukova/isspst/services/addressbook/mappingAres.xml</value>
+			</list>
+		</property>
+	</bean>
+	
+	<bean id="unmarshallerAres" class="org.castor.spring.xml.CastorUnmarshallerFactoryBean">
+		<property name="xmlContext" ref="xmlCtxAres"/>
+	</bean>
 		
 </beans>

src/main/webapp/WEB-INF/zk.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<zk>
+	<!-- [Optional]
+	Uncomment if you want to defines the application's name 
+	
+	<preference>
+		<name>org.zkoss.zk.ui.WebApp.name</name>
+		<value>rsfaktura</value>
+	</preference>
+	-->
+	
+	<client-config>
+        <debug-js>true</debug-js>
+    </client-config>
+    <library-property>
+        <name>org.zkoss.web.classWebResource.cache</name>
+        <value>false</value>
+    </library-property>
+	
+	<language-config>
+        <addon-uri>/WEB-INF/mapa-lang-addon.xml</addon-uri> 
+        <addon-uri>/WEB-INF/ckez-bind-lang-addon.xml</addon-uri>
+    </language-config>
+    
+    <!-- <library-property>
+    	<name>org.zkoss.zul.progressbox.position</name>
+    	<value>center</value>
+	</library-property> -->
+</zk>