You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/06 04:09:21 UTC
svn commit: r1555650 - in /juddi/trunk: juddi-tck-runner/pom.xml
juddiv3-war/src/main/webapp/admin/stats.jsp
Author: alexoree
Date: Mon Jan 6 03:09:18 2014
New Revision: 1555650
URL: http://svn.apache.org/r1555650
Log:
JUDDI-771 fixed
Modified:
juddi/trunk/juddi-tck-runner/pom.xml
juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
Modified: juddi/trunk/juddi-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tck-runner/pom.xml?rev=1555650&r1=1555649&r2=1555650&view=diff
==============================================================================
--- juddi/trunk/juddi-tck-runner/pom.xml (original)
+++ juddi/trunk/juddi-tck-runner/pom.xml Mon Jan 6 03:09:18 2014
@@ -10,7 +10,7 @@
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-tck-runner</artifactId>
<version>3.2-SNAPSHOT</version>
- <name>juddi-tck-runner</name>
+ <name>UDDI TCK Test Runner</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp?rev=1555650&r1=1555649&r2=1555650&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp Mon Jan 6 03:09:18 2014
@@ -5,6 +5,12 @@
--%>
+<%@page import="javax.persistence.EntityTransaction"%>
+<%@page import="org.uddi.api_v3.BusinessEntity"%>
+<%@page import="org.apache.juddi.config.Property"%>
+<%@page import="org.apache.juddi.config.AppConfig"%>
+<%@page import="javax.persistence.EntityManager"%>
+<%@page import="org.apache.juddi.config.PersistenceManager"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="org.apache.juddi.servlets.RegistryServlet"%>
<%@page import="java.util.SortedSet"%>
@@ -265,83 +271,29 @@
<h4>jUDDI DataSource Validation</h4>
<pre><%
- String dsname = null;
- Context ctx = null;
- DataSource ds = null;
- Connection conn = null;
- String sql = "SELECT COUNT(*) FROM PUBLISHER";
-
- try {
- dsname = request.getParameter("dsname");
-
- if ((dsname == null) || (dsname.trim().length() == 0)) {
- dsname = "java:comp/env/jdbc/juddiDB";
- } else {
- dsname = StringEscapeUtils.escapeXml(dsname);
- }
-
- ctx = new InitialContext();
- if (ctx == null) {
- throw new Exception("No Context");
- }
-
- out.print("<font color=\"green\">");
- out.print("+ Got a JNDI Context!");
- out.println("</font>");
- } catch (Exception ex) {
- out.print("<font color=\"red\">");
- out.print("- No JNDI Context (" + ex.getMessage() + ")");
- out.println("</font>");
- }
-
+ boolean success=false;
+ EntityManager em= PersistenceManager.getEntityManager();
+ EntityTransaction tx= em.getTransaction();
try {
- Context envContext = (Context)ctx.lookup("java:/comp/env");
- ds = (DataSource)envContext.lookup("jdbc/juddiDB");
-
- if (ds == null) {
- throw new Exception("No Context");
- }
-
- out.print("<font color=\"green\">");
- out.print("+ Got a JDBC DataSource (dsname=" + dsname + ")");
- out.println("</font>");
+ tx.begin();
+ String rootBusiness = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ROOT_BUSINESS);
+ org.apache.juddi.model.BusinessEntity biz= em.find(org.apache.juddi.model.BusinessEntity.class, rootBusiness);
+ if (biz!=null)
+ success=true;
+ tx.commit();
} catch (Exception ex) {
out.print("<font color=\"red\">");
- out.print("- No '" + dsname + "' DataSource Located(" + ex.getMessage() + ")");
+ out.print("- Root business lookup failed <i class=\"icon-thumbs-down icon-2x\"> (" + ex.getMessage() + ") ");
out.println("</font>");
}
-
- try {
- conn = ds.getConnection();
- if (conn == null) {
- throw new Exception("No Connection (conn=null)");
- }
-
- out.print("<font color=\"green\">");
- out.print("+ Got a JDBC Connection!");
- out.println("</font>");
- } catch (Exception ex) {
- out.print("<font color=\"red\">");
- out.print("- DB connection was not acquired. (" + ex.getMessage() + ")");
- out.println("</font>");
+ finally{
+ if (tx.isActive())
+ tx.rollback();
+ em.close();
}
- try {
- Statement stmt = conn.createStatement();
- ResultSet rs = stmt.executeQuery(sql);
-
- out.print("<font color=\"green\">");
- out.print("+ " + sql + " = ");
- if (rs.next()) {
- out.print(rs.getString(1));
- }
- out.println("</font>");
-
- conn.close();
- } catch (Exception ex) {
- out.print("<font color=\"red\">");
- out.print("- " + sql + " failed (" + ex.getMessage() + ")");
- out.println("</font>");
+ if (success){
+ out.write("<font color=\"green\">Data source is valid and online! <i class=\"icon-thumbs-up icon-2x\"></i></font><br>");
}
%></pre>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org