perfsonar development work

Author: rodriguez
Date: 2008-09-30 10:17:00 -0400 (Tue, 30 Sep 2008)
New Revision: 4562

Modified:
   trunk/geant2_java-as/conf/axis-1.4/testdepl.jsp
   trunk/geant2_java-as/conf/log4j.properties.template
   trunk/geant2_java-as/conf/log4j.syslog.properties.template
   trunk/geant2_java-as/conf/wizard.properties.template
   trunk/geant2_java-as/packaging/deb/conffiles
   trunk/geant2_java-as/packaging/deb/install
   trunk/geant2_java-as/packaging/deb/postinst
   trunk/geant2_java-as/packaging/rpm/geant2-java-as.specs
Log:
- Updating paths to the famous option C 
(/usr/lib/perfsonar/services/geant2-java-as/)
- Updating the test jsp page
- Updating metadata package

Modified: trunk/geant2_java-as/conf/axis-1.4/testdepl.jsp
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/testdepl.jsp     2008-09-30 13:24:42 
UTC (rev 4561)
+++ trunk/geant2_java-as/conf/axis-1.4/testdepl.jsp     2008-09-30 14:17:00 
UTC (rev 4562)
@@ -14,7 +14,7 @@
         <div class="centerWindow" >
            <p class="welcometext">Welcome to the perfSONAR service web 
administration interface</p>
             <p class="heading1">
-               Deployment test 
+               Deployment test
             </p>
 
 
@@ -25,18 +25,20 @@
                        rootPath = sc.getRealPath("/");;
               if( (parm=request.getParameter("testit")) != null  &&  
parm.equals("true")  )
                {
+                               String requestURL = 
request.getRequestURL().toString();
+                               String requestURI = request.getRequestURI();
+                               String baseURL = requestURL.substring(0, 
requestURL.indexOf(requestURI)) + "/";
 
-
-                String 
-                        endpoint = "http://127.0.0.1:8080/"; + 
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
+                String
+                        endpoint = baseURL + 
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
                                                                              
      guessWebServiceUrl(rootPath) , /* this path */
                        filein = rootPath + 
"/WEB-INF/samples/requests/EchoRequest.xml",
                        fileout= rootPath + 
"/WEB-INF/samples/responses/EchoResponse.xml";
                        int ret = 0;
 
-                       if( endpoint.equals("http://127.0.0.1:8080/";) == 
false )
+                       if( endpoint.equals(baseURL) == false )
 
-                       { 
+                       {
                                //      out.println("<br/><br/>Root path:" + 
(new java.io.File(rootPath)).getCanonicalPath() );
                                //out.println("<br/><br/>Contacted 
endpoint:");
                                //out.println("<br/><br/>" + endpoint);
@@ -53,15 +55,15 @@
 
                    switch(ret)
                    {
-                       case 0: 
+                       case 0:
                                result = "<br/>Contacted endpoint 
:<br/><br/>" + endpoint + "<br/><br/> Deployment test successful.";
-                               parms1 = " class=\"testdeplsucc\""; 
-                               cssName2 = "\"testdeplretbn\""; 
+                               parms1 = " class=\"testdeplsucc\"";
+                               cssName2 = "\"testdeplretbn\"";
                                break;
                        default:
-                               result = ""; 
-                               parms1 = " style=\"width:550px;height:150px\" 
class=\"testdeplfail\""; 
-                               cssName2 = "\"testdeplretbn2\""; 
+                               result = "";
+                               parms1 = " style=\"width:550px;height:150px\" 
class=\"testdeplfail\"";
+                               cssName2 = "\"testdeplretbn2\"";
                                break;
 
                    }
@@ -69,32 +71,32 @@
 
               <table align="center"  <%=parms1 %>  >
                    <tr>      <td ></td>  </tr>
-                   <tr>      <td >      &nbsp;   
+                   <tr>      <td >      &nbsp;
                        <%= result %>
                                 </td> </tr>
                  </table>
 
-       
+
            <% } else {  %>
 
               <table  align="left" class="testdeplmain" >
                    <tr>      <td>                                </td>       
                     </tr>
-                   <tr>      <td >     
-                       Click on the  <b>start test</b>  button to check if 
you have deployed the <%=new java.io.File(rootPath).getName()%> web service 
correctly.       
+                   <tr>      <td >
+                       Click on the  <b>start test</b>  button to check if 
you have deployed the <%=new java.io.File(rootPath).getName()%> web service 
correctly.
                                 </td> </tr>
 
                        <tr>
                          <td>
-                              <center> <br/> 
+                              <center> <br/>
                                  <a href="?testit=true" target="_self"
                                        class="testdeplstartbn"></a>
                                </center>
                            </td>
-       
+
                        </tr>
                  </table>
 
-           <% } %> 
+           <% } %>
 
 
         </div>

