[teiid-commits] teiid SVN: r605 - trunk/soap/src/main/webapp.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Mar 19 17:24:49 EDT 2009


Author: tejones
Date: 2009-03-19 17:24:49 -0400 (Thu, 19 Mar 2009)
New Revision: 605

Modified:
   trunk/soap/src/main/webapp/index.jsp
   trunk/soap/src/main/webapp/wsdlurlframe.htm
   trunk/soap/src/main/webapp/wsdlurlgen.jsp
   trunk/soap/src/main/webapp/wsdlurls.jsp
Log:
TEIID-422 - Changed HTTPServlet method signatures to reflect JDK 1.6 and update MM to JBEDSP.

Modified: trunk/soap/src/main/webapp/index.jsp
===================================================================
--- trunk/soap/src/main/webapp/index.jsp	2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/index.jsp	2009-03-19 21:24:49 UTC (rev 605)
@@ -1,8 +1,31 @@
 <%@ page import="com.metamatrix.common.util.WSDLServletUtil" %>
 
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
 <html>
 	<head>
-		<title>MetaMatrix Web Service Utilities</title>
+		<title>JBEDSP Web Service Utilities</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 		<style type="text/css">
 		<!--
@@ -34,26 +57,27 @@
   		<div align="center">
   		<p><table width="900" border="0" cellspacing="0" cellpadding="0">
   		  <tr bgcolor="#edf0f6">
-	  		  <td width="300">
-	  		  	<a href="http://www.redhat.com/metamatrix"><img src="images/mmlogo.gif" border="no" title=""></img></a>
+	  		  <td colspan="2" align="center">
+	  		  	<span class="MMSOAPTitle"><a href="http://www.jboss.com/products/platforms/dataservices/" target="_blank">JBoss Enterprise Data Services Platform (JBEDSP)</a></span>
 	  		  </td>
-	  		  <td width="600">
-	  		  	<span class="MMSOAPTitle">Web Service Utilities</span>
+	  	  </tr>
+	  	  <tr bgcolor="#edf0f6">
+	  		  <td colspan="2" align="center">
+	  		  	<span class="MMSOAPTitle">&nbsp;Web Service Utilities</span>
 	  		  </td>
   		  </tr>
   		   <tr>
 		      <td>&nbsp;<td>	
-		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td colspan="2" class="MMSOAPTitle"><b><u>MetaMatrix Web Service WSDL URL Generator</u></b><td>		      
+		      <td colspan="2" class="MMSOAPTitle"><b><u>JBEDSP Web Service WSDL URL Generator</u></b><td>		      
    		  </tr>
 	      <tr>
 		      <td>&nbsp;<td>	
 		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td colspan="2"><b>VDBs that contain Web Service models expose WSDL when deployed to a MetaMatrix Server that describes the web service operations in those models. This form can be used to generate a parameterized WSDL URL for such a VDB.</b><td>		      
+		      <td colspan="2"><b>VDBs that contain Web Service models expose WSDL when deployed to a JBEDSP Server that describes the web service operations in those models. This form can be used to generate a parameterized WSDL URL for such a VDB.</b><td>		      
 	      </tr>
 	      <tr>
 		      <td>&nbsp;<td>	
@@ -72,21 +96,21 @@
 		      <td>&nbsp;<td>	
 	      </tr>
 	      	      <tr>
-		      <td colspan="2" class="MMSOAPTitle"><b><u>Discover MetaMatrix Web Services</u></b><td>		      
+		      <td colspan="2" class="MMSOAPTitle"><b><u>Discover JBEDSP Web Services</u></b><td>		      
    		  </tr>
 	      <tr>
 		      <td>&nbsp;<td>	
 		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td colspan="2"><b>To auto discover web service VDB WSDL URLs using predefined MetaMatrix server values, the MetaMatrix Server or cluster of MetaMatrix servers must be defined in the web.xml file of the MetaMatrix SOAP web application. Also, the defined WSDL user needs to be assigned the Admin.ReadOnlyAdmin role. This WSDL URL is more concise than the parameterized version, but is only valid with MetaMatrix SOAP web applications were the MetaMatrix server values have been defined.</b><td>		      
+		      <td colspan="2"><b>To auto discover web service VDB WSDL URLs using predefined JBEDSP server values, the JBEDSP Server or cluster of JBEDSP servers must be defined in the web.xml file of the JBEDSP SOAP web application. This WSDL URL is more concise than the parameterized version, but is only valid with JBEDSP SOAP web applications were the JBEDSP server values have been defined.</b><td>		      
 	      </tr>
 	      <tr>
 		      <td>&nbsp;<td>	
 		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td><a href="<%= request.getContextpath() %>/servlet/DiscoverWSDLServlet" target="wsdlUrls" title="Discover MetaMatrix Web Services">Discover MetaMatrix Web Services</a><td>	
+		      <td><a href="<%= request.getContextPath() %>/servlet/DiscoverWSDLServlet" target="wsdlUrls" title="Discover MetaMatrix Web Services">Discover JBEDSP Web Services</a><td>	
 		      <td>&nbsp;<td>	
 	      </tr>
    	      <tr>
@@ -112,7 +136,7 @@
 		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), <%= request.getContextpath() %>, false) %>" title="SQL Query Web Service WSDL (Non-secure)">SQL Query Web Service WSDL (Non-secure)</a><td>	
+		      <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), request.getContextPath(), false) %>" title="SQL Query Web Service WSDL (Non-secure)">SQL Query Web Service WSDL (Non-secure)</a><td>	
    		      <td>&nbsp;<td>
 	      </tr>	      
 	      <tr>
@@ -120,7 +144,7 @@
 		      <td>&nbsp;<td>	
 	      </tr>
 	      <tr>
-		      <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), <%= request.getContextpath() %>, true) %>" title="SQL Query Web Service WSDL (Secure SSL)">SQL Query Web Service WSDL (Secure SSL)</a><td>	
+		      <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), request.getContextPath(), true) %>" title="SQL Query Web Service WSDL (Secure SSL)">SQL Query Web Service WSDL (Secure SSL)</a><td>	
    		      <td>&nbsp;<td>
 	      </tr>	      
 	      <tr>

Modified: trunk/soap/src/main/webapp/wsdlurlframe.htm
===================================================================
--- trunk/soap/src/main/webapp/wsdlurlframe.htm	2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurlframe.htm	2009-03-19 21:24:49 UTC (rev 605)
@@ -1,7 +1,29 @@
-<!--  Copyright (c) 2000-2005 MetaMatrix, Inc.  All rights reserved. -->
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
 <HTML>
 	<HEAD>
-		<TITLE>WSDL URL Generator</TITLE>
+		<TITLE>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URL Generator</TITLE>
 	</HEAD>
 <FRAMESET name="mainframeset"  rows="85%,*" framespacing="2" >
 	   	<FRAME name="form" src="wsdlurlgen.jsp" MARGINHEIGHT="3" frameborder="1">

Modified: trunk/soap/src/main/webapp/wsdlurlgen.jsp
===================================================================
--- trunk/soap/src/main/webapp/wsdlurlgen.jsp	2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurlgen.jsp	2009-03-19 21:24:49 UTC (rev 605)
@@ -4,17 +4,37 @@
 <%@ page import="javax.naming.InitialContext" %>
 <%@ page import="javax.naming.NamingException" %>
 <html>
-<%/*
-             * Copyright © 2000-2005 MetaMatrix, Inc.
-             * All rights reserved.
-             */
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
+<%
             String targetServer = request.getServerName();
             int targetPort = request.getServerPort();
             %>
 	<head>
 
 
-		<title>MetaMatrix WSDL URL Generator</title>
+		<title>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URL Generator</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 		<style type="text/css">
 		<!--
@@ -22,8 +42,13 @@
 				font-family: Arial, Helvetica, sans-serif;
 				font-size: 18pt;
 				font-style: normal;
-				font-weight: bold
-			}
+				font-weight: bold;
+				}
+				
+				a {
+				visited : #666699; link: #666699; active: #666699;
+				hover: #1E90FF; text-decoration: none; 
+				}			
 		-->
 		.required { font-family: Arial, Helvetica, sans-serif; font-size: 10pt; color: red; font-weight: bold; }
 		</style>
@@ -32,29 +57,30 @@
 	<body bgcolor="#FFFFFF">
   		<div align="center">
   		<p>
-  			<table width="900" border="0" cellspacing="0" cellpadding="0">
-  		   <tr bgcolor="#edf0f6">
-  		   <td width="300">
-  		   		<a href="http:metamatrix.com"><img src="images/mmlogo.gif" border="no"></img></a>
-  		   </td>
-  		   <td width="600">
-  		   		<span class="MMSOAPTitle">MetaMatrix WSDL URL Generator</span>
-  		   </td>
-  		   </tr>
+  		   <table width="900" border="0" cellspacing="0" cellpadding="0">
+	  		   <tr bgcolor="#edf0f6">
+		  		   <td align="center"><span class="MMSOAPTitle">
+		  		   		<a href="http://www.jboss.com/products/platforms/dataservices/" target="_blank">JBoss Enterprise Data Services Platform (JBEDSP)</a></span>
+		  		   </td>
+	  		   </tr>
+	  		   <tr bgcolor="#edf0f6">
+		  		   <td align="center"><span class="MMSOAPTitle"> WSDL URL Generator</span>
+		  		   </td>
+	  		   </tr>
   		   </table>
   		</p>
   		<p>&nbsp;</p>
-  		<form name="form" method="post" target="wsdlUrl" ACTION="<%= request.getContextpath() %>/servlet/WSDLURLGenerator">
-    		<p><b>MetaMatrix Server Information</b> (use commas to delimit multiple host:port combinations)</p>
+  		<form name="form" method="post" target="wsdlUrl" ACTION="<%= request.getContextPath() %>/servlet/WSDLURLGenerator">
+    		<p><b>JBEDSP Server Information</b> (use commas to delimit multiple host:port combinations)</p>
     		<table width="66%" border="0" cellspacing="0" cellpadding="0" bgcolor="#edf0f6">
       			<tr>
-      				<td width="48%"><b>MetaMatrix Server host:port</b><span class='required'>&nbsp;*</span> </td>
+      				<td width="48%"><b>JBEDSP Server host:port</b><span class='required'>&nbsp;*</span> </td>
       				<td width="52%">
         				<input type="text" name="MMServerHostAndPort" value="<mmServerHost>:<mmServerPort>" size="80">
       				</td>
     			</tr>
 			</table>
-  			<p><b>MetaMatrix VDB Information</b> </p>
+  			<p><b>JBEDSP VDB Information</b> </p>
   			<table width="25%" border="0" cellspacing="0" cellpadding="0" bgcolor="#edf0f6">
     			<tr>
       				<td width="54%">
@@ -88,7 +114,7 @@
 			      	</td>
 			    </tr>
 	    		<tr>
-      				<td width="48%"><b>Use Secure MetaMatrix Protocol (mms) </b><span class='required'>&nbsp;*</span></td>
+      				<td width="48%"><b>Use Secure JBEDSP Protocol (mms) </b><span class='required'>&nbsp;*</span></td>
       				<td width="52%">
         				<input type="checkbox" name="Secure" value="Secure">
       				</td>

Modified: trunk/soap/src/main/webapp/wsdlurls.jsp
===================================================================
--- trunk/soap/src/main/webapp/wsdlurls.jsp	2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurls.jsp	2009-03-19 21:24:49 UTC (rev 605)
@@ -2,12 +2,32 @@
 <%@ page import="com.metamatrix.soap.object.WSDLUrl"%>
 <%@ page import="java.util.List"%>
 <%@ page import="java.util.Iterator"%>
-
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
 <html>
 <%/*
-			 * Copyright © 2000-2008 MetaMatrix, Inc.
-			 * All rights reserved.
-			 */
+			 
 			List wsdlUrls = (List) session
 					.getAttribute(WSDLServletUtil.DISCOVERED_WSDL);
 
@@ -15,7 +35,7 @@
 <head>
 
 
-<title>MetaMatrix WSDL URLs for Active Deployed Web Service Virtual
+<title>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URLs for Active Deployed Web Service Virtual
 Databases</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <style type="text/css">
@@ -40,9 +60,8 @@
 <body bgcolor="#FFFFFF">
 <table width="900" border="0" cellspacing="1" cellpadding="1">
 	<tr bgcolor="#edf0f6">
-		<td width="300"><a href="http://www.redhat.com/metamatrix/"><img src="../images/mmlogo.gif"
-			border="no"></img></a></td>
-		<td width="600"><span class="MMSOAPTitle">MetaMatrix Active Web Service VDB
+		<td width="300"><span class="MMSOAPTitle"><a href="http://www.jboss.com/products/platforms/dataservices/">JBEDSP</a></td>
+		<td width="600">JBEDSP Active Web Service VDB
 		URLs</span></td>
 	</tr>
 	<tr>




More information about the teiid-commits mailing list