Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ryanxhl
spring-mvc-mini
提交
5a28f0d1
S
spring-mvc-mini
项目概览
Ryanxhl
/
spring-mvc-mini
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-mvc-mini
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5a28f0d1
编写于
6月 07, 2015
作者:
H
hot13399
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor. clean code for Json, MailSender, pojo and properties.
上级
e5743c80
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
372 addition
and
354 deletion
+372
-354
src/main/java/com/spring/mvc/mini/json/RequestStatusJsonParser.java
...ava/com/spring/mvc/mini/json/RequestStatusJsonParser.java
+3
-3
src/main/java/com/spring/mvc/mini/mail/MailSender.java
src/main/java/com/spring/mvc/mini/mail/MailSender.java
+14
-13
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
+115
-102
src/main/java/com/spring/mvc/mini/pojo/ObjectClassListType.java
...in/java/com/spring/mvc/mini/pojo/ObjectClassListType.java
+16
-15
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
+37
-31
src/main/java/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
...ava/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
+78
-73
src/main/java/com/spring/mvc/mini/svn/SVNHandler.java
src/main/java/com/spring/mvc/mini/svn/SVNHandler.java
+92
-100
src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java
.../spring/mvc/mini/validation/ObjectClassDataValidator.java
+4
-4
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
...va/com/spring/mvc/mini/web/ObjectClassFormController.java
+7
-7
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
...java/com/spring/mvc/mini/web/RequestStatusController.java
+2
-2
src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
...ain/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
+4
-4
未找到文件。
src/main/java/com/spring/mvc/mini/json/RequestStatusJson
Mapping
.java
→
src/main/java/com/spring/mvc/mini/json/RequestStatusJson
Parser
.java
浏览文件 @
5a28f0d1
...
...
@@ -16,9 +16,9 @@ import com.spring.mvc.mini.pojo.ObjectClass;
import
com.spring.mvc.mini.properties.Properties
;
@Component
public
class
RequestStatusJson
Mapping
{
public
class
RequestStatusJson
Parser
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
RequestStatusJson
Mapping
.
class
);
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
RequestStatusJson
Parser
.
class
);
@Autowired
private
Properties
properties
;
...
...
@@ -27,7 +27,7 @@ public class RequestStatusJsonMapping {
ArrayList
<
RequestStatus
>
list
=
this
.
readStatus
();
ArrayList
<
ObjectClass
>
objectClasses
=
list
.
get
(
list
.
size
()
-
1
).
getObjectClassListType
().
getObject
classlist
();
ArrayList
<
ObjectClass
>
objectClasses
=
list
.
get
(
list
.
size
()
-
1
).
getObjectClassListType
().
getObject
Classes
();
return
objectClasses
.
get
(
objectClasses
.
size
()
-
1
).
getIntclass
();
}
...
...
src/main/java/com/spring/mvc/mini/mail/MailSender.java
浏览文件 @
5a28f0d1
...
...
@@ -21,18 +21,12 @@ import com.spring.mvc.mini.properties.Properties;
@Component
public
class
MailSender
{
static
Logger
LOG
GER
=
LoggerFactory
.
getLogger
(
MailSender
.
class
);
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
MailSender
.
class
);
@Autowired
private
Properties
properties
;
public
void
sendMail
(
final
String
username
,
final
String
password
,
String
fromAddress
,
Address
[]
toAddress
,
String
subject
,
String
text
)
throws
AddressException
,
MessagingException
{
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
());
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
()
{
protected
PasswordAuthentication
getPasswordAuthentication
()
{
...
...
@@ -40,17 +34,24 @@ public class MailSender {
}
};
Session
session
=
Session
.
getInstance
(
props
,
au
);
Message
message
=
new
MimeMessage
(
session
);
Message
message
=
new
MimeMessage
(
Session
.
getInstance
(
getProperties
(),
au
));
message
.
setFrom
(
new
InternetAddress
(
fromAddress
));
message
.
setSubject
(
subject
);
message
.
setText
(
text
);
message
.
setRecipients
(
Message
.
RecipientType
.
TO
,
toAddress
);
Transport
.
send
(
message
);
LOG
GER
.
info
(
"Send Mail Done: "
+
fromAddress
+
" to"
+
toAddress
);
LOG
.
info
(
"Send Mail Done: "
+
fromAddress
+
" to"
+
toAddress
);
}
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
());
return
props
;
}
}
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
浏览文件 @
5a28f0d1
...
...
@@ -4,7 +4,7 @@ import java.io.Serializable;
import
javax.validation.constraints.NotNull
;
public
class
ObjectClass
implements
Serializable
{
public
class
ObjectClass
implements
Serializable
{
/**
*
...
...
@@ -18,9 +18,9 @@ public class ObjectClass implements Serializable{
int
intclass
;
@NotNull
String
abbrev
;
String
abbreviation
;
@NotNull
String
adaID
;
String
packageName
;
@NotNull
String
name
;
@NotNull
...
...
@@ -31,36 +31,47 @@ public class ObjectClass implements Serializable{
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
int
getIntclass
()
{
return
intclass
;
}
public
void
setIntclass
(
int
intclass
)
{
this
.
intclass
=
intclass
;
}
public
String
getAbbrev
()
{
return
abbrev
;
public
String
getAbbreviation
()
{
return
abbreviation
;
}
public
void
setAbbrev
(
String
abbrev
)
{
this
.
abbrev
=
abbrev
;
public
void
setAbbreviation
(
String
abbreviation
)
{
this
.
abbreviation
=
abbreviation
;
}
public
String
getAdaID
()
{
return
adaID
;
public
String
getPackageName
()
{
return
packageName
;
}
public
void
setAdaID
(
String
adaID
)
{
this
.
adaID
=
adaID
;
public
void
setPackageName
(
String
packageName
)
{
this
.
packageName
=
packageName
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getParents
()
{
return
parents
;
}
public
void
setParents
(
String
parents
)
{
this
.
parents
=
parents
;
}
...
...
@@ -68,40 +79,42 @@ public class ObjectClass implements Serializable{
public
String
getComment
()
{
return
comment
;
}
public
void
setComment
(
String
comment
)
{
this
.
comment
=
comment
;
}
@Override
public
String
toString
()
{
return
"ObjectClass [id="
+
id
+
", intclass="
+
intclass
+
", abbrev
="
+
abbrev
+
", adaID="
+
adaID
+
", name="
+
name
+
", parents="
return
"ObjectClass [id="
+
id
+
", intclass="
+
intclass
+
", abbreviation
="
+
abbreviation
+
", packageName="
+
packageName
+
", name="
+
name
+
", parents="
+
parents
+
", comment="
+
comment
+
"]"
;
}
public
boolean
match
(
String
searchcritical
)
{
public
boolean
match
(
String
searchcritical
)
{
if
(
this
.
abbrev
.
contains
(
searchcritical
))
{
if
(
this
.
abbreviation
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
abbrev
.
contains
(
searchcritical
))
{
if
(
this
.
abbreviation
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
adaID
.
contains
(
searchcritical
))
{
if
(
this
.
packageName
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
comment
.
contains
(
searchcritical
))
{
if
(
this
.
comment
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
id
.
contains
(
searchcritical
))
{
if
(
this
.
id
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
name
.
contains
(
searchcritical
))
{
if
(
this
.
name
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
this
.
parents
.
contains
(
searchcritical
))
{
if
(
this
.
parents
.
contains
(
searchcritical
))
{
return
true
;
}
if
(
String
.
valueOf
(
this
.
intclass
).
contains
(
searchcritical
))
{
if
(
String
.
valueOf
(
this
.
intclass
).
contains
(
searchcritical
))
{
return
true
;
}
return
false
;
...
...
src/main/java/com/spring/mvc/mini/pojo/ObjectClassListType.java
浏览文件 @
5a28f0d1
...
...
@@ -3,22 +3,23 @@ package com.spring.mvc.mini.pojo;
import
java.util.ArrayList
;
public
class
ObjectClassListType
{
ArrayList
<
ObjectClass
>
objectclasslist
;
public
ArrayList
<
ObjectClass
>
getObjectclasslist
()
{
return
objectclasslist
;
ArrayList
<
ObjectClass
>
objectClasses
;
public
ArrayList
<
ObjectClass
>
getObjectClasses
()
{
return
objectClasses
;
}
public
void
setObjectclasslist
(
ArrayList
<
ObjectClass
>
objectclasslist
)
{
this
.
objectclasslist
=
objectclasslist
;
public
void
setObjectClasses
(
ArrayList
<
ObjectClass
>
objectClasses
)
{
this
.
objectClasses
=
objectClasses
;
}
@Override
public
String
toString
()
{
StringBuffer
sb
=
new
StringBuffer
();
for
(
ObjectClass
item:
objectclasslist
)
{
for
(
ObjectClass
item
:
objectClasses
)
{
sb
.
append
(
item
);
}
return
"ObjectClassListType [objectclasslist="
+
sb
.
toString
()
+
"]"
;
return
"ObjectClassListType [objectClasses="
+
sb
+
"]"
;
}
}
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
浏览文件 @
5a28f0d1
...
...
@@ -15,22 +15,28 @@ public class UserInfo {
public
String
getUsername
()
{
return
username
;
}
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
public
String
getEmail
()
{
return
email
;
}
public
void
setEmail
(
String
email
)
{
this
.
email
=
email
;
}
public
String
getPassword
()
{
return
PasswordJasypter
.
decryption
(
this
.
password
);
}
public
void
setPassword
(
String
password
)
{
this
.
password
=
PasswordJasypter
.
encryption
(
password
);
}
@Override
public
String
toString
()
{
return
"UserInfo [username="
+
username
+
", email="
+
email
...
...
src/main/java/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
浏览文件 @
5a28f0d1
...
...
@@ -5,8 +5,6 @@ import java.util.Calendar;
import
java.util.Date
;
import
javax.mail.Address
;
import
javax.mail.MessagingException
;
import
javax.mail.internet.AddressException
;
import
javax.mail.internet.InternetAddress
;
import
org.joda.time.DateTime
;
...
...
@@ -15,7 +13,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
com.spring.mvc.mini.json.RequestStatusJson
Mapping
;
import
com.spring.mvc.mini.json.RequestStatusJson
Parser
;
import
com.spring.mvc.mini.mail.MailSender
;
import
com.spring.mvc.mini.pojo.RequestStatus
;
import
com.spring.mvc.mini.pojo.RequestStatusListType
;
...
...
@@ -27,74 +25,81 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
public
class
ScheduleFileUpdator
{
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ScheduleFileUpdator
.
class
);
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ScheduleFileUpdator
.
class
);
@Autowired
RequestStatusJsonMapping
rsjm
;
RequestStatusJsonParser
jsonParser
;
@Autowired
SVNHandler
sh
;
SVNHandler
svnHandler
;
@Autowired
ObjectClassXMLPaser
ocxp
;
ObjectClassXMLPaser
objectClassXMLPaser
;
@Autowired
MailSender
ms
;
MailSender
mailSender
;
public
void
commitObjectClassXml
()
{
Calendar
cal
=
Calendar
.
getInstance
();
Date
currenttime
=
cal
.
getTime
();
public
void
commitObjectClassXml
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
Date
currentTime
=
calendar
.
getTime
();
LOGGER
.
info
(
"Scheduler start at:"
+
currentt
ime
);
LOG
.
info
(
"Scheduler start at:"
+
currentT
ime
);
ArrayList
<
RequestStatus
>
mrsList
=
rsjm
.
readStatus
();
ArrayList
<
RequestStatus
>
requestStatuses
=
jsonParser
.
readStatus
();
int
mr
sIndex
=
0
;
for
(
RequestStatus
mrs:
mrsList
)
{
int
requestStatu
sIndex
=
0
;
for
(
RequestStatus
status
:
requestStatuses
)
{
int
days
=
Days
.
daysBetween
(
new
DateTime
(
mrs
.
getSubmitDate
()),
new
DateTime
(
currentt
ime
)).
getDays
();
int
daysBetweenSubmitAndCurrent
=
Days
.
daysBetween
(
new
DateTime
(
status
.
getSubmitDate
()),
new
DateTime
(
currentT
ime
)).
getDays
();
if
(
StatusType
.
ongoing
.
equals
(
mrs
.
getStatus
()))
{
if
(
days
>=
5
)
{
if
(
StatusType
.
ongoing
.
equals
(
status
.
getStatus
()))
{
if
(
daysBetweenSubmitAndCurrent
>=
5
)
{
mrsIndex
=
mrsList
.
indexOf
(
mrs
);
mrsList
.
get
(
mrsIndex
).
setCommitDate
(
currenttime
);
mrsList
.
get
(
mrsIndex
).
setStatus
(
StatusType
.
commited
);
setCommitDateAndStatus
(
currentTime
,
requestStatuses
,
status
);
StringBuffer
subjectsb
=
new
StringBuffer
();
subjectsb
.
append
(
"Final approval of MO CR "
);
subjectsb
.
append
(
mrs
.
getmocrid
());
subjectsb
.
append
(
" for "
);
for
(
ObjectClass
objcls:
mrs
.
getObjectClassListType
().
getObjectclasslist
()){
ocxp
.
AddObjectClass
(
objcls
);
subjectsb
.
append
(
objcls
.
getAbbrev
());
}
LOGGER
.
info
(
"MO CR "
+
mrs
.
getmocrid
()+
" was checked at:"
+
new
Date
());
LOG
.
info
(
"MO CR "
+
status
.
getmocrid
()
+
" was checked at:"
+
new
Date
());
try
{
this
.
commitAndSendMail
(
mrs
.
getUserinfo
(),
subjectsb
.
toString
(
),
"Congratulation!"
);
}
catch
(
Messaging
Exception
e
)
{
LOGGER
.
error
(
e
.
toString
());
this
.
commitAndSendMail
(
status
.
getUserinfo
(),
appendCommitMessage
(
status
),
"Congratulation!"
);
}
catch
(
Exception
e
)
{
LOG
.
error
(
e
.
toString
());
}
}
}
}
RequestStatusListType
mrslt
=
new
RequestStatusListType
();
mrslt
.
setRequestStatuses
(
mrsList
);
rsjm
.
writeStatus
(
mrslt
);
RequestStatusListType
type
=
new
RequestStatusListType
();
type
.
setRequestStatuses
(
requestStatuses
);
jsonParser
.
writeStatus
(
type
);
sh
.
svnCheckin
();
svnHandler
.
svnCheckin
();
}
public
void
commitAndSendMail
(
UserInfo
userinfo
,
String
subject
,
String
text
)
throws
AddressException
,
MessagingException
{
private
String
appendCommitMessage
(
RequestStatus
status
)
{
StringBuffer
s
=
new
StringBuffer
();
s
.
append
(
"Final approval of MO CR "
);
s
.
append
(
status
.
getmocrid
());
s
.
append
(
" for "
);
for
(
ObjectClass
objcls
:
status
.
getObjectClassListType
().
getObjectClasses
())
{
objectClassXMLPaser
.
AddObjectClass
(
objcls
);
s
.
append
(
objcls
.
getAbbreviation
());
}
return
s
.
toString
();
}
private
void
setCommitDateAndStatus
(
Date
currentTime
,
ArrayList
<
RequestStatus
>
requestStatuses
,
RequestStatus
status
)
{
int
requestStatusIndex
;
requestStatusIndex
=
requestStatuses
.
indexOf
(
status
);
requestStatuses
.
get
(
requestStatusIndex
).
setCommitDate
(
currentTime
);
requestStatuses
.
get
(
requestStatusIndex
).
setStatus
(
StatusType
.
commited
);
}
public
void
commitAndSendMail
(
UserInfo
userInfo
,
String
subject
,
String
text
)
throws
Exception
{
Address
[]
toAddress
=
{
new
InternetAddress
(
useri
nfo
.
getEmail
())};
Address
[]
toAddress
=
{
new
InternetAddress
(
userI
nfo
.
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/svn/SVNHandler.java
浏览文件 @
5a28f0d1
...
...
@@ -26,39 +26,31 @@ import com.spring.mvc.mini.properties.Properties;
@Component
public
class
SVNHandler
{
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
SVNHandler
.
class
);
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
SVNHandler
.
class
);
@Autowired
private
Properties
properties
;
public
void
svnCheckin
()
{
public
void
svnCheckin
()
{
SVNRepository
repository
=
null
;
SVNClientManager
ourClientManager
=
SVNClientManager
.
newInstance
();
try
{
//initiate the reporitory from the url
try
{
repository
=
SVNRepositoryFactory
.
create
(
SVNURL
.
parseURIDecoded
(
properties
.
getRepURL
()));
//create authentication data
ISVNAuthenticationManager
authManager
=
SVNWCUtil
.
createDefaultAuthenticationManager
(
properties
.
getUsername
(),
properties
.
getPassword
());
repository
.
setAuthenticationManager
(
authManager
);
//output some data to verify connection
System
.
out
.
println
(
"Repository Root: "
+
repository
.
getRepositoryRoot
(
true
)
);
System
.
out
.
println
(
"Repository UUID: "
+
repository
.
getRepositoryUUID
(
true
)
);
//need to identify latest revision
long
latestRevision
=
repository
.
getLatestRevision
();
System
.
out
.
println
(
"Repository Latest Revision: "
+
latestRevision
);
LOG
.
info
(
"Repository Root: "
+
repository
.
getRepositoryRoot
(
true
));
LOG
.
info
(
"Repository UUID: "
+
repository
.
getRepositoryUUID
(
true
));
//create client manager and set authentication
LOG
.
info
(
"Repository Latest Revision: "
+
repository
.
getLatestRevision
());
ourClientManager
.
setAuthenticationManager
(
authManager
);
//use commitClient to do the export
SVNCommitClient
commitClient
=
ourClientManager
.
getCommitClient
();
SVNDiffClient
diffClient
=
ourClientManager
.
getDiffClient
();
...
...
@@ -69,24 +61,24 @@ public class SVNHandler {
final
ByteArrayOutputStream
outputStream
=
new
ByteArrayOutputStream
();
diffClient
.
doDiff
(
xmlfile
,
SVNRevision
.
UNDEFINED
,
SVNRevision
.
BASE
,
SVNRevision
.
WORKING
,
diffClient
.
doDiff
(
xmlfile
,
SVNRevision
.
UNDEFINED
,
SVNRevision
.
BASE
,
SVNRevision
.
WORKING
,
SVNDepth
.
INFINITY
,
true
,
outputStream
,
null
);
if
(
outputStream
.
size
()
>
0
)
{
commitClient
.
doCommit
(
xmlfilearray
,
false
,
outputStream
.
toString
()
,
false
,
true
);
LOGGER
.
info
(
"XML Checked in at "
+
new
Date
());
if
(
outputStream
.
size
()
>
0
)
{
commitClient
.
doCommit
(
xmlfilearray
,
false
,
outputStream
.
toString
()
,
false
,
true
);
LOG
.
info
(
"XML Checked in at "
+
new
Date
());
}
diffClient
.
doDiff
(
jsonfile
,
SVNRevision
.
UNDEFINED
,
SVNRevision
.
BASE
,
SVNRevision
.
WORKING
,
diffClient
.
doDiff
(
jsonfile
,
SVNRevision
.
UNDEFINED
,
SVNRevision
.
BASE
,
SVNRevision
.
WORKING
,
SVNDepth
.
INFINITY
,
true
,
outputStream
,
null
);
if
(
outputStream
.
size
()
>
0
)
{
commitClient
.
doCommit
(
jsonfilearray
,
false
,
outputStream
.
toString
()
,
false
,
true
);
LOGGER
.
info
(
"Json SVN Checked in at "
+
new
Date
());
if
(
outputStream
.
size
()
>
0
)
{
commitClient
.
doCommit
(
jsonfilearray
,
false
,
outputStream
.
toString
()
,
false
,
true
);
LOG
.
info
(
"Json SVN Checked in at "
+
new
Date
());
}
}
catch
(
SVNException
e
)
{
LOGGER
.
error
(
e
.
toString
());
LOG
.
error
(
e
.
toString
());
}
finally
{
ourClientManager
.
dispose
();
}
...
...
@@ -95,13 +87,13 @@ public class SVNHandler {
public
void
svnCheckout
()
{
File
svnTempDir
=
new
File
(
properties
.
getRepPath
());
if
(
svnTempDir
.
exists
())
{
if
(
svnTempDir
.
exists
())
{
return
;
}
SVNRepository
repository
=
null
;
try
{
try
{
//initiate the reporitory from the url
repository
=
SVNRepositoryFactory
.
create
(
SVNURL
.
parseURIDecoded
(
properties
.
getRepURL
()));
...
...
@@ -119,15 +111,15 @@ public class SVNHandler {
//use SVNUpdateClient to do the export
SVNUpdateClient
updateClient
=
ourClientManager
.
getUpdateClient
();
updateClient
.
setIgnoreExternals
(
false
);
updateClient
.
setIgnoreExternals
(
false
);
updateClient
.
doCheckout
(
repository
.
getLocation
(),
svnTempDir
,
SVNRevision
.
create
(
latestRevision
),
SVNRevision
.
create
(
latestRevision
),
true
);
}
catch
(
SVNException
e
)
{
LOGGER
.
error
(
e
.
toString
());
LOG
.
error
(
e
.
toString
());
}
finally
{
LOGGER
.
info
(
"resources/svn_temp checked outs"
);
LOG
.
info
(
"resources/svn_temp checked outs"
);
}
}
...
...
src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java
浏览文件 @
5a28f0d1
...
...
@@ -22,8 +22,8 @@ public class ObjectClassDataValidator {
boolean
parentsMark
=
false
;
if
(!
objclsItemFormIn
.
getAbbrev
().
equals
(
objclsItemFormIn
.
getAbbrev
().
toUpperCase
())){
throw
new
ObjectClassDataValidationException
(
"FAILED:ObjectClass abbrev:\""
+
objclsItemFormIn
.
getAbbrev
()+
"\" should be all uppercase."
);
if
(!
objclsItemFormIn
.
getAbbrev
iation
().
equals
(
objclsItemFormIn
.
getAbbreviation
().
toUpperCase
())){
throw
new
ObjectClassDataValidationException
(
"FAILED:ObjectClass abbrev:\""
+
objclsItemFormIn
.
getAbbrev
iation
()+
"\" should be all uppercase."
);
}
for
(
ObjectClass
objclsItemXmlIn:
objclsListXmlIn
){
...
...
@@ -31,8 +31,8 @@ public class ObjectClassDataValidator {
if
(
objclsItemXmlIn
.
getId
().
equals
(
objclsItemFormIn
.
getId
())){
throw
new
ObjectClassDataValidationException
(
"FAILED:ObjectClass id:\""
+
objclsItemFormIn
.
getId
()+
"\" is already reserved."
);
}
if
(
objclsItemXmlIn
.
getAbbrev
().
equals
(
objclsItemFormIn
.
getAbbrev
())){
throw
new
ObjectClassDataValidationException
(
"FAILED:ObjectClass abbrev:\""
+
objclsItemFormIn
.
getAbbrev
()+
"\" is already reserved."
);
if
(
objclsItemXmlIn
.
getAbbrev
iation
().
equals
(
objclsItemFormIn
.
getAbbreviation
())){
throw
new
ObjectClassDataValidationException
(
"FAILED:ObjectClass abbrev:\""
+
objclsItemFormIn
.
getAbbrev
iation
()+
"\" is already reserved."
);
}
if
(
objclsItemXmlIn
.
getId
().
equals
(
objclsItemFormIn
.
getParents
())){
parentsMark
=
true
;
...
...
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
浏览文件 @
5a28f0d1
...
...
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.SessionAttributes;
import
org.springframework.web.context.request.WebRequest
;
import
org.springframework.web.servlet.mvc.support.RedirectAttributes
;
import
com.spring.mvc.mini.json.RequestStatusJson
Mapping
;
import
com.spring.mvc.mini.json.RequestStatusJson
Parser
;
import
com.spring.mvc.mini.mail.MailSender
;
import
com.spring.mvc.mini.pojo.RequestStatus
;
import
com.spring.mvc.mini.properties.Properties
;
...
...
@@ -40,7 +40,7 @@ public class ObjectClassFormController {
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ObjectClassFormController
.
class
);
@Autowired
RequestStatusJson
Mapping
rsjm
;
RequestStatusJson
Parser
rsjm
;
@Autowired
ObjectClassDataValidator
ocdv
;
...
...
@@ -72,7 +72,7 @@ public class ObjectClassFormController {
ArrayList
<
ObjectClass
>
objclsList
=
new
ArrayList
<
ObjectClass
>();
objclsList
.
add
(
createObjectClassInstance
(
0
,
userinfo
,
mocrid
));
ojbclslisttype
.
setObject
classlist
(
objclsList
);
ojbclslisttype
.
setObject
Classes
(
objclsList
);
model
.
addAttribute
(
"ojbclslisttype"
,
ojbclslisttype
);
}
...
...
@@ -83,7 +83,7 @@ public class ObjectClassFormController {
@RequestMapping
(
params
={
"objclscount"
},
method
=
RequestMethod
.
POST
)
public
void
objectClassFormWithParam
(
@Valid
ObjectClassListType
ojbclslisttype
,
@ModelAttribute
(
"userinfo"
)
UserInfo
userinfo
,
@ModelAttribute
(
"mocrid"
)
String
mocrid
,
@RequestParam
String
objclscount
,
Model
model
)
{
ArrayList
<
ObjectClass
>
objclsList
=
ojbclslisttype
.
getObject
classlist
();
ArrayList
<
ObjectClass
>
objclsList
=
ojbclslisttype
.
getObject
Classes
();
// for(int i=1;i<Integer.parseInt(objclscount)+1;i++){
...
...
@@ -91,7 +91,7 @@ public class ObjectClassFormController {
// }
ojbclslisttype
.
setObject
classlist
(
objclsList
);
ojbclslisttype
.
setObject
Classes
(
objclsList
);
model
.
addAttribute
(
"ojbclslisttype"
,
ojbclslisttype
);
}
...
...
@@ -109,7 +109,7 @@ public class ObjectClassFormController {
return
null
;
}
ArrayList
<
ObjectClass
>
objclsList
=
ojbclslisttype
.
getObject
classlist
();
ArrayList
<
ObjectClass
>
objclsList
=
ojbclslisttype
.
getObject
Classes
();
try
{
ocdv
.
checkData
(
objclsList
);
...
...
@@ -151,7 +151,7 @@ public class ObjectClassFormController {
subjectsb
.
append
(
mocrid
);
subjectsb
.
append
(
" for "
);
for
(
ObjectClass
objcls:
objclsList
){
subjectsb
.
append
(
objcls
.
getAbbrev
());
subjectsb
.
append
(
objcls
.
getAbbrev
iation
());
}
StringBuffer
textsb
=
new
StringBuffer
();
...
...
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
浏览文件 @
5a28f0d1
...
...
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.context.request.WebRequest
;
import
org.springframework.web.servlet.mvc.support.RedirectAttributes
;
import
com.spring.mvc.mini.json.RequestStatusJson
Mapping
;
import
com.spring.mvc.mini.json.RequestStatusJson
Parser
;
import
com.spring.mvc.mini.mail.MailSender
;
import
com.spring.mvc.mini.pojo.RequestStatusListType
;
import
com.spring.mvc.mini.pojo.UserInfo
;
...
...
@@ -34,7 +34,7 @@ public class RequestStatusController {
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
RequestStatusController
.
class
);
@Autowired
RequestStatusJson
Mapping
rsjm
;
RequestStatusJson
Parser
rsjm
;
@Autowired
MailSender
ms
;
...
...
src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
浏览文件 @
5a28f0d1
...
...
@@ -78,13 +78,13 @@ public class ObjectClassXMLPaser {
if
(
node
instanceof
Element
)
{
objcls
.
setId
(((
Element
)
node
).
getAttribute
(
"id"
).
toString
());
objcls
.
setAbbrev
(((
Element
)
node
).
getAttribute
(
"abbrev"
)
objcls
.
setAbbrev
iation
(((
Element
)
node
).
getAttribute
(
"abbrev"
)
.
toString
());
objcls
.
setIntclass
(
Integer
.
parseInt
(((
Element
)
node
).
getAttribute
(
"intclass"
)));
objcls
.
setName
(((
Element
)
node
).
getAttribute
(
"name"
).
toString
());
objcls
.
setParents
(((
Element
)
node
).
getAttribute
(
"parents"
)
.
toString
());
objcls
.
set
AdaID
(((
Element
)
node
).
getAttribute
(
"adaID"
)
objcls
.
set
PackageName
(((
Element
)
node
).
getAttribute
(
"adaID"
)
.
toString
());
elementcount
++;
objclsList
.
add
(
objcls
);
...
...
@@ -123,8 +123,8 @@ public class ObjectClassXMLPaser {
Element
objclselement
=
document
.
createElement
(
"objclass"
);
objclselement
.
setAttribute
(
"id"
,
objcls
.
getId
());
objclselement
.
setAttribute
(
"intclass"
,
String
.
valueOf
(
objcls
.
getIntclass
()));
objclselement
.
setAttribute
(
"abbrev"
,
objcls
.
getAbbrev
());
objclselement
.
setAttribute
(
"adaID"
,
objcls
.
get
AdaID
());
objclselement
.
setAttribute
(
"abbrev"
,
objcls
.
getAbbrev
iation
());
objclselement
.
setAttribute
(
"adaID"
,
objcls
.
get
PackageName
());
objclselement
.
setAttribute
(
"name"
,
objcls
.
getName
());
objclselement
.
setAttribute
(
"parents"
,
objcls
.
getParents
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录