Project

General

Profile

« Previous | Next » 

Revision 3780

Added by daigle about 16 years ago

Changes to remove ANT tokens for the turnkey install project

View differences:

include_session_vars.jsp
29 29
  * convert an XML file showing the resultset of a query
30 30
  * into an HTML format suitable for rendering with modern web browsers.
31 31
  */
32
  %>
32 33

  
34
  <!--  %@ include file="../../common/common-settings.jsp"% -->
35

  
36
  <% 
37

  
33 38
  //////////////////////////////////////////////////////////////////////////////
34 39
  //
35 40
  // NOTE:
......
54 59
	Metacat     metacat               = null;
55 60
	HttpSession rfSession             = null;
56 61
	boolean     isLoggedIn            = false;
57
    String      relativeRoot          = "@style-skins-path@/knb2";
58
    String      knbSiteUrl            = "@knb-site-url@";
62
    String      relativeRoot          = SERVLET_URL + "/style/skins/knb2";
63
    String      knbSiteUrl            = KNB_SITE_URL;
59 64
    String      include_portalhead_title = null;
60 65
	
61 66
  //////////////////////////////////////////////////////////////////////////////	
......
124 129
			
125 130
			} else {   // ...or create it if it doesn't already exist
126 131
				try {
127
					metacat = MetacatFactory.createMetacatConnection(METACAT_URL);
132
					metacat = MetacatFactory.createMetacatConnection(SERVLET_URL);
128 133
				} catch (MetacatInaccessibleException mie) {
129
					throw new ServletException("Metacat connection to "+METACAT_URL
134
					throw new ServletException("Metacat connection to "+SERVLET_URL
130 135
                                                +" failed." + mie.getMessage());
131 136
				}
132 137
				if (metacat==null) {
133
					throw new ServletException("Metacat connection to "+METACAT_URL
138
					throw new ServletException("Metacat connection to "+SERVLET_URL
134 139
                                          +" failed - Metacat object is NULL!");
135 140
				}
136 141
				rfSession.setAttribute("sess_metacatObj", metacat);
......
187 192
	<tr> 
188 193
		<td colspan="4" align="left" valign="top" class="text_plain" bgcolor="#ffff00">
189 194
			<ul>
190
				<li>METACAT_URL:&nbsp;<%=METACAT_URL%></li>
195
				<li>SERVLET_URL:&nbsp;<%=SERVLET_URL%></li>
191 196
				<li>rfSession:&nbsp;<%=rfSession%></li>
192 197
				<li>metacatResponse:&nbsp;<%=metacatResponse%></li>
193 198
				<li>posted_ldapUserName:&nbsp;<%=posted_ldapUserName%></li>

Also available in: Unified diff