test
This commit is contained in:
parent
26312e7241
commit
64a5e8c47e
3 changed files with 8 additions and 9 deletions
|
@ -22,8 +22,8 @@
|
|||
<!-- Configure properties to access the Manager application
|
||||
user /pass combo should be in $TOMCAT_HOME/conf/tomcat-users.xml with manager role.-->
|
||||
<property name="url" value="http://localhost:2020/manager"/>
|
||||
<property name="username" value="user"/>
|
||||
<property name="password" value="pass"/>
|
||||
<property name="username" value="travis"/>
|
||||
<property name="password" value="bavis"/>
|
||||
|
||||
<!-- Configure the custom Ant tasks for the Manager application
|
||||
These tasks require catalina-ant.jar in $ANT_HOME/lib-->
|
||||
|
|
|
@ -6,13 +6,13 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
|
|||
|
||||
### direct messages to file hibernate.log ###
|
||||
log4j.appender.file=org.apache.log4j.FileAppender
|
||||
log4j.appender.file.File=/Users/travis/webapps/lex/logs/hibernate.log
|
||||
log4j.appender.file.File=/Users/travis/webapps/Dictionary/logs/hibernate.log
|
||||
log4j.appender.file.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
|
||||
|
||||
### direct messages to file lex.log ###
|
||||
log4j.appender.lex-out=org.apache.log4j.FileAppender
|
||||
log4j.appender.lex-out.File=/Users/travis/webapps/lex/logs/lex.log
|
||||
log4j.appender.lex-out.File=/Users/travis/webapps/Dictionary/logs/lex.log
|
||||
log4j.appender.lex-out.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.lex-out.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
|
||||
|
||||
|
|
|
@ -11,11 +11,10 @@
|
|||
<span class="compEditOptions">
|
||||
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&comp=passage&metaId=${ passage.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
|
||||
<c:out value='<a href="/lex/action?cmd=getUpdateForm&comp=passage&metaId=${ passage.metaId }" title="Edit this passage"><img alt="Edit this passage" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
|
||||
<c:out value='<a href="/lex/action?cmd=getTranslationForm&comp=passage&parentId=${passage.parentId}&translationOf=${passage.metaId}" title="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXm
|
||||
|
||||
l="false" />
|
||||
<c:out value='<a href="/lex/action?cmd=getTranslationForm&comp=passage&parentId=${passage.parentId}&translationOf=${passage.metaId}" title="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
|
||||
<c:out value='<a href="/lex/action?cmd=getTranslationForm&comp=passage&parentId=${passage.parentId}&translationOf=${passage.metaId}" title="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
|
||||
</span>
|
||||
</c:if>
|
||||
</c:if>
|
||||
|
||||
<c:set var="source" value="${ applicationScope.flatData.literarySources[ passage.literarySource ] }"/>
|
||||
|
||||
|
@ -49,7 +48,7 @@ l="false" />
|
|||
<!--Here was the wylie: <c:out value="${ passage.passage }" /> -->
|
||||
</c:if>
|
||||
|
||||
<div><c:out value="${ passage.passage }" /></div>
|
||||
<div><c:out value="${ passage.passage }" escapeXml="false"/></div>
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue