You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/06/30 17:18:26 UTC

svn commit: r789789 - in /webservices/juddi/trunk: juddi-web-lean/src/main/webapp/happyjuddi.jsp juddi-web/src/main/webapp/happyjuddi.jsp

Author: tcunning
Date: Tue Jun 30 15:18:26 2009
New Revision: 789789

URL: http://svn.apache.org/viewvc?rev=789789&view=rev
Log:
JUDDI-221
Check null before escaping for XML.

Modified:
    webservices/juddi/trunk/juddi-web-lean/src/main/webapp/happyjuddi.jsp
    webservices/juddi/trunk/juddi-web/src/main/webapp/happyjuddi.jsp

Modified: webservices/juddi/trunk/juddi-web-lean/src/main/webapp/happyjuddi.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-web-lean/src/main/webapp/happyjuddi.jsp?rev=789789&r1=789788&r2=789789&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-web-lean/src/main/webapp/happyjuddi.jsp (original)
+++ webservices/juddi/trunk/juddi-web-lean/src/main/webapp/happyjuddi.jsp Tue Jun 30 15:18:26 2009
@@ -12,7 +12,8 @@
                  java.util.TreeSet,
                  javax.naming.Context,
                  javax.naming.InitialContext,
-                 javax.sql.DataSource,
+                 javax.sql.DataSource,
+		 org.apache.taglibs.standard.tag.common.core.Util,
                  org.apache.juddi.registry.RegistryServlet,
                  org.apache.juddi.registry.RegistryEngine"
 %>
@@ -169,11 +170,14 @@
 <h4>jUDDI Dependencies: Class Files &amp; Libraries</h4>
 <pre>
 <%
-     //creates the schema if not there
+    //creates the schema if not there
     RegistryEngine registry = RegistryServlet.getRegistry();
-    registry.init();
+    registry.init();
+    
     String[] classArray = {
       "org.apache.juddi.IRegistry",
+      "org.apache.axis.transport.http.AxisServlet",
+      "org.apache.commons.discovery.Resource",
       "org.apache.commons.logging.Log",
       "org.apache.log4j.Layout",
       "javax.xml.soap.SOAPMessage",
@@ -243,8 +247,11 @@
   try
   {
     dsname = request.getParameter("dsname");
-    if ((dsname == null) || (dsname.trim().length() == 0))
+    if ((dsname == null) || (dsname.trim().length() == 0)) {
       dsname = "java:comp/env/jdbc/juddiDB";
+    } else {
+      dsname = Util.escapeXml(dsname); 
+    }
     
     ctx = new InitialContext();
     if (ctx == null )

Modified: webservices/juddi/trunk/juddi-web/src/main/webapp/happyjuddi.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-web/src/main/webapp/happyjuddi.jsp?rev=789789&r1=789788&r2=789789&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-web/src/main/webapp/happyjuddi.jsp (original)
+++ webservices/juddi/trunk/juddi-web/src/main/webapp/happyjuddi.jsp Tue Jun 30 15:18:26 2009
@@ -246,9 +246,12 @@
   
   try
   {
-    dsname = Util.escapeXml(request.getParameter("dsname"));
-    if ((dsname == null) || (dsname.trim().length() == 0))
+    dsname = request.getParameter("dsname");
+    if ((dsname == null) || (dsname.trim().length() == 0)) {
       dsname = "java:comp/env/jdbc/juddiDB";
+    } else {
+      dsname = Util.escapeXml(dsname); 
+    }
     
     ctx = new InitialContext();
     if (ctx == null )



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org