Merge remote-tracking branch 'origin/master' into moly

build/application.properties

+#linux server ip address
+linux_server_ip=localhost
+#set system parameters for 4A by huach on 20140802 begin
+4a.server.ip=172.16.8.121
+4a.login.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appLoginResult
+4a.logout.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appExit
+4a.syslog.ip=172.16.8.117
+4a.syslog.port=514
+local.ip.prefix=192.168
+#set system parameters for 4A by huach on 20140802 end
+#vertica database setting
+#jdbc.driver=com.vertica.jdbc.Driver
+
+#vertica database ip address
+jdbc.dbip=hg-computer
+
+jdbc.dbport=5433
+
+jdbc.database=ccolap
+
+#jdbc.url=jdbc\:vertica\://16.162.242.79\:5433/ccolap
+#jdbc.username=CCOLAP
+#jdbc.password=ccolap-cmsz
+#jdbc.driver=com.vertica.jdbc.Driver
+
+#jdbc.driver=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
+#jdbc.username=szcm
+#jdbc.password=szcm
+jdbc.driver=com.vertica.jdbc.Driver
+jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
+jdbc.username=ccolap
+jdbc.password=hg.2015
+##test
+#connection pool settings
+jdbc.pool.initialSize=10
+jdbc.pool.maxActive=100
+jdbc.pool.maxIdle=50
+jdbc.pool.minIdle=10  
+jdbc.pool.suspectTimeout=60  
+jdbc.pool.timeBetweenEvictionRunsMillis=30000  
+jdbc.pool.minEvictableIdleTimeMillis=60000  
+jdbc.pool.removeAbandoned=true  
+jdbc.pool.removeAbandonedTimeout=60  
+jdbc.pool.logAbandoned=true  
+
+#############
+perl.location=/perl/xcd_variable_analysis.pl
+insert.script.location=/perl/xcd_variable_analysis.txt

build/applicationContext-shiro.xml

