Changeset 19891 in main
- Timestamp:
- 02/21/20 23:19:02 (2 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/user.xml
r18692 r19891 28 28 29 29 <bean id="userEmailVerificationRequestPath" class="org.ibisph.model.StringHolder"> 30 <constructor-arg type="java.lang.String" value="#{commonWebAppRemoteRequestPath}user/registration/verify"/> 30 <description> 31 Specifies the specific URL for the user self registration 32 verification code. This is either a complete URL base request 33 path or a sub request path which is then concated with the 34 webapp base request path. 35 </description> 36 <constructor-arg type="java.lang.String" value="user/registration/verify"/> 31 37 </bean> 32 38 … … 260 266 261 267 <bean id="userProcessUserRegistrationModelMap" class="org.ibisph.user.modelmap.ProcessUserRegistration"> 262 <property name="userProfileModelMapKey" value="#{userProfileModelMapKey.string}"/> 263 <property name="userProfileService" ref="userProfileXMLService"/> 264 <property name="emailVerificationService" ref="userEmailVerificationService"/> 268 <property name="userProfileModelMapKey" value="#{userProfileModelMapKey.string}"/> 269 <property name="userProfileService" ref="userProfileXMLService"/> 270 <property name="emailVerificationService" ref="userEmailVerificationService"/> 271 <property name="webAppBaseRequestPathModelMapKey" value="WebAppBaseRequestPath"/> 265 272 <property name="emailVerificationRequestPath" value="#{userEmailVerificationRequestPath.string}"/> 266 273 </bean> -
trunk/ibisph-view/src/main/webapp/xslt/_ibis-path.xslt
r19890 r19891 103 103 104 104 105 <xsl:function name="ibis:get CompleteURL" as="xs:string"105 <xsl:function name="ibis:getRequestURL" as="xs:string" 106 106 ibis:doc="tests the supplied path/URL and if no http prefix then the 107 107 webapp context is added as a prefix to the path." -
trunk/ibisph-view/src/main/webapp/xslt/html/Page.xslt
r19890 r19891 505 505 <script> 506 506 $.ajax({ 507 url: "<xsl:value-of select="ibis:get CompleteURL($sourceContentURL)"/>"507 url: "<xsl:value-of select="ibis:getRequestURL($sourceContentURL)"/>" 508 508 ,type: "GET" 509 509 ,success: function(data) -
trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Indicator.xslt
r19890 r19891 956 956 <xsl:for-each select="$indicator/TOPICS/TOPIC"> 957 957 <xsl:sort select="SORT_ORDER" order="ascending" data-type="number"/> 958 <li><a href="{ibis:get CompleteURL(URL)}" title="Topic {TITLE}"958 <li><a href="{ibis:getRequestURL(URL)}" title="Topic {TITLE}" 959 959 ><xsl:value-of select="TITLE"/> 960 960 </a></li> … … 981 981 <xsl:for-each select="$indicator//DATASET/QUERY"> 982 982 <xsl:sort select="SORT_ORDER" order="ascending" data-type="number"/> 983 <li><a href="{ibis:get CompleteURL(URL)}" title="Dataset Query {TITLE}"983 <li><a href="{ibis:getRequestURL(URL)}" title="Dataset Query {TITLE}" 984 984 ><xsl:value-of select="TITLE"/> 985 985 </a></li> -
trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Page.xslt
r19890 r19891 147 147 <xsl:for-each select="$indicator/TOPICS/TOPIC"> 148 148 <xsl:sort select="SORT_ORDER" order="ascending" data-type="number"/> 149 <option value="{ibis:get CompleteURL(URL)}"><xsl:value-of select="TITLE"/></option>149 <option value="{ibis:getRequestURL(URL)}"><xsl:value-of select="TITLE"/></option> 150 150 </xsl:for-each> 151 151 </select> -
trunk/ibisph/src/main/java/org/ibisph/communityprofile/modelmap/ModelFromHTTPRequestPath.java
r19071 r19891 22 22 implements GetModelMapFromHTTPRequest 23 23 { 24 protected String communityNameModelMapKey = "DimensionName";25 protected String communityValueModelMapKey = "DimensionValue";26 protected String indicatorNameModelMapKey = "IndicatorName";27 protected String indicatorSetNameModelMapKey = "IndicatorSetName";24 protected String communityNameModelMapKey = "DimensionName"; 25 protected String communityValueModelMapKey = "DimensionValue"; 26 protected String indicatorNameModelMapKey = "IndicatorName"; 27 protected String indicatorSetNameModelMapKey = "IndicatorSetName"; 28 28 protected String communityReportTypeModelMapKey = "CommunityReportType"; 29 29 30 protected String indicatorsCommunityReportType = "indicators";31 protected String indicatorCommunityReportType = "indicator";32 protected String factsCommunityReportType = "facts";30 protected String indicatorsCommunityReportType = "indicators"; 31 protected String indicatorCommunityReportType = "indicator"; 32 protected String factsCommunityReportType = "facts"; 33 33 34 34 -
trunk/ibisph/src/main/java/org/ibisph/user/modelmap/ProcessUserRegistration.java
r18246 r19891 8 8 9 9 import org.dom4j.Node; 10 11 10 import org.ibisph.modelmap.ProcessModelMapFromHTTPRequest; 12 11 import org.ibisph.user.service.EmailAccountAccess; 13 12 import org.ibisph.util.IOPath; 13 import org.ibisph.util.NetLib; 14 14 import org.ibisph.util.StrLib; 15 15 import org.ibisph.util.XMLLib; … … 24 24 */ 25 25 public class ProcessUserRegistration extends AbstractUserStatus implements ProcessModelMapFromHTTPRequest { 26 protected String emailVerificationRequestPath = null; 26 protected String webAppBaseRequestPathModelMapKey = "WebAppBaseRequestPath"; 27 protected String emailVerificationRequestPath = null; 28 protected String baseEmailVerificationRequestPath = null; 27 29 protected EmailAccountAccess emailVerificationService = null; 28 29 30 30 31 /** … … 46 47 } 47 48 49 public void setWebAppBaseRequestPathModelMapKey(String webAppBaseRequestPathModelMapKey) { 50 this.webAppBaseRequestPathModelMapKey = webAppBaseRequestPathModelMapKey; 51 } //-------------------------- End of Method ------------------------------ 52 53 /* TODO: remove at some point... 54 protected WebAppBaseRequestPathFromHTTPRequest webAppBaseRequestPathModelMap = null; 55 public void setWebAppBaseRequestPathFromHTTPRequest(WebAppBaseRequestPathFromHTTPRequest webAppBaseRequestPathModelMap) { 56 this.webAppBaseRequestPathModelMap = webAppBaseRequestPathModelMap; 57 } 58 */ 48 59 49 60 //------------------------ M A I N R E Q U E S T M O D E L M E T H O D … … 98 109 } 99 110 100 // If here then so far so good - send the verification email message and 101 // set status accordingly. 111 // If here then so far so good - set the base verification email request path 112 // if needed and send the verification email message then set status accordingly. 113 if(!StrLib.isSomething(this.baseEmailVerificationRequestPath)) { 114 if(NetLib.isURL(this.emailVerificationRequestPath)) 115 this.baseEmailVerificationRequestPath = this.emailVerificationRequestPath; 116 else { 117 String webAppBaseRequestPath = (String)modelMap.get(this.webAppBaseRequestPathModelMapKey); 118 this.baseEmailVerificationRequestPath = IOPath.concat(webAppBaseRequestPath, this.emailVerificationRequestPath, "/"); 119 } 120 } 121 102 122 String verificationValue = request.getSession().getId(); 103 123 if(sendVerificationEmail(userProfileDocument, id, emailAddress, verificationValue)) { … … 128 148 try { 129 149 String urlSuffix = IOPath.concat(userID, verificationValue, "/"); 130 String verificationURL = IOPath.concat(this. emailVerificationRequestPath, urlSuffix, "/");150 String verificationURL = IOPath.concat(this.baseEmailVerificationRequestPath, urlSuffix, "/"); 131 151 emailVerificationService.sendMergedEmailMessage( 132 152 userEmailAddress, -
trunk/ibisph/src/main/java/org/ibisph/web/ContextAndPathService.java
r18692 r19891 59 59 /** 60 60 * Core getter that provides access to the Spring Framework Web Application 61 * Context. 61 * Context. Allows access to bean defs etc. 62 62 * @return Spring Framework Web Application Context. 63 63 */ … … 75 75 /** 76 76 * Core getter that provides access to the standard servlet context. 77 * Example "/ibisph-view" 77 78 * @return Standard Java Servlet Context. 78 79 */ … … 82 83 throw new NullPointerException("ContextAndPathService.getServletContext - null servletContext."); 83 84 } 85 logger.debug(".getServletContext -servletContext.getContextPath: {} ", servletContext.getContextPath()); 84 86 return(servletContext); 85 87 } //-------------------------- End of Method ------------------------------
Note: See TracChangeset
for help on using the changeset viewer.