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

Conflicts: src/main/java/info/bukova/isspst/AppInitListener.java src/main/java/info/bukova/isspst/Constants.java
2014-07-06 17:46:29 +02:00
parent 8bcfc04c15 9905cc769d
commit 54edc0c4cf
59 changed files with 1446 additions and 50 deletions
@@ -39,4 +39,7 @@ username=Uživatelské jméno

 #Skupiny
 centre=Středisko
-members=Členové
+members=Členové
+
+#Materiál
+munit=Měrná jednotka
@@ -100,6 +100,9 @@ UsersGridColumnSureName=Příjmení
 AgendaMaterial=Materiál
 MaterialFormTitle=Materiál

+AgendaServices=Služby
+ServiceFormTitle=Služba
+
 AgendaWorkgroups=Střediska / komise
 WorkgroupFormTitle=Pracvní skupina

@@ -111,6 +114,22 @@ CentreRoles=Role středisek
 Workflow=Proces schválení
 WorkgroupWorkflow=Schválení v komisi
 CentreWorkflow=Schválení ve středisku
+LimitFormTitle=Limit pro schválení
+Limit=Limit: 
+OverLimit=Pouze nadlimitní
+
+NumberSeriesFormTitle=Číselné řady
+Number=Číslo: 
+Prefix=Prefix: 
+
+GlobalSettings=Globální nastavení
+Requirements=Požadavky
+EMails=E-maily
+NewRequirement=Nový požadavek
+AuthRequirement=Dílčí schválení
+ConfirmRequirement=Schválení
+InsertField=Vložit pole
+EnableRequirements=Povolit zadávání požadavků

 CentresForRequirements=Střediska, pro která lze vkládat požadavky
 WorkgroupMembership=Členství v komisích
@@ -138,6 +157,12 @@ ReportTitle=Nadpis sestavy:
 ReportOptions=Volby sestavy
 ReportNoOptions=Žádná nestavení

+MailForm=Odeslání e-mailu
+MailFor=Komu:
+MailSubject=Předmět:
+MailSend=Odeslat
+MailAttachement=Příloha:
+
 Error=Chyba
 ErrorRights=K vykobání této operace nemáte dostatečná oprávnění

@@ -0,0 +1,7 @@
+mail.from=kosef.rokos@gmail.com
+mail.host=smtp.gmail.com
+mail.port=587
+mail.useauth=true
+mail.usessl=true
+mail.username=josef.rokos@gmail.com
+mail.password=XXXXXX
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	
+	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+		<property name="host" value="${mail.host}"/>
+		<property name="port" value="${mail.port}"/>
+		<property name="username" value="${mail.username}"/>
+		<property name="password" value="${mail.password}"/>
+		<property name="defaultEncoding" value="UTF-8"/>
+		<property name="javaMailProperties">
+			<props>
+				<prop key="mail.smtp.auth">${mail.useauth}</prop>
+				<prop key="mail.smtp.starttls.enable">${mail.usessl}</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
+		<constructor-arg ref="mailSender"/>
+		<property name="from" value="${mail.from}"/>
+	</bean>
+	
+	<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">
+		<constructor-arg ref="mailSender"/>
+		<property name="from" value="${mail.from}"/>
+	</bean>
+	
+<!-- 	<bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
+<!-- 		<constructor-arg ref="attachementMailer"/> -->
+<!-- 	</bean> -->
+	
+<!-- 	<bean id="attachementMailer" class="info.bukova.rsfaktura.services.mail.AttachementMailer"> -->
+<!-- 		<constructor-arg ref="tmpStorage"/> -->
+<!-- 		<property name="from" value="josef.rokos@gmail.com"/> -->
+<!-- 		<property name="sender" ref="mailSender"/> -->
+<!-- 	</bean> -->
+	
+<!-- 	<bean id="messageBuilder" class="info.bukova.rsfaktura.services.mail.MailMessageBuilder"> -->
+<!-- 		<constructor-arg ref="tmpStorage"/> -->
+<!-- 	</bean> -->
+
+</beans>
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context"
+<beans xmlns="http://www.springframework.org/schema/beans" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xmlns:p="http://www.springframework.org/schema/p" 
+	xmlns:tx="http://www.springframework.org/schema/tx" 
+	xmlns:aop="http://www.springframework.org/schema/aop" 
+	xmlns:security="http://www.springframework.org/schema/security" 
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:task="http://www.springframework.org/schema/task"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">

 	<!-- Root Context: defines shared resources visible to all other web components -->

 	<context:annotation-config />
 	<context:component-scan base-package="info.bukova.isspst,org.zkoss.spring.beans.zkcomponents"></context:component-scan>
+	
+	<task:annotation-driven/>

 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertyConfigurer">
 		<property name="locations">
 			<list>
 				<value>/WEB-INF/jdbc.properties</value>
 				<value>/WEB-INF/ldap.properties</value>
+				<value>/WEB-INF/mail.properties</value>
 			</list>
 		</property>
 	</bean>
@@ -75,6 +86,8 @@

 	<import resource="database-auth.xml"/>
 	<!-- <import resource="ldap-auth.xml"/> --> 
+	
+	<import resource="mail-services.xml"/>

 	<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetClass" value="org.springframework.security.core.context.SecurityContextHolder" />
@@ -140,6 +153,14 @@
    	<property name="sessionFactory" ref="sessionFactory"/>
    </bean>
    
+    <bean id="serviceItemDao" class="info.bukova.isspst.dao.jpa.ServiceItemDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
+    <bean id="settingsDao" class="info.bukova.isspst.dao.jpa.GlobalSettingsDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
    <!-- Business logic -->
    <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
    
@@ -192,7 +213,7 @@
 		<property name="dao" ref="permissionDao"/>
 	</bean>
 	
-	<bean id="materialService" class="info.bukova.isspst.services.material.MaterialServiceImpl">
+	<bean id="materialService" class="info.bukova.isspst.services.reqsubjects.MaterialServiceImpl">
 		<property name="dao" ref="materialDao"/>
 		<property name="validator" ref="validator"/>
 	</bean>
@@ -217,4 +238,32 @@
 		<property name="dao" ref="numericSeriesDao" />
 		<property name="validator" ref="validator" />
 	</bean>
+	
+	<bean id="serviceItemService" class="info.bukova.isspst.services.reqsubjects.ServiceItemServiceImpl">
+		<property name="dao" ref="serviceItemDao" />
+		<property name="validator" ref="validator" />
+	</bean>
+	
+	<bean id="settingsService" class="info.bukova.isspst.services.settings.GlobalSettingServiceImpl">
+		<constructor-arg name="marshaller" ref="marshallerSettings"/>
+		<constructor-arg name="unmarshaller" ref="unmarshallerSettings"/>
+		<property name="dao" ref="settingsDao"/>
+	</bean>
+	
+	<bean id="xmlCtxSettings" class="org.castor.spring.xml.XMLContextFactoryBean">
+		<property name="castorProperties">
+			<props>
+				<prop key="org.exolab.castor.xml.introspector.primitive.nodetype">element</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="unmarshallerSettings" class="org.castor.spring.xml.CastorUnmarshallerFactoryBean">
+		<property name="xmlContext" ref="xmlCtxSettings" />
+	</bean>
+	
+	<bean id="marshallerSettings" class="org.castor.spring.xml.CastorMarshallerFactoryBean">
+		<property name="xmlContext" ref="xmlCtxSettings" />
+	</bean>
+	
 </beans>