+<?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-3.2.xsd"
+	default-lazy-init="true">
+	<description>Shiro\u5b89\u5168\u914d\u7f6e</description>
+
+	<!-- Shiro's main business-tier object for web-enabled applications -->
+	<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
+		<property name="realm" ref="shiroDbRealm" />
+		<property name="cacheManager" ref="shiroEhcacheManager" />
+	</bean>
+
+	<!-- \u9805\u76ee\u81ea\u5b9a\u4e49\u7684Realm, \u6240\u6709accountService\u4f9d\u8d56\u7684dao\u90fd\u9700\u8981\u7528depends-on\u58f0\u660e -->
+	<bean id="shiroDbRealm" class="com.hp.cmsz.service.account.ShiroDbRealm" depends-on="systemFunctionDao,roleInfoDao,userInfoDao,systemParameterDao">
+	<!-- 	<property name="accountService" ref="accountService"/> -->
+	</bean>
+	
+	
+	<!-- Shiro Filter -->
+	<bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
+		<property name="securityManager" ref="securityManager" />
+		<!-- \u6307\u5b9a\u9879\u76ee\u7684\u9996\u9875 -->
+		<property name="loginUrl" value="/index" />
+		<property name="successUrl" value="/" />
+   
+		<property name="filterChainDefinitions">
+			<value>
+		    		/index = authc   
+		    		/AnalysisSupport/** = user
+					/AuthorityManage/** = user
+		    		/DataBackup/** = user 
+		    		/DataManage/** = user
+		    		/error/** = user
+		    		/ModelManage/** = user
+		    		/MonitorOperation/** = user
+		    		/ParameterManage/** = user
+				   	/SelfMonitor/** = user
+			 		/SetupManage/** = user
+			 		/TaskManage/** = user
+			 		
+					/static/** = anon
+					/tmp/** = anon
+					
+					<!-- 4A\u5bf9\u5916\u53d1\u5e03\u7684\u63a5\u53e3 -->
+					<!-- Add by Hudson on 20140715 begin -->
+					/services = anon
+					<!-- Add by Hudson on 20140715 end -->
+					/LoginSwitchService?wsdl = anon
+					/DepartmentService?wsdl = anon
+					/GroupService?wsdl = anon
+					/LogoutService?wsdl = anon
+					/UserServices?wsdl = anon
+					
+					/logout = logout
+		
+	    	</value>
+		</property>
+	</bean>
+	
+	
+	
+	<!-- \u7528\u6237\u6388\u6743\u4fe1\u606fCache, \u91c7\u7528EhCache -->
+	<bean id="shiroEhcacheManager" class="org.apache.shiro.cache.ehcache.EhCacheManager">
+		<property name="cacheManagerConfigFile" value="classpath:ehcache/ehcache-shiro.xml"/>
+	</bean>
+	
+	<!-- \u4fdd\u8bc1\u5b9e\u73b0\u4e86Shiro\u5185\u90e8lifecycle\u51fd\u6570\u7684bean\u6267\u884c -->
+	<bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor"/>
+</beans>

build/applicationContext.xml

+<?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:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc"  
+	xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xmlns:cache="http://www.springframework.org/schema/cache"  
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
+		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd  
+		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.2.xsd  
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd"
+	default-lazy-init="true">
+
+	<description>Spring\u516c\u5171\u914d\u7f6e </description>
+
+	<!-- \u4f7f\u7528annotation \u81ea\u52a8\u6ce8\u518cbean, \u5e76\u4fdd\u8bc1@Required\u3001@Autowired\u7684\u5c5e\u6027\u88ab\u6ce8\u5165 -->
+	<context:component-scan base-package="com.hp.cmsz">
+		<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
+		<context:exclude-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice"/>
+	</context:component-scan>
+
+    <!--  -->
+   <!--  <bean id="tagCacheManager" class="">
+		<property name="cacheManagerConfigFile" value=""/>
+	</bean> -->
+
+    <!-- \u7f13\u5b58\u914d\u7f6e -->  
+    <!-- \u542f\u7528\u7f13\u5b58\u6ce8\u89e3\u529f\u80fd(\u8bf7\u5c06\u5176\u914d\u7f6e\u5728Spring\u4e3b\u914d\u7f6e\u6587\u4ef6\u4e2d) -->  
+ <!--   <cache:annotation-driven cache-manager="cacheManager"/>   --> 
+    <!-- Spring\u81ea\u5df1\u7684\u57fa\u4e8ejava.util.concurrent.ConcurrentHashMap\u5b9e\u73b0\u7684\u7f13\u5b58\u7ba1\u7406\u5668(\u8be5\u529f\u80fd\u662f\u4eceSpring3.1\u5f00\u59cb\u63d0\u4f9b\u7684) -->  
+    <!--   
+    <bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">  
+        <property name="caches">  
+            <set>  
+                <bean name="myCache" class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean"/>  
+            </set>  
+        </property>  
+    </bean>  
+     -->  
+    <!-- \u82e5\u53ea\u60f3\u4f7f\u7528Spring\u81ea\u8eab\u63d0\u4f9b\u7684\u7f13\u5b58\u5668,\u5219\u6ce8\u91ca\u6389\u4e0b\u9762\u7684\u4e24\u4e2a\u5173\u4e8eEhcache\u914d\u7f6e\u7684bean,\u5e76\u542f\u7528\u4e0a\u9762\u7684SimpleCacheManager\u5373\u53ef -->  
+    <!-- Spring\u63d0\u4f9b\u7684\u57fa\u4e8e\u7684Ehcache\u5b9e\u73b0\u7684\u7f13\u5b58\u7ba1\u7406\u5668 -->  
+<!--  <bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">  
+        <property name="configLocation" value="classpath:ehcache/ehcache.xml"/>  
+    </bean>  
+    <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">  
+        <property name="cacheManager" ref="cacheManagerFactory"/>  
+    </bean>  
+  -->  
+	
+	
+  <!-- \u76d1\u89c6\u548c\u4f18\u5316sql -->
+  <bean id="dataSource" class="com.p6spy.engine.spy.P6DataSource" >    
+       <constructor-arg>    
+           <ref local="dataSourceTarget"/>    
+       </constructor-arg>    
+  </bean>    
+  
+  <!-- 4A\u76f8\u5173\u7684WebService-->
+<!-- Amend by huach for webservice on 20140725 begin  
+   <import resource="classpath:org/codehaus/xfire/spring/xfire.xml" />
+    <bean id="addressingHandler" class="org.codehaus.xfire.addressing.AddressingInHandler" />-->
+  <!-- <bean id="LoginSwitchBean" class="com.cmsz.ws.impl.LoginSwitchServiceImpl"/>
+  
+ 
+  
+  <bean id="GroupBean" class="com.cmsz.ws.impl.GroupServiceImpl"/>
+  
+  <bean id="LogoutBean" class="com.cmsz.ws.impl.LogoutServiceImpl"/> -->
+  
+  <!-- <bean id="userService" class="com.cmsz.ws.impl.UserServiceImpl"/> 
+  
+		<bean name="UserService" class="org.codehaus.xfire.spring.ServiceBean">
+
+			<property name="serviceBean" ref="userServiceBean" />
+
+			<property name="serviceClass" value="com.cmsz.ws.UserService" />
+
+			<property name="inHandlers">
+
+				<list>
+
+					<ref bean="addressingHandler" />
+
+				</list>
+
+			</property>
+
+		</bean>
+		<bean id="userServiceBean" class="com.cmsz.ws.impl.UserServiceImpl" /> 
+-->		
+		<!--  <bean id="DepartmentBean" class="com.cmsz.ws.impl.DepartmentServiceImpl"/> 
+		 	<bean name="DepartmentService" class="org.codehaus.xfire.spring.ServiceBean">
+			<property name="serviceBean" ref="departmentServiceBean" />
+			<property name="serviceClass"
+				value="com.cmsz.ws.DepartmentService" />
+			<property name="inHandlers">
+				<list>
+					<ref bean="addressingHandler" />
+				</list>
+			</property>
+		</bean>
+		<bean id="departmentServiceBean" class="com.cmsz.ws.impl.DepartmentServiceImpl" />
+		-->
+  <!-- Amend by huach for webservice on 20140725 end -->
+  
+  	<!-- \u8ba9springmvc\u652f\u6301\u6587\u4ef6\u4e0a\u4f20 -->
+	<!-- <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+    	<property name="maxInMemorySize" value="2048"></property>
+    	<property name="maxUploadSize" value="1000000000"/>
+    </bean> -->
+  
+	<!-- Jpa Entity Manager \u914d\u7f6e -->
+	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> 
+		<property name="dataSource" ref="dataSource"/>
+		<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
+		<property name="packagesToScan" value="com.hp.cmsz"/>
+		<property name="jpaProperties">
+			<props>
+				<!-- \u547d\u540d\u89c4\u5219 My_NAME->MyName -->
+				<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="hibernateJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+		<property name="databasePlatform">
+			<bean factory-method="getDialect" class="org.springside.modules.persistence.Hibernates">
+				<constructor-arg ref="dataSource"/>
+			</bean>
+		</property>
+	</bean>
+
+	<!-- Spring Data Jpa\u914d\u7f6e -->
+ 	<jpa:repositories base-package="com.hp.cmsz"  transaction-manager-ref="transactionManager" entity-manager-factory-ref="entityManagerFactory"/>
+   
+	<!-- Jpa \u4e8b\u52a1\u914d\u7f6e -->
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory"/>
+	</bean>
+
+	<!-- \u4f7f\u7528annotation\u5b9a\u4e49\u4e8b\u52a1 -->
+	<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
+
+	<!-- JSR303 Validator\u5b9a\u4e49 -->
+ 	<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
+	
+	
+	
+  	
+  	
+	<!-- production\u73af\u5883 -->
+ 	<beans profile="production">
+ 		<context:property-placeholder ignore-unresolvable="true"
+			location="classpath*:/application.properties" />	
+			
+		<!-- \u6570\u636e\u6e90\u914d\u7f6e, \u4f7f\u7528Tomcat JDBC\u8fde\u63a5\u6c60 -->
+		<bean id="dataSourceTarget" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
+			<!-- Connection Info -->
+			<property name="driverClassName" value="${jdbc.driver}" />
+			<property name="url" value="${jdbc.url}" />
+			<property name="username" value="${jdbc.username}" />
+			<property name="password" value="${jdbc.password}" />
+		
+			<!-- Connection Pooling Info -->
+			<property name="maxActive" value="${jdbc.pool.maxActive}" />
+			<property name="maxIdle" value="${jdbc.pool.maxIdle}" />
+			<property name="defaultAutoCommit" value="false" />
+			<!-- \u8fde\u63a5Idle\u4e00\u4e2a\u5c0f\u65f6\u540e\u8d85\u65f6 -->
+			<property name="timeBetweenEvictionRunsMillis" value="3600000" />
+			<property name="minEvictableIdleTimeMillis" value="3600000" />
+		</bean>
+		
+		<!-- \u6570\u636e\u6e90\u914d\u7f6e,\u4f7f\u7528\u5e94\u7528\u670d\u52a1\u5668\u7684\u6570\u636e\u5e93\u8fde\u63a5\u6c60 -->
+		<!--<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/ExampleDB" />-->
+	</beans>
+	
+	<!-- local development\u73af\u5883 -->
+	<beans profile="development">
+		<context:property-placeholder ignore-resource-not-found="true"
+			location="classpath*:/application.properties" />	
+
+		<!-- Tomcat JDBC\u8fde\u63a5\u6c60 -->
+		<bean id="dataSourceTarget" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
+			<property name="driverClassName" value="${jdbc.driver}" />
+			<property name="url" value="${jdbc.url}" />
+			<property name="username" value="${jdbc.username}" />
+			<property name="password" value="${jdbc.password}" />
+			<property name="defaultAutoCommit" value="false" />
+		</bean>
+
+	</beans>
+	
+</beans>