Modified: trunk/geant2_java-as/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.properties.template 2008-09-30 13:24:42 
UTC (rev 4561)
+++ trunk/geant2_java-as/conf/log4j.properties.template 2008-09-30 14:17:00 
UTC (rev 4562)
@@ -6,8 +6,8 @@
 
 
 # The path of a directory which contains log files.
-# Replace occurrences of /opt/perfsonar/services/geant2-java-as/WEB-INF/log 
string in this file with a real path.
-logDir=/opt/perfsonar/services/geant2-java-as/WEB-INF/log
+# Replace occurrences of 
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log string in this file 
with a real path.
+logDir=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log
 
 
 ##
@@ -60,7 +60,7 @@
 
 # Group=Debug message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -88,7 +88,7 @@
 
 # Group=Info message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -116,7 +116,7 @@
 
 # Group=Warn message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -144,7 +144,7 @@
 
 # Group=Error message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -172,7 +172,7 @@
 
 # Group=Fatal message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -200,7 +200,7 @@
 
 # Group=All message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -225,7 +225,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 #log4j.appender.rootAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 #log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-as/conf/log4j.syslog.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.syslog.properties.template  2008-09-30 
13:24:42 UTC (rev 4561)
+++ trunk/geant2_java-as/conf/log4j.syslog.properties.template  2008-09-30 
14:17:00 UTC (rev 4562)
@@ -6,8 +6,8 @@
 
 
 # The path of a directory which contains log files.
-# Replace occurrences of /opt/perfsonar/services/geant2-java-as/WEB-INF/log 
string in this file with a real path.
-logDir=/opt/perfsonar/services/geant2-java-as/WEB-INF/log
+# Replace occurrences of 
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log string in this file 
with a real path.
+logDir=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log
 
 
 ##
@@ -60,7 +60,7 @@
 
 # Group=Debug message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -88,7 +88,7 @@
 
 # Group=Info message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -116,7 +116,7 @@
 
 # Group=Warn message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -144,7 +144,7 @@
 
 # Group=Error message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -172,7 +172,7 @@
 
 # Group=Fatal message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -200,7 +200,7 @@
 
 # Group=All message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -245,7 +245,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 #log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
 #log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-09-30 
