perfsonar-dev - perfsonar: r3264 - in branches/testing/edugained-test-tool: WebContent/WEB-INF dist src/es/rediris/perfsonar
Subject: perfsonar development work
List archive
perfsonar: r3264 - in branches/testing/edugained-test-tool: WebContent/WEB-INF dist src/es/rediris/perfsonar
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3264 - in branches/testing/edugained-test-tool: WebContent/WEB-INF dist src/es/rediris/perfsonar
- Date: Thu, 24 Jan 2008 10:22:20 -0500
Author: rodriguez
Date: 2008-01-24 10:22:18 -0500 (Thu, 24 Jan 2008)
New Revision: 3264
Added:
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest_ACUbC.java
Modified:
branches/testing/edugained-test-tool/WebContent/WEB-INF/web.xml
branches/testing/edugained-test-tool/dist/TestTool.war
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest.java
Log:
New version
Modified: branches/testing/edugained-test-tool/WebContent/WEB-INF/web.xml
===================================================================
--- branches/testing/edugained-test-tool/WebContent/WEB-INF/web.xml
2008-01-24 09:00:16 UTC (rev 3263)
+++ branches/testing/edugained-test-tool/WebContent/WEB-INF/web.xml
2008-01-24 15:22:18 UTC (rev 3264)
@@ -9,6 +9,47 @@
</display-name>
<servlet>
<description>A perfSONAR client test tool</description>
+ <display-name>EduGAINed_ASTest_ACUbC</display-name>
+ <servlet-name>EduGAINed_ASTest_ACUbC</servlet-name>
+ <servlet-class>
+ es.rediris.perfsonar.EduGAINed_ASTest_ACUbC
+ </servlet-class>
+ <init-param>
+ <param-name>endPoint</param-name>
+
<param-value>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</param-value>
+ </init-param>
+ <init-param>
+ <param-name>queryFile</param-name>
+
<param-value>/WEB-INF/data/AuthNRequest.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>privateKey</param-name>
+
<param-value>/WEB-INF/data/test-eduGAIN.key</param-value>
+ </init-param>
+ <init-param>
+ <param-name>publicKey</param-name>
+
<param-value>/WEB-INF/data/test-eduGAIN.pem</param-value>
+ </init-param>
+ <init-param>
+ <param-name>componentId</param-name>
+ <param-value>
+ urn:geant:edugain:component:filter:jra3:BoD
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>componentId_pSR</param-name>
+ <param-value>
+ urn:geant:edugain:component:filter:jra3:BoD
+ </param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>EduGAINed_ASTest_ACUbC</servlet-name>
+ <url-pattern>/eduGAINed_ASTest_ACUbC</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <description>A perfSONAR client test tool</description>
<display-name>EduGAINed_ClientTest</display-name>
<servlet-name>EduGAINed_ClientTest</servlet-name>
<servlet-class>
@@ -16,7 +57,7 @@
</servlet-class>
<init-param>
<param-name>endPoint</param-name>
-
<param-value>http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2.1/services/TelnetSSH,http://selena.acad.bg:8070/axis/services/LookupService</param-value>
+
<param-value>http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2.1/services/TelnetSSH,http://selena.acad.bg:8070/axis/services/LookupService,http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</param-value>
</init-param>
</servlet>
<servlet-mapping>
Modified: branches/testing/edugained-test-tool/dist/TestTool.war
===================================================================
(Binary files differ)
Modified:
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest.java
===================================================================
---
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest.java
2008-01-24 09:00:16 UTC (rev 3263)
+++
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest.java
2008-01-24 15:22:18 UTC (rev 3264)
@@ -37,6 +37,7 @@
import org.apache.axis.message.SOAPBodyElement;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.utils.XMLUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.ws.security.util.Base64;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -196,8 +197,14 @@
SOAPEnvelope envelope=(SOAPEnvelope)reqRaw;
SOAPHeader header=envelope.getHeader();
showBox(writer, "SOAP Header for AC & UbC profiles",
formatDocument(new DOMSource(header)), true);
+
Document wssDoc =
((org.apache.axis.message.SOAPEnvelope)envelope).getAsDocument();
- showBox(writer, "SOAP Envelope for AC & UbC profiles",
formatDocument(wssDoc), true);
+ String info=XMLUtils.DocumentToString(wssDoc);
+ writer.println("<div><h3>SOAP Envelope for AC and UbC
profiles:</h3></div>");
+ String data=StringEscapeUtils.escapeXml(info);
+ data=data.replaceAll("\n", "<br />");
+ data=data.replaceAll(" ", " ");
+ writer.println("<div class='infoXML'>"+data+"</div>");
} catch (Exception e) {
writer.println("<div><h3>ERROR:</h3></div>");
writer.println("<div
class='infoXML'>"+e.toString()+"</div>");
@@ -217,14 +224,20 @@
SOAPEnvelope envelopeSAML =
(SOAPEnvelope)samldata.addSAMLSTInMessage(requestMessage,
authStatementAssertion, getPrivateKey(), listCerts, cID, cID_pSR);
SOAPHeader header=envelopeSAML.getHeader();
showBox(writer, "SOAP Header for WE profile", formatDocument(new
DOMSource(header)), true);
+
Document wssDoc2 =
((org.apache.axis.message.SOAPEnvelope)envelopeSAML).getAsDocument();
- showBox(writer, "SOAP Query for WE profile",
formatDocument(wssDoc2), true);
+ String info=XMLUtils.DocumentToString(wssDoc2);
+ writer.println("<div><h3>SOAP Envelope for WE
profile:</h3></div>");
+ String data=StringEscapeUtils.escapeXml(info);
+ data=data.replaceAll("\n", "<br />");
+ data=data.replaceAll(" ", " ");
+ writer.println("<div class='infoXML'>"+data+"</div>");
} catch (Exception e) {
writer.println("<div><h3>ERROR:</h3></div>");
writer.println("<div
class='infoXML'>"+e.toString()+"</div>");
e.printStackTrace();
}
- }
+ }
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
response.setContentType("text/html");
Added:
branches/testing/edugained-test-tool/src/es/rediris/perfsonar/EduGAINed_ASTest_ACUbC.java
- perfsonar: r3264 - in branches/testing/edugained-test-tool: WebContent/WEB-INF dist src/es/rediris/perfsonar, svnlog, 01/24/2008
Archive powered by MHonArc 2.6.16.