From 24300f36626c87c64f834b002bf58d8478909397 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 22 Apr 2016 14:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-report-api/pom.xml                        | 105 +++++++++++-------
 .../report/web/controller/TestController.java      |  13 +++
 .../web/inteceptor/TokenValidateInteceptor.java    |  94 +++++++++++++++++
 .../resources/spring/applicationContext-mvc.xml    |  42 ++++++++
 .../main/resources/spring/applicationContext.xml   |   2 +-
 .../src/main/resources/spring/spring-mongodb.xml   |  54 ++++++++++
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  23 ----
 .../src/main/webapp/WEB-INF/web.xml                | 117 ++++++++++++---------
 8 files changed, 341 insertions(+), 109 deletions(-)
 create mode 100644 platform-report-api/src/main/java/com/lyms/platform/report/web/controller/TestController.java
 create mode 100644 platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenValidateInteceptor.java
 create mode 100644 platform-report-api/src/main/resources/spring/applicationContext-mvc.xml
 create mode 100644 platform-report-api/src/main/resources/spring/spring-mongodb.xml
 delete mode 100644 platform-report-api/src/main/webapp/WEB-INF/cxf-servlet.xml

diff --git a/platform-report-api/pom.xml b/platform-report-api/pom.xml
index 9f5e98b..31cd7b2 100644
--- a/platform-report-api/pom.xml
+++ b/platform-report-api/pom.xml
@@ -11,24 +11,87 @@
 	<artifactId>platform-report-api</artifactId>
 
 	<dependencies>
-		
+
 		<dependency>
 			<groupId>com.lyms.core</groupId>
 			<artifactId>platform-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-	<!--	<dependency>
+		<dependency>
 			<groupId>com.lyms.core</groupId>
-			<artifactId>permission-service</artifactId>
+			<artifactId>platform-dal</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.lyms.core</groupId>
-			<artifactId>permission-dal</artifactId>
+			<artifactId>platform-biz-service</artifactId>
 			<version>${project.version}</version>
-		</dependency>-->
+		</dependency>
+		<dependency>
+			<groupId>com.lyms.core</groupId>
+			<artifactId>platform-biz-patient-service</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>dev</id>
+
+			<!-- 默认激活开发配制，使用config-dev.properties来替换设置过虑的资源文件中的${key} -->
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<filters>
+					<filter>../platform-resource/resources/config-dev.properties</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>test</id>
+			<build>
+				<filters>
+					<filter>../platform-resource/resources/config-test.properties</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<build>
+				<filters>
+					<filter>../platform-resource/resources/config-product.properties</filter>
+				</filters>
+			</build>
+		</profile>
+	</profiles>
 	<build>