13:24:42 UTC (rev 4561)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-09-30 
14:17:00 UTC (rev 4562)
@@ -12,9 +12,9 @@
 <!ELEMENT Comment (#PCDATA) >
 <!ELEMENT ProposedValue (#PCDATA) >
 <!ELEMENT Group (#PCDATA) >
-<!ATTLIST Group 
-  order CDATA #REQUIRED 
- check (true|false) #IMPLIED 
+<!ATTLIST Group
+  order CDATA #REQUIRED
+ check (true|false) #IMPLIED
 >
 <!ELEMENT AcceptedValue (#PCDATA) >
 ]>
@@ -84,31 +84,31 @@
   </property>
 
   <property>
-    <entry key="service.as.truststore_file" 
required="true">/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
+    <entry key="service.as.truststore_file" 
required="true">/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
     <Comment>Enter the full path to the TrustStore file containing the CA 
certs:</Comment>
-    
<ProposedValue>/opt/perfsonar/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
+    
<ProposedValue>/usr/lib/perfsonar/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
     <Group order="1">Authentication</Group>
   </property>
-  
+
   <property>
     <entry key="service.as.truststore_password" 
required="true">12345678</entry>
     <Comment>Enter the password for the TrustStore file:</Comment>
     <ProposedValue>12345678</ProposedValue>
     <Group order="2">Authentication</Group>
   </property>
-  
+
   <property>
-    <entry key="service.as.valid_components" 
required="true">/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
+    <entry key="service.as.valid_components" 
required="true">/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
     <Comment>Enter the full path to a file containing valid Component IDs in 
eduGAIN:</Comment>
-    
<ProposedValue>/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
+    
<ProposedValue>/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
     <Group order="3">Authentication</Group>
   </property>
-  
+
   <property>
     <entry key="service.as.maxttl" required="true">900000</entry>
     <Comment>Enter the maximum lifetime (miliseconds) token allowed in the 
service:</Comment>
     <ProposedValue>900000</ProposedValue>
     <Group order="4">Authentication</Group>
   </property>
-  
+
 </properties>
\ No newline at end of file

Modified: trunk/geant2_java-as/packaging/deb/conffiles
===================================================================
--- trunk/geant2_java-as/packaging/deb/conffiles        2008-09-30 13:24:42 
UTC (rev 4561)
+++ trunk/geant2_java-as/packaging/deb/conffiles        2008-09-30 14:17:00 
UTC (rev 4562)
@@ -1,8 +1,8 @@
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/components.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/service.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/servlet.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/wizard.properties
-/opt/perfsonar/services/geant2-java-as/WEB-INF/web.xml
-/opt/perfsonar/services/geant2-java-as/WEB-INF/server-config.wsdd
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/components.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/service.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/servlet.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/wizard.properties
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/web.xml
+/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/server-config.wsdd

Modified: trunk/geant2_java-as/packaging/deb/install
===================================================================
--- trunk/geant2_java-as/packaging/deb/install  2008-09-30 13:24:42 UTC (rev 
4561)
+++ trunk/geant2_java-as/packaging/deb/install  2008-09-30 14:17:00 UTC (rev 
4562)
@@ -1,2 +1,2 @@
-build/geant2-java-as/* /opt/perfsonar/services/geant2-java-as
-samples /opt/perfsonar/services/geant2-java-as/WEB-INF
+build/geant2-java-as/* /usr/lib/perfsonar/services/geant2-java-as
+samples /usr/lib/perfsonar/services/geant2-java-as/WEB-INF

Modified: trunk/geant2_java-as/packaging/deb/postinst
===================================================================
--- trunk/geant2_java-as/packaging/deb/postinst 2008-09-30 13:24:42 UTC (rev 
4561)
+++ trunk/geant2_java-as/packaging/deb/postinst 2008-09-30 14:17:00 UTC (rev 
4562)
@@ -24,19 +24,19 @@
     then
       rm /var/lib/tomcat5.5/webapps/geant2-java-as
     fi 
-    ln -sf /opt/perfsonar/services/geant2-java-as /var/lib/tomcat5.5/webapps 
|| true
+    ln -sf /usr/lib/perfsonar/services/geant2-java-as 
/var/lib/tomcat5.5/webapps || true
     if [ -h /etc/geant2-java-as ]
     then
       rm /etc/geant2-java-as
     fi
-    ln -sf 
/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf 
/etc/geant2-java-as || true
+    ln -sf 
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf 
/etc/geant2-java-as || true
     if [ -h /var/log/geant2-java-as ]
     then
       rm /var/log/geant2-java-as
     fi
-    mkdir -p /opt/perfsonar/services/geant2-java-as/WEB-INF/log
-    ln -sf /opt/perfsonar/services/geant2-java-as/WEB-INF/log 
/var/log/geant2-java-as || true
-    chown -R tomcat55 /opt/perfsonar/services/geant2-java-as
+    mkdir -p /usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log
+    ln -sf /usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log 
/var/log/geant2-java-as || true
+    chown -R tomcat55 /usr/lib/perfsonar/services/geant2-java-as
     /etc/init.d/tomcat5.5 restart
     ;;
 

Modified: trunk/geant2_java-as/packaging/rpm/geant2-java-as.specs
===================================================================
--- trunk/geant2_java-as/packaging/rpm/geant2-java-as.specs     2008-09-30 
13:24:42 UTC (rev 4561)
+++ trunk/geant2_java-as/packaging/rpm/geant2-java-as.specs     2008-09-30 
14:17:00 UTC (rev 4562)
@@ -1,6 +1,6 @@
 
 # This is where all tomcat stuff will be installed
-%define prefix /opt/perfsonar/services/%{name}
+%define prefix /usr/lib/perfsonar/services/%{name}
 
 # The full name of your package.
 Name: geant2-java-as
@@ -10,7 +10,7 @@
 License: GPL
 
 # Package version. Increment if you create a new package of same microrelease
-Release: rc3
+Release: rc4
 
 # short description of the package
 Summary: perfSONAR Authentication and authorization Service