zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape invalid XML chars during serialization.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2013-03-17 11:22:53 -03:00
parent 3578d6e624
commit 48e211cc2d
97 changed files with 62 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@@ -75,12 +75,6 @@
<put-attribute name="removeSignin" value="true"/>
</definition>
<definition name="openidlogin" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/openidlogin.jsp"/>
<put-attribute name="removeSignin" value="true"/>
</definition>
<definition name="termsOfUse" extends="pageTemplate">
<put-attribute name="title" value="TERM_OF_USE"/>
<put-attribute name="body" value="/jsp/termsOfUse.jsp"/>

34
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@@ -50,26 +50,26 @@
authentication-failure-url="/c/login?login_error=2"
login-processing-url="/c/j_spring_security_check"/>
<sec:openid-login user-service-ref="userDetailsService"
authentication-failure-url="/c/login.jsp?login_error=true"
login-processing-url="/c/j_spring_openid_security_check">
<!--<sec:openid-login user-service-ref="userDetailsService"-->
<!--authentication-failure-url="/c/login.jsp?login_error=true"-->
<!--login-processing-url="/c/j_spring_openid_security_check">-->
<sec:attribute-exchange identifier-match="https://www.google.com/.*">
<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true" count="1"/>
<sec:openid-attribute name="firstname" type="http://axschema.org/namePerson/first" required="true"/>
<sec:openid-attribute name="lastname" type="http://axschema.org/namePerson/last" required="true"/>
</sec:attribute-exchange>
<!--<sec:attribute-exchange identifier-match="https://www.google.com/.*">-->
<!--<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true" count="1"/>-->
<!--<sec:openid-attribute name="firstname" type="http://axschema.org/namePerson/first" required="true"/>-->
<!--<sec:openid-attribute name="lastname" type="http://axschema.org/namePerson/last" required="true"/>-->
<!--</sec:attribute-exchange>-->
<sec:attribute-exchange identifier-match=".*yahoo.com.*">
<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>
<sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
</sec:attribute-exchange>
<!--<sec:attribute-exchange identifier-match=".*yahoo.com.*">-->
<!--<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>-->
<!--<sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>-->
<!--</sec:attribute-exchange>-->
<sec:attribute-exchange identifier-match=".*myopenid.com.*">
<sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>
<sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>
</sec:attribute-exchange>
</sec:openid-login>
<!--<sec:attribute-exchange identifier-match=".*myopenid.com.*">-->
<!--<sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>-->
<!--<sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>-->
<!--</sec:attribute-exchange>-->
<!--</sec:openid-login>-->
<sec:remember-me key="wisemapping-hashed-key"/>
<sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
</sec:http>