+		<resources>
+			<resource>
+				<directory>../platform-resource/resources</directory>
+				<excludes>
+					<exclude>
+						**/*
+					</exclude>
+				</excludes>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+
+			</resource>
+			<!-- 设置对auto-config.properties，jdbc.properties进行过虑，即这些文件中的${key}会被替换掉为真正的值 -->
+			<!--   -->
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>database.properties</include>
+				</includes>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -41,36 +104,4 @@
 		</plugins>
 		<finalName>platform-report-api</finalName>
 	</build>
-	<!-- 
-	<profiles>
-		<profile>
-			<id>mysql</id>
-			<properties>
-				<deploy.type>mysql</deploy.type>
-			</properties>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>com.lyms.core</groupId>
-					<artifactId>permission-dal-mysql</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>mongo</id>
-			<properties>
-				<deploy.type>mongo</deploy.type>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.lyms.core</groupId>
-					<artifactId>permission-dal-mongo</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>-->
 </project>
\ No newline at end of file
diff --git a/platform-report-api/src/main/java/com/lyms/platform/report/web/controller/TestController.java b/platform-report-api/src/main/java/com/lyms/platform/report/web/controller/TestController.java
new file mode 100644
index 0000000..9cf62b3
--- /dev/null
+++ b/platform-report-api/src/main/java/com/lyms/platform/report/web/controller/TestController.java
@@ -0,0 +1,13 @@
+package com.lyms.platform.report.web.controller;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ *
+ *
+ *
+ * Created by Administrator on 2016/4/20 0020.
+ */
+@Controller
+public class TestController {
+}
diff --git a/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenValidateInteceptor.java b/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenValidateInteceptor.java
new file mode 100644
index 0000000..548210b
--- /dev/null
+++ b/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenValidateInteceptor.java
@@ -0,0 +1,94 @@
+
+package com.lyms.platform.report.web.inteceptor;
+
+
+import com.lyms.platform.common.annotation.TokenRequired;
+import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.exception.ParameterException;
+import com.lyms.platform.common.exception.TokenException;
+import com.lyms.platform.common.utils.LogUtil;
+import com.lyms.platform.common.utils.LoginUtil;
+import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.service.UsersService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.annotation.Annotation;
+
+/**
+ * 验证token拦截器
+ *
+ * <ul>
+ *     <li>
+ *      1、springmvc中配置TokenValidateInteceptor的拦截
+ *      2、在需要拦截的方法上面配置TokenRequired注解
+ *     </li>
+ * </ul>
+ *
+ */
+
+public class TokenValidateInteceptor extends HandlerInterceptorAdapter {
+
+    @Autowired
+    private UsersService usersService;
+
+    public static boolean isSiteController(Object handler) {
+        return handler instanceof HandlerMethod && (((HandlerMethod) handler).getBean() instanceof BaseController);
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        if (!isSiteController(handler))
+            return true;
+        TokenRequired clientRequired = findAnnotation((HandlerMethod) handler, TokenRequired.class);
+        if (null == clientRequired)
+            return true;
+
+        validateToken(request, response);
+
+        return true;
+    }
+
+    private <T extends Annotation> T findAnnotation(HandlerMethod handler, Class<T> annotationType) {
+        T annotation = handler.getBeanType().getAnnotation(annotationType);
+        if (annotation != null)
+            return annotation;
+        return handler.getMethodAnnotation(annotationType);
+    }
+
+    public boolean validateToken(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        String token = httpServletRequest.getHeader("Authorization");
+        if (StringUtils.isEmpty(token)) {
+            throw new ParameterException();
+        }
+        LoginContext loginContext = LoginUtil.checkLoginState(token);
+        if(!loginContext.isLogin()) {
+            throw new TokenException();
+        }
+        Users users = usersService.getUsersByLoginCenterId(loginContext.getId());
+        if(null == users) {
+            throw new TokenException();
+        }
+        loginContext.setId(users.getId());
+        loginContext.setToken(token);
+        httpServletRequest.setAttribute("loginContext", loginContext);
+
+        LogUtil.tokenInfo(" userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod());
+
+        return loginContext.isLogin();
+    }
+
+    @Override
+    public void afterCompletion(
+            HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+            throws Exception {
+        ContextHolder.clean();
+    }
+}
diff --git a/platform-report-api/src/main/resources/spring/applicationContext-mvc.xml b/platform-report-api/src/main/resources/spring/applicationContext-mvc.xml
new file mode 100644
index 0000000..ffb94ff
--- /dev/null
+++ b/platform-report-api/src/main/resources/spring/applicationContext-mvc.xml
@@ -0,0 +1,42 @@
+<?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:mvc="http://www.springframework.org/schema/mvc"
+	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/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd"
+	default-lazy-init="true">
+
+
+	<context:component-scan base-package="com.lyms.platform.report.web.controller"
+		use-default-filters="false">
+		<context:include-filter type="annotation"
+			expression="org.springframework.stereotype.Controller" />
+	</context:component-scan>
+
+	<mvc:annotation-driven validator="localValidator">
+		<mvc:argument-resolvers >
+			<bean id="annotationFormArgumentResolver" class="com.lyms.platform.common.core.resolve.AnnotationFormArgumentResolver"/>
+		</mvc:argument-resolvers>
+		 <mvc:message-converters>
+	        <bean class="org.springframework.http.converter.ByteArrayHttpMessageConverter"/>
+	        <bean class="com.lyms.platform.common.core.converter.StringMessageConverter"/>
+	        <bean class="org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter"/>
+	        <bean class="org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter"/>
+	        <bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"/>
+        </mvc:message-converters>
+	</mvc:annotation-driven>
+	<bean id="localValidator"
+		class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean">
+		<property name="traversableResolver">
+			<bean
+				class="org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver" />
+		</property>
+	</bean>
+
+
+	<mvc:interceptors>
+		<bean id="tokenValidateInteceptor" class="com.lyms.platform.report.web.inteceptor.TokenValidateInteceptor"/>
+	</mvc:interceptors>
+
+</beans>
\ No newline at end of file
diff --git a/platform-report-api/src/main/resources/spring/applicationContext.xml b/platform-report-api/src/main/resources/spring/applicationContext.xml
index 1dc27d6..c997463 100644
--- a/platform-report-api/src/main/resources/spring/applicationContext.xml
+++ b/platform-report-api/src/main/resources/spring/applicationContext.xml
@@ -13,5 +13,5 @@
 	<context:annotation-config />
 
 	<!-- 配置要扫描的包 -->
-	<context:component-scan base-package="com.lyms.core.data.sync" />
+	<context:component-scan base-package="com.lyms.platform.*" />
 </beans>
\ No newline at end of file
diff --git a/platform-report-api/src/main/resources/spring/spring-mongodb.xml b/platform-report-api/src/main/resources/spring/spring-mongodb.xml
new file mode 100644
index 0000000..32cd518
--- /dev/null
+++ b/platform-report-api/src/main/resources/spring/spring-mongodb.xml
@@ -0,0 +1,54 @@
+<?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:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
+          http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd
+          http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+	<mongo:db-factory id="mongoDbFactory" host="${mongo.db.host}"
+		port="${mongo.db.port}" dbname="${mongo.db.dbname}" />
+
+	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
+		<!-- <constructor-arg name="userCredentials" ref="userCredentials"/> -->
+		<constructor-arg name="mongoConverter" ref="mappingMongoConverter" />
+	</bean>
+
+	<mongo:mapping-converter base-package="com.lyms.platform.pojo" />
+	<bean id="mappingContext" class="org.springframework.data.mongodb.core.mapping.MongoMappingContext" />
+	<!-- 配置mongodb映射类型 -->
+	<bean id="mappingMongoConverter" class="org.springframework.data.mongodb.core.convert.MappingMongoConverter">
+		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
+		<constructor-arg name="mappingContext" ref="mappingContext" />
+		<property name="typeMapper" ref="defaultMongoTypeMapper" />
+	</bean>
+
+	<!-- 默认Mongodb类型映射 -->
+	<bean id="defaultMongoTypeMapper" class="org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper">
+		<constructor-arg name="typeKey">
+			<null /><!-- 这里设置为空,可以把 spring data mongodb 多余保存的_class字段去掉 -->
+		</constructor-arg>
+	</bean>
+	<!--  
+	<bean id="userCredentials" class="org.springframework.data.authentication.UserCredentials">
+		<description>认证口令</description>
+		<constructor-arg name="username" value="${${mongo.username}}" />
+		<constructor-arg name="password" value="${${mongo.password}}" />
+	</bean>
+
+	<mongo:mongo id="mongo" host="${${mongo.host}}" port="${${mongo.port}}">
+
+		<mongo:options connections-per-host="${${mongo.connectionsPerHost}}"
+
+			threads-allowed-to-block-for-connection-multiplier="${${mongo.threadsAllowedToBlockForConnectionMultiplier}}"
+
+			connect-timeout="${${mongo.connectTimeout}}" max-wait-time="${${mongo.maxWaitTime}}"
+			
+			auto-connect-retry="${${mongo.autoConnectRetry}}" socket-keep-alive="${${mongo.socketKeepAlive}}"
+			
+			socket-timeout="${${mongo.socketTimeout}}" slave-ok="${${mongo.slaveOk}}"
+			
+			write-number="1" write-timeout="0" write-fsync="true" />
+	</mongo:mongo>-->
+</beans>
\ No newline at end of file
diff --git a/platform-report-api/src/main/webapp/WEB-INF/cxf-servlet.xml b/platform-report-api/src/main/webapp/WEB-INF/cxf-servlet.xml
deleted file mode 100644
index cc10158..0000000
--- a/platform-report-api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-	
-	<jaxws:endpoint id="emergenceWs"
-		implementor="com.lyms.core.data.sync.web.ws.EmergenceController"
-		address="/emergenceWs" />
-</beans>
-<!-- END SNIPPET: beans -->
diff --git a/platform-report-api/src/main/webapp/WEB-INF/web.xml b/platform-report-api/src/main/webapp/WEB-INF/web.xml
index 2c6f850..8ebaefa 100644
--- a/platform-report-api/src/main/webapp/WEB-INF/web.xml
+++ b/platform-report-api/src/main/webapp/WEB-INF/web.xml
@@ -1,56 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         version="2.5"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee           http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            classpath*:/spring/applicationContext.xml
+        </param-value>
+    </context-param>
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee           http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    <display-name>cxf</display-name>
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>classpath:log4j_config.xml</param-value>
+    </context-param>
     <context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath*:/applicationContext.xml
-		</param-value>
-	</context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>webapp.report-api</param-value>
+    </context-param>
+    <context-param>
+        <param-name>log4jRefreshInterval</param-name>
+        <param-value>60000</param-value>
+    </context-param>
     <servlet>
-        <description>Apache CXF Endpoint</description>
-        <display-name>cxf</display-name>
-        <servlet-name>cxf</servlet-name>
-        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <servlet-name>dispatcher</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath*:/spring/applicationContext-mvc.xml</param-value>
+        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>
-        <servlet-name>cxf</servlet-name>
-        <url-pattern>/services/*</url-pattern>
+        <servlet-name>dispatcher</servlet-name>
+        <url-pattern>/</url-pattern>
     </servlet-mapping>
-    <session-config>
-        <session-timeout>60</session-timeout>
-    </session-config>
-    <context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>classpath:log4j_config.xml</param-value>
-	</context-param>
-	<context-param>
-		<param-name>log4jRefreshInterval</param-name>
-		<param-value>60000</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-</web-app>
+    <filter>
+        <filter-name>HttpMethodFilter</filter-name>
+        <filter-class>org.springframework.web.filter.HttpPutFormContentFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>HttpMethodFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+    <listener>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file
-- 
1.8.3.1