完善

Author: youseries

uflo-console/src/main/resources/uflo-console-context.xml

@@ -5,6 +5,9 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
 	">
 	<import resource="classpath:uflo-context-configs.xml" />
+	
+	<context:property-placeholder location="classpath:uflo-console-configure.properties" ignore-unresolvable="true"/>
+	
 	<bean id="uflo.console.resourceLoaderServletHandler"
 		class="com.bstek.uflo.console.handler.impl.res.ResourceLoaderServletHandler"></bean>
 	<bean id="uflo.console.todoServletHandler"
@@ -46,14 +49,6 @@
 	<bean id="uflo.console.handlerListServletHandler" class="com.bstek.uflo.console.handler.impl.list.HandlerListServletHandler">
 		<property name="debug" value="${uflo.debug}"></property>
 	</bean>
-
-	<bean id="uflo.console.propertyConfigurer"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="ignoreUnresolvablePlaceholders" value="true"></property>
-		<property name="location">
-			<value>classpath:uflo-console-configure.properties</value>
-		</property>
-	</bean>
 
 	<bean id="uflo.defaultFileProcessProvider" class="com.bstek.uflo.console.provider.DefaultFileProcessProvider">
 		<property name="fileStoreDir" value="${uflo.defaultFileStoreDir}"></property>

uflo-core/src/main/resources/uflo-context-configs.xml

@@ -83,22 +83,7 @@
 		<property name="blockSize" value="${uflo.idBlockSize}"></property>
 	</bean>
 
-<!-- 	<bean id="uflo.restService" class="com.bstek.uflo.service.impl.RestServiceImpl">
-		<constructor-arg name="username" value="${uflo.restAccessUsername}"></constructor-arg>
-		<constructor-arg name="password" value="${uflo.restAccessPassword}"></constructor-arg>
-		<property name="baseUrl" value="${uflo.restAccessBaseUrl}"></property>
-		<property name="converters">
-			<list>
-				<bean
-					class="org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter"></bean>
-				<bean
-					class="org.springframework.http.converter.StringHttpMessageConverter">
-					<constructor-arg value="utf-8"></constructor-arg>
-				</bean>
-			</list>
-		</property>
-	</bean> -->
-	
+
 	<bean id="uflo.processParser" class="com.bstek.uflo.deploy.parse.impl.ProcessParser"></bean>
 	<bean id="uflo.startParser" class="com.bstek.uflo.deploy.parse.impl.StartParser"></bean>
 	<bean id="uflo.taskParser" class="com.bstek.uflo.deploy.parse.impl.TaskParser"></bean>