Clean up runtime configuration

project-open-data · e2b223793ea9e0cd6d9e358a17dc99a75f827515 · jmarin committed Sep 28, 2012 · Sep 28, 2012 · e2b2237
1 parent dcb63ea
commit e2b223793ea9e0cd6d9e358a17dc99a75f827515
diff --git a/src/main/java/org/geo/spatialsearch/census/model/State2010.java b/src/main/java/org/geo/spatialsearch/census/model/State2010.java
@@ -1,12 +1,24 @@
 package org.geo.spatialsearch.census.model;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 /**
  * 
  * @author Juan Marin
  * 
  */
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "State")
+@XmlRootElement(name = "State")
+@Entity
+@Table(name = "state2000", schema = "census")
 public class State2010 extends CensusGeoBaseObject {
 
     @Column(name = "USPS10")
diff --git a/src/main/resources/applicationContext-rest.xml b/src/main/resources/applicationContext-rest.xml
@@ -0,0 +1,17 @@
+<?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:aop="http://www.springframework.org/schema/aop"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jms="http://www.springframework.org/schema/jms"
+    xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+        http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+    <context:annotation-config />
+    <context:component-scan base-package="org.geo.spatialsearch.rest.api.impl"></context:component-scan>
+
+</beans>
diff --git a/src/main/resources/applicationContext-service.xml b/src/main/resources/applicationContext-service.xml
@@ -24,8 +24,14 @@
 		</constructor-arg>
 	</bean>
 
-    <bean id="censusService"
-        class="org.geo.spatialsearch.service.impl.CensusServiceImpl">
-        <qualifier value="censusService" />
-    </bean>
+	<bean id="censusService" class="org.geo.spatialsearch.service.impl.CensusServiceImpl">
+		<qualifier value="censusService" />
+	</bean>
+
+
+	<bean id="exceptionHandler" class="org.geo.spatialsearch.util.ExceptionHandler">
+		<qualifier value="exceptionHandler" />
+	</bean>
+
+
 </beans>
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
@@ -14,22 +14,8 @@
 		http://www.springframework.org/schema/context/spring-context-3.0.xsd
 		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd">
 
-	<context:annotation-config />
-	<context:component-scan base-package="com.basepackage" />
-
-	<tx:annotation-driven />
-
-
-	<bean id="propertyConfigurer"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
-		p:location="classpath:jdbc.properties" />
-
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
-		destroy-method="close" p:driverClassName="${jdbc.driverClassName}"
-		p:url="${jdbc.databaseurl}" p:username="${jdbc.username}" p:password="${jdbc.password}" />
-
-
 	<import resource="classpath:applicationContext-hibernate.xml" />
 	<import resource="classpath:applicationContext-service.xml" />
+	<import resource="classpath:applicationContext-rest.xml" />
 
 </beans>
diff --git a/src/main/webapp/WEB-INF/jetty-env.xml b/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" 
+"http://jetty.mortbay.org/configure.dtd">
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 	<New id="DSTest" class="org.mortbay.jetty.plus.naming.Resource">
 		<Arg></Arg>