remove Properties.java

src/main/java/com/spring/mvc/mini/json/RequestStatusJsonParser.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,8 +21,8 @@ public class RequestStatusJsonParser {
 
     private static final Logger LOG = LoggerFactory.getLogger(RequestStatusJsonParser.class);
 
-    @Autowired
-    private Properties properties;
+    @Value("${path.json}")
+    private String jsonPath;
 
     public int getMaxIntClass() {
 
@@ -43,7 +44,7 @@ public class RequestStatusJsonParser {
     public void writeStatus(RequestStatusListType mrslt) {
 
         try {
-            new ObjectMapper().writeValue(new File(properties.getJsonPath()), mrslt);
+            new ObjectMapper().writeValue(new File(jsonPath), mrslt);
         } catch (IOException e) {
             LOG.error(e.toString());
         }
@@ -55,7 +56,7 @@ public class RequestStatusJsonParser {
         RequestStatusListType type = null;
 
         try {
-            type = new ObjectMapper().readValue(new File(properties.getJsonPath()), RequestStatusListType.class);
+            type = new ObjectMapper().readValue(new File(jsonPath), RequestStatusListType.class);
 
             LOG.debug(type.toString());
 

src/main/java/com/spring/mvc/mini/mail/MailSender.java

@@ -14,6 +14,7 @@ import javax.mail.internet.MimeMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.spring.mvc.mini.properties.Properties;
@@ -23,9 +24,18 @@ public class MailSender {
 
     private static final Logger LOG = LoggerFactory.getLogger(MailSender.class);
 
-    @Autowired
-    private Properties properties;
-	
+    @Value("${mail.starttls.enable}")
+    private String starttlsEnable;
+
+    @Value("${mail.auth}")
+    private String auth;
+
+    @Value("${mail.host}")
+    private String host;
+
+    @Value("${mail.port}")
+    private String port;
+
     public void sendMail(final String username,final String password, String fromAddress, Address[] toAddress, String subject, String text) throws Exception {
 
             Authenticator au =  new javax.mail.Authenticator() {
@@ -47,10 +57,10 @@ public class MailSender {
 
     private java.util.Properties getProperties() {
         java.util.Properties props = new java.util.Properties();
-        props.put("mail.smtp.starttls.enable", properties.getStarttlsEnable());
-        props.put("mail.smtp.auth", properties.getAuth());
-        props.put("mail.smtp.host", properties.getHost());
-        props.put("mail.smtp.port", properties.getPort());
+        props.put("mail.smtp.starttls.enable", starttlsEnable);
+        props.put("mail.smtp.auth", auth);
+        props.put("mail.smtp.host", host);
+        props.put("mail.smtp.port", port);
         return props;
     }
 

src/main/java/com/spring/mvc/mini/svn/SVNHandler.java

 package com.spring.mvc.mini.svn;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.util.Date;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
@@ -14,22 +10,35 @@ import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNCommitClient;
-import org.tmatesoft.svn.core.wc.SVNDiffClient;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNUpdateClient;
-import org.tmatesoft.svn.core.wc.SVNWCUtil;
+import org.tmatesoft.svn.core.wc.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.Date;
 
-import com.spring.mvc.mini.properties.Properties;
 
 @Component
 public class SVNHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(SVNHandler.class);
 
-    @Autowired
-    private Properties properties;
+    @Value("${svn.rep.url}")
+    private String repURL;
+
+    @Value("${path.rep}")
+    private String repPath;
+
+    @Value("${svn.username}")
+    private String username;
+
+    @Value("${svn.password}")
+    private String password;
+
+    @Value("${path.json}")
+    private String jsonPath;
+
+    @Value("${path.xml}")
+    private String xmlPath;
 
     public void svnCheckin() {
 
@@ -38,10 +47,10 @@ public class SVNHandler {
         SVNClientManager ourClientManager = SVNClientManager.newInstance();
 
         try {
-            repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(properties.getRepURL()));
+            repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(repURL));
 
             ISVNAuthenticationManager authManager =
-                    SVNWCUtil.createDefaultAuthenticationManager(properties.getUsername(), properties.getPassword());
+                    SVNWCUtil.createDefaultAuthenticationManager(username, password);
             repository.setAuthenticationManager(authManager);
 
             LOG.info("Repository Root: " + repository.getRepositoryRoot(true));
@@ -54,8 +63,8 @@ public class SVNHandler {
             SVNCommitClient commitClient = ourClientManager.getCommitClient();
             SVNDiffClient diffClient = ourClientManager.getDiffClient();
 
-            File xmlfile = new File(properties.getXmlPath());
-            File jsonfile = new File(properties.getJsonPath());
+            File xmlfile = new File(xmlPath);
+            File jsonfile = new File(jsonPath);
             File[] xmlfilearray = {xmlfile};
             File[] jsonfilearray = {jsonfile};
 
@@ -86,7 +95,7 @@ public class SVNHandler {
 
     public void svnCheckout() {
 
-        File svnTempDir = new File(properties.getRepPath());
+        File svnTempDir = new File(repPath);
         if (svnTempDir.exists()) {
             return;
         }
@@ -95,11 +104,11 @@ public class SVNHandler {
 
         try {
             //initiate the reporitory from the url
-            repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(properties.getRepURL()));
+            repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(repURL));
 
             //create authentication data
             ISVNAuthenticationManager authManager =
-                    SVNWCUtil.createDefaultAuthenticationManager(properties.getUsername(), properties.getPassword());
+                    SVNWCUtil.createDefaultAuthenticationManager(username, password);
             repository.setAuthenticationManager(authManager);
 
             //need to identify latest revision

src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java

@@ -12,11 +12,11 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
 public class ObjectClassDataValidator {
 
 	@Autowired
-	private ObjectClassXMLPaser ocxp; 
+	private ObjectClassXMLPaser objectClassXMLPaser;
 	
 	public void checkData(ArrayList<ObjectClass> objclsListFormIn) throws Exception{
 		
-		ArrayList<ObjectClass> objclsListXmlIn = ocxp.objectClassMapping();
+		ArrayList<ObjectClass> objclsListXmlIn = objectClassXMLPaser.objectClassMapping();
 		
 		for (ObjectClass objclsItemFormIn:objclsListFormIn){
 			

src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java

@@ -13,6 +13,7 @@ import com.spring.mvc.mini.pojo.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mvc.extensions.ajax.AjaxUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -27,7 +28,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.spring.mvc.mini.json.RequestStatusJsonParser;
 import com.spring.mvc.mini.mail.MailSender;
 import com.spring.mvc.mini.pojo.RequestStatus;
-import com.spring.mvc.mini.properties.Properties;
 import com.spring.mvc.mini.validation.ObjectClassDataValidator;
 
 @Controller
@@ -37,15 +37,18 @@ public class ObjectClassFormController {
 
     private static final Logger LOG = LoggerFactory.getLogger(ObjectClassFormController.class);
 
+    @Value("${mail.to}")
+    private String mailto;
+
+    @Value("${web.hostname}")
+    private String webHostname;
+
     @Autowired
     private RequestStatusJsonParser requestStatusJsonParser;
 
     @Autowired
     private ObjectClassDataValidator objectClassDataValidator;
 
-    @Autowired
-    private Properties properties;
-
     @Autowired
     private MailSender mailSender;
 
@@ -151,7 +154,7 @@ public class ObjectClassFormController {
         StringBuffer textsb = new StringBuffer();
         textsb.append("Hi,\r\n\r\nThese MO CR's shall be approved if no other comments.\r\nIf you have any comment, please comment on this page:\r\n");
         textsb.append("http://");
-        textsb.append(properties.getWebHostname());
+        textsb.append(webHostname);
         textsb.append(":8080/spring-mvc-mini/requeststatus?mocrid=");
         textsb.append(mocrid);
         textsb.append("\r\nor mailto:");
@@ -159,7 +162,7 @@ public class ObjectClassFormController {
         textsb.append("\r\n");
         textsb.append("The request will be committed in 5 days.\r\n\r\nThanks.\r\n");
         textsb.append("http://");
-        textsb.append(properties.getWebHostname());
+        textsb.append(webHostname);
         textsb.append(":8080/spring-mvc-mini/");
         return textsb.toString();
     }
@@ -198,7 +201,7 @@ public class ObjectClassFormController {
 
     public void commitAndSendMail(UserInfo userinfo, String subject, String text) throws Exception {
 
-        Address[] toAddress = {new InternetAddress(properties.getMailto()), new InternetAddress(userinfo.getEmail())};
+        Address[] toAddress = {new InternetAddress(mailto), new InternetAddress(userinfo.getEmail())};
 
         mailSender.sendMail(userinfo.getUsername(), userinfo.getPassword(), userinfo.getEmail(), toAddress, subject, text);
     }

src/main/java/com/spring/mvc/mini/web/RequestStatusController.java

@@ -34,7 +34,7 @@ public class RequestStatusController {
 	private RequestStatusJsonParser requestStatusJsonParser;
 	
 	@Autowired
-	private MailSender ms;
+	private MailSender mailSender;
 	
 	@ModelAttribute
 	public void ajaxAttribute(WebRequest request, Model model) {
@@ -158,7 +158,7 @@ public class RequestStatusController {
 		
 		Address[] toAddress = {new InternetAddress(userinfo.getEmail())};
 		
-		ms.sendMail(userinfo.getUsername(), userinfo.getPassword(), userinfo.getEmail(),toAddress, subject, text);
+		mailSender.sendMail(userinfo.getUsername(), userinfo.getPassword(), userinfo.getEmail(), toAddress, subject, text);
 	}
 
 }

src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java

 package com.spring.mvc.mini.xml;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
+import com.spring.mvc.mini.pojo.ObjectClass;
+import com.spring.mvc.mini.svn.SVNHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.*;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -12,28 +15,19 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.spring.mvc.mini.pojo.ObjectClass;
-import com.spring.mvc.mini.properties.Properties;
-import com.spring.mvc.mini.svn.SVNHandler;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 
 @Component
 public class ObjectClassXMLPaser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ObjectClassXMLPaser.class);
 
-    @Autowired
-    private Properties properties;
+    @Value("${path.xml}")
+    private String xmlPath;
 
     @Autowired
     private SVNHandler svnHandler;
@@ -46,7 +40,7 @@ public class ObjectClassXMLPaser {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
 
-        File objectClassesFile = new File(properties.getXmlPath());
+        File objectClassesFile = new File(xmlPath);
 
         Document document = builder.parse(objectClassesFile);
 
@@ -104,7 +98,7 @@ public class ObjectClassXMLPaser {
 
             DocumentBuilder builder = factory.newDocumentBuilder();
 
-            File objectClassesFile = new File(properties.getXmlPath());
+            File objectClassesFile = new File(xmlPath);
 
             Document document = builder.parse(objectClassesFile);
 
@@ -117,7 +111,7 @@ public class ObjectClassXMLPaser {
             Transformer transformer = transformerFactory.newTransformer();
             DOMSource source = new DOMSource(document);
 
-            StreamResult result = new StreamResult(new File(properties.getXmlPath()));
+            StreamResult result = new StreamResult(new File(xmlPath));
 
             transformer.transform(source, result);
 
@@ -142,7 +136,7 @@ public class ObjectClassXMLPaser {
         LOGGER.info("Start to checkout");
         svnHandler.svnCheckout();
 
-        Path path = Paths.get(properties.getXmlPath());
+        Path path = Paths.get(xmlPath);
 
         return Files.readAllBytes(path);
 

src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

@@ -7,37 +7,24 @@
 
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-	
-	<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
-	
+
 	<context:annotation-config/>
 	<context:component-scan base-package="com.spring.mvc.mini" />
-	
-	<!--<context:property-placeholder location="file:/opt/web/spring-mvc-mini/resources/application.properties"/>--> 
+
 	<context:property-placeholder location="file:resources/application.properties"/>
-	
-	<!-- Enables the Spring MVC @Controller programming model -->
+
 	<annotation-driven conversion-service="conversionService">
 	</annotation-driven>
+	<beans:bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
+	</beans:bean>
 
-	<!-- Handles HTTP GET requests for /resources/** by efficiently serving up static resources in the ${webappRoot}/resources/ directory -->
 	<resources mapping="/resources/**" location="/resources/" />
 
-	<!-- Resolves views selected for rendering by @Controllers to .jsp resources in the /WEB-INF/views directory -->
 	<beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<beans:property name="prefix" value="/WEB-INF/views/" />
 		<beans:property name="suffix" value=".jsp" />
 	</beans:bean>
-	
-	<!-- Only needed because we install custom converters to support the examples in the org.springframewok.samples.mvc.convert package 	-->
-	<beans:bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
-	</beans:bean>
 
-	<!-- Only needed because we require fileupload in the org.springframework.samples.mvc.fileupload package 
-	<beans:bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
-	-->
-	
-	<!-- Imports user-defined @Controller beans that process client requests -->
 	<beans:import resource="controllers.xml" />
 	<beans:import resource="application-context.xml" />
 

src/main/webapp/WEB-INF/views/home.jsp

@@ -23,10 +23,10 @@
         <li><a href="<c:url value="/userinfoform" />" title="userinfoform">UserInfoForm</a></li>
         <li><a href="<c:url value="/objectclassform" />" title="objectclassform">ObjectClassForm</a></li>
         <li><a href="<c:url value="/requeststatus" />" title="requeststatus">RequestStatusForm</a></li>
-        <li><a href="<c:url value="/objectclasslist" />" title="objectclasslist">ObjectClassList</a></li>
+        <li><a href="<c:url value="/objectClasses" />" title="objectClasses">ObjectClassList</a></li>
     </ul>
 </div>	
-<p> 2015 spring. Tech:<a href="http://spring.io/guides">Spring MVC</a>. Support Contact <a href="mailto:jerry.1.zhang@spring.com">Jerry Zhang</a></p>
+<p>? 2015 spring. Tech:<a href="http://spring.io/guides">Spring MVC</a>. Support Contact <a href="mailto:jerry.1.zhang@spring.com">Jerry Zhang</a></p>
 <script type="text/javascript" src="<c:url value="/resources/jquery/1.6/jquery.js" />"></script>
 <script type="text/javascript" src="<c:url value="/resources/jqueryform/2.8/jquery.form.js" />"></script>
 <script type="text/javascript" src="<c:url value="/resources/jqueryui/1.8/jquery.ui.core.js" />"></script>
@@ -78,9 +78,9 @@ $(document).ready(function() {
 
 	$("#tabs").bind("tabsselect", function(event, ui) { 
 		
-		if("objectclasslist" == ui.tab.title){
+		if("objectClasses" == ui.tab.title){
 			console.log("iftrue");
-			window.location.replace("./objectclasslist");
+			window.location.replace("./objectClasses");
 			return;
 		}