juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1563364 [1/3] - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ juddi-gui/ juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/ juddi-gui/src/main/resources/META-INF/ juddi-gui/src/main/webapp/ajax/ judd...
Date Sat, 01 Feb 2014 02:43:49 GMT
Author: alexoree
Date: Sat Feb  1 02:43:48 2014
New Revision: 1563364

URL: http://svn.apache.org/r1563364
Log:
JUDDI-828 applying the remaining patches, correcting some javadoc issues. fixing ssl warning on juddigui

Added:
    juddi/trunk/juddi-tomcat/web.xml
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/classes/
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/classes/schemas/
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/classes/schemas/jaxrs.xsd
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/classes/schemas/jaxws.xsd
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/classes/schemas/spring-beans.xsd
    juddi/trunk/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml
Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
    juddi/trunk/juddi-gui/readme.txt
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
    juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
    juddi/trunk/juddi-tomcat/build.xml
    juddi/trunk/juddi-tomcat/tomcat-users.xml
    juddi/trunk/juddiv3-war/README.txt
    juddi/trunk/juddiv3-war/pom.xml
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java Sat Feb  1 02:43:48 2014
@@ -48,7 +48,11 @@ public class UDDIClientSubscriptionListe
 	
 	private static final Log logger = LogFactory.getLog(UDDIClientSubscriptionListenerImpl.class);
 	private UDDIServiceCache serviceCache = null;
-	
+
+	public UDDIClientSubscriptionListenerImpl() {
+		super();
+	}	
+
 	public UDDIClientSubscriptionListenerImpl(String bindingKey, UDDIServiceCache serviceCache) {
 		super();
 		this.serviceCache = serviceCache;

Modified: juddi/trunk/juddi-gui/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/readme.txt?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/readme.txt (original)
+++ juddi/trunk/juddi-gui/readme.txt Sat Feb  1 02:43:48 2014
@@ -16,5 +16,5 @@ Build:
 3) Access
 	http://localhost:8080/juddi-gui
 4) Configure
-	Alter the contents of juddi-gui/META-INF/config.properties and juddi-gui/WEB-INF/classes/META-INF/uddi.xml as necessary.
+	Alter the contents of juddi-gui/WEB-INF/classes/META-INF/uddi.xml as necessary.
 	These can also be edited in browser via Settings > Config
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Sat Feb  1 02:43:48 2014
@@ -246,7 +246,7 @@ public class UddiHub implements Serializ
                                 return HandleException(ex);
                         }
                         if (session.getAttribute("username") != null
-                                && session.getAttribute("password") != null) {
+                             && session.getAttribute("password") != null) {
                                 req.setUserID((String) session.getAttribute("username"));
                                 req.setCred(AES.Decrypt((String) session.getAttribute("password"), (String) properties.get("key")));
                                 log.info("AUDIT: fetching auth token for " + req.getUserID() + " Auth Mode is " + ((security == null) ? "HTTP" : "AUTH_TOKEN"));
@@ -333,6 +333,10 @@ public class UddiHub implements Serializ
                                         log.warn("'UDDI_AUTH' is not defined in the config (" + PROP_AUTH_TYPE + ")! defaulting to UDDI_AUTH");
                                         style = AuthStyle.UDDI_AUTH;
                                 }
+//                                String newNodename = clientConfig.getConfiguration().getString(PROP_CONFIG_NODE);
+//                                if (newNodename != null && !newNodename.equals("")) {
+//                                        nodename = newNodename;
+//                                }
                                 if (nodename == null) {
                                         nodename = clientConfig.getConfiguration().getString(PROP_CONFIG_NODE);
                                 }
@@ -357,12 +361,14 @@ public class UddiHub implements Serializ
 
                                 if (WS_Transport) {
                                         if (uddiNode.getPublishUrl().toLowerCase().startsWith("https://")
-                                                && (uddiNode.getSecurityUrl() != null && uddiNode.getSecurityUrl().toLowerCase().startsWith("https://"))
-                                                && uddiNode.getInquiryUrl().toLowerCase().startsWith("https://")
-                                                && (uddiNode.getCustodyTransferUrl() != null && uddiNode.getCustodyTransferUrl().toLowerCase().startsWith("https://"))
-                                                && (uddiNode.getSubscriptionUrl() != null && uddiNode.getSubscriptionUrl().toLowerCase().startsWith("https://"))) {
+                                             && (uddiNode.getSecurityUrl() != null && uddiNode.getSecurityUrl().toLowerCase().startsWith("https://"))
+                                             && uddiNode.getInquiryUrl().toLowerCase().startsWith("https://")
+                                             && (uddiNode.getCustodyTransferUrl() != null && uddiNode.getCustodyTransferUrl().toLowerCase().startsWith("https://"))
+                                             && (uddiNode.getSubscriptionUrl() != null && uddiNode.getSubscriptionUrl().toLowerCase().startsWith("https://"))) {
                                                 WS_securePorts = true;
                                         }
+                                        else
+                                                WS_securePorts=false;
                                 }
                         } catch (Exception ex) {
                                 HandleException(ex);
@@ -564,7 +570,7 @@ public class UddiHub implements Serializ
                                 log.error(ex);
                         }
                         if (session != null && session.getAttribute("username") != null
-                                && session.getAttribute("password") != null) {
+                             && session.getAttribute("password") != null) {
                                 req.setUserID((String) session.getAttribute("username"));
                                 req.setCred(AES.Decrypt((String) session.getAttribute("password"), (String) properties.get("key")));
                                 log.info("AUDIT: fetching auth token for " + req.getUserID() + " Auth Mode is " + ((security == null) ? "HTTP" : "AUTH_TOKEN"));
@@ -706,12 +712,12 @@ public class UddiHub implements Serializ
                                 sb.append("<select id=\"businesslist\" multiple=\"multiple\" size=\"10\">");
                                 for (int i = 0; i < findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
                                         sb.append("<option class=\"transferable\" id=\"").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
-                                                append("\" title=\"").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
-                                                append("\">").
-                                                append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName()))).
-                                                append("</option>");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
+                                             append("\" title=\"").
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
+                                             append("\">").
+                                             append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName()))).
+                                             append("</option>");
                                 }
                                 sb.append("</select>");
                         }
@@ -719,12 +725,12 @@ public class UddiHub implements Serializ
                                 sb.append("<select id=\"tmodellist\" multiple=\"multiple\" size=\"10\">");
                                 for (int i = 0; i < findBusiness.getTModelInfos().getTModelInfo().size(); i++) {
                                         sb.append("<option  class=\"transferable\" id=\"").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
-                                                append("\" title=\"").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
-                                                append("\">").
-                                                append(StringEscapeUtils.escapeHtml((findBusiness.getTModelInfos().getTModelInfo().get(i).getName().getValue()))).
-                                                append("</option>");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
+                                             append("\" title=\"").
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
+                                             append("\">").
+                                             append(StringEscapeUtils.escapeHtml((findBusiness.getTModelInfos().getTModelInfo().get(i).getName().getValue()))).
+                                             append("</option>");
                                 }
                                 sb.append("</select>");
                         }
@@ -799,9 +805,9 @@ public class UddiHub implements Serializ
                 }
                 if (ex instanceof DispositionReportFaultMessage) {
                         DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
-                        if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) 
-                                || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED) 
-                                || ex.getMessage().toLowerCase().contains("expire")) {
+                        if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)
+                             || ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)
+                             || ex.getMessage().toLowerCase().contains("expire")) {
                                 return true;
                         }
                 }
@@ -862,8 +868,8 @@ public class UddiHub implements Serializ
                                         } else {
                                                 for (int k = 0; k < businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().size(); k++) {
                                                         sb.append("<div><a href=\"serviceEditor.jsp?id=").
-                                                                append(StringEscapeUtils.escapeHtml(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getServiceKey())).append("\">").
-                                                                append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getName()))).append("</a></div>");
+                                                             append(StringEscapeUtils.escapeHtml(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getServiceKey())).append("\">").
+                                                             append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getName()))).append("</a></div>");
                                                 }
                                         }
                                 }
@@ -1010,8 +1016,8 @@ public class UddiHub implements Serializ
                                 }
                         }
                         return ResourceLoader.GetResource(session, "actions.saved") + " "
-                                + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
-                                + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
+                             + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+                             + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
                 } catch (Exception ex) {
                         return HandleException(ex);
                 }
@@ -1043,8 +1049,8 @@ public class UddiHub implements Serializ
                         }
 
                         return ResourceLoader.GetResource(session, "actions.saved") + " "
-                                + "<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(saveBusiness.getBusinessEntity().get(0).getBusinessKey(), "UTF8")
-                                + "\">" + StringEscapeUtils.escapeHtml(saveBusiness.getBusinessEntity().get(0).getBusinessKey()) + "</a>";
+                             + "<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(saveBusiness.getBusinessEntity().get(0).getBusinessKey(), "UTF8")
+                             + "\">" + StringEscapeUtils.escapeHtml(saveBusiness.getBusinessEntity().get(0).getBusinessKey()) + "</a>";
                 } catch (Exception ex) {
                         return HandleException(ex);
                 }
@@ -1275,8 +1281,8 @@ public class UddiHub implements Serializ
                         st.getTModel().add(tm);
                         TModelDetail saveTModel = publish.saveTModel(st);
                         return "<div class=\"alert alert-success\"><i class=\"icon-2x icon-thumbs-up\"></i> " + ResourceLoader.GetResource(session, "messages.success") + " <a href=\"tmodelEditor.jsp?id="
-                                + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8") + "\">"
-                                + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a></div>";
+                             + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8") + "\">"
+                             + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a></div>";
                         // "Success";
                 } catch (Exception ex) {
                         return ToErrorAlert(HandleException(ex));
@@ -1311,7 +1317,7 @@ public class UddiHub implements Serializ
                         log.error("SOAP Fault returned: " + x.getMessage() + (x.getFault() != null ? x.getFault().getFaultString() : ""));
                         String err = null;
                         if (x.getFault() != null
-                                && x.getFault().getDetail() != null) {
+                             && x.getFault().getDetail() != null) {
                                 Iterator detailEntries = x.getFault().getDetail().getDetailEntries();
                                 while (detailEntries.hasNext()) {
                                         err += detailEntries.next().toString();
@@ -1652,8 +1658,8 @@ public class UddiHub implements Serializ
                                 for (int i = 0; i < findBusiness.getBindingTemplate().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append("<a href=\"serviceEditor.jsp?id=").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getServiceKey())).
-                                                append("\">");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getServiceKey())).
+                                             append("\">");
                                         if (findBusiness.getBindingTemplate().get(i).getDescription().isEmpty()) {
                                                 sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBindingTemplate().get(i).getBindingKey()));
                                         } else {
@@ -1743,8 +1749,8 @@ public class UddiHub implements Serializ
                                 for (int i = 0; i < findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append("<a href=\"businessEditor2.jsp?id=").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
-                                                append("\">");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
+                                             append("\">");
                                         if (findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName().isEmpty()) {
                                                 sb.append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey()));
                                         } else {
@@ -1800,8 +1806,8 @@ public class UddiHub implements Serializ
                                 for (int i = 0; i < findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append("<a href=\"businessEditor2.jsp?id=").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey())).
-                                                append("\">");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey())).
+                                             append("\">");
                                         if (findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getName().isEmpty()) {
                                                 sb.append(StringEscapeUtils.escapeHtml(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey()));
                                         } else {
@@ -1890,8 +1896,8 @@ public class UddiHub implements Serializ
                                 for (int i = 0; i < findBusiness.getServiceInfos().getServiceInfo().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append("<a href=\"serviceEditor.jsp?id=").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
-                                                append("\">");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
+                                             append("\">");
                                         if (findBusiness.getServiceInfos().getServiceInfo().get(i).getName().isEmpty()) {
                                                 sb.append(StringEscapeUtils.escapeHtml(findBusiness.getServiceInfos().getServiceInfo().get(i).getServiceKey()));
                                         } else {
@@ -1981,8 +1987,8 @@ public class UddiHub implements Serializ
                                 for (int i = 0; i < findBusiness.getTModelInfos().getTModelInfo().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append("<a href=\"tmodelEditor.jsp?id=").
-                                                append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
-                                                append("\">");
+                                             append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey())).
+                                             append("\">");
                                         if (findBusiness.getTModelInfos().getTModelInfo().get(i).getName() == null) {
                                                 sb.append(StringEscapeUtils.escapeHtml(findBusiness.getTModelInfos().getTModelInfo().get(i).getTModelKey()));
                                         } else {
@@ -2169,8 +2175,8 @@ public class UddiHub implements Serializ
                         }
                         //return ResourceLoader.GetResource(session, "actions.saved");
                         return ResourceLoader.GetResource(session, "actions.saved") + " "
-                                + "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
-                                + "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
+                             + "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
+                             + "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
                 } catch (Exception ex) {
                         return HandleException(ex);
                 }
@@ -2188,7 +2194,7 @@ public class UddiHub implements Serializ
                 TModel be = new TModel();
                 be.setTModelKey(request.getParameter(PostBackConstants.SERVICEKEY).trim());
                 if (be.getTModelKey() != null && (be.getTModelKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")))
-                        || be.getTModelKey().length() == 0) {
+                     || be.getTModelKey().length() == 0) {
                         be.setTModelKey(null);
                 }
                 be.setName(new Name());
@@ -2397,8 +2403,8 @@ public class UddiHub implements Serializ
                                 }
                         }
                         return ResourceLoader.GetResource(session, "messages.success")
-                                + " <a href=\"editSubscription.jsp?id=" + URLEncoder.encode(data.value.get(0).getSubscriptionKey(), "UTF8")
-                                + "\">" + StringEscapeUtils.escapeHtml(data.value.get(0).getSubscriptionKey()) + "</a>";
+                             + " <a href=\"editSubscription.jsp?id=" + URLEncoder.encode(data.value.get(0).getSubscriptionKey(), "UTF8")
+                             + "\">" + StringEscapeUtils.escapeHtml(data.value.get(0).getSubscriptionKey()) + "</a>";
                 } catch (Exception ex) {
                         return HandleException(ex);
                 }
@@ -2481,18 +2487,18 @@ public class UddiHub implements Serializ
                 if (info != null && !info.isEmpty()) {
                         sb.append("<table class=\"table table-hover\">");
                         sb.append("<tr><th>").
-                                append(ResourceLoader.GetResource(session, "items.nodeid")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.authorizedname")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.key")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.created")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.modified")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.modifiedwithchildren")).
-                                append("</th></tr>");
+                             append(ResourceLoader.GetResource(session, "items.nodeid")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.authorizedname")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.key")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.created")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.modified")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.modifiedwithchildren")).
+                             append("</th></tr>");
 
                         for (int i = 0; i < info.size(); i++) {
                                 if (info.get(i) == null) {
@@ -2500,17 +2506,17 @@ public class UddiHub implements Serializ
                                 }
                                 sb.append("<tr><td>");
                                 sb.append((info.get(i).getNodeID() != null ? StringEscapeUtils.escapeHtml(info.get(i).getNodeID()) : ""))
-                                        .append("</td><td>")
-                                        .append((info.get(i).getAuthorizedName() != null ? StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()) : ""))
-                                        .append("</td><td>")
-                                        .append((info.get(i).getEntityKey() != null ? StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()) : ""))
-                                        .append("</td><td>")
-                                        .append((info.get(i).getCreated() != null ? StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()) : ""))
-                                        .append("</td><td>")
-                                        .append((info.get(i).getModified() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()) : ""))
-                                        .append("</td><td>")
-                                        .append((info.get(i).getModifiedIncludingChildren() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()) : ""))
-                                        .append("</td></tr>");
+                                     .append("</td><td>")
+                                     .append((info.get(i).getAuthorizedName() != null ? StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()) : ""))
+                                     .append("</td><td>")
+                                     .append((info.get(i).getEntityKey() != null ? StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()) : ""))
+                                     .append("</td><td>")
+                                     .append((info.get(i).getCreated() != null ? StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()) : ""))
+                                     .append("</td><td>")
+                                     .append((info.get(i).getModified() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()) : ""))
+                                     .append("</td><td>")
+                                     .append((info.get(i).getModifiedIncludingChildren() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()) : ""))
+                                     .append("</td></tr>");
                         }
                         sb.append("</table>");
                 } else {
@@ -2808,7 +2814,7 @@ public class UddiHub implements Serializ
                                 //    subscriptionResults.getAssertionStatusReport().
                                 if (subscriptionResults.getAssertionStatusReport() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.assertion")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().size(); i++) {
                                                 sb.append("<tr><td>");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().get(i).getFromKey()));
@@ -2822,7 +2828,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getBindingDetail() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.bindings")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getBindingDetail().getBindingTemplate().size(); i++) {
                                                 sb.append("<tr><td>");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBindingDetail().getBindingTemplate().get(i).getServiceKey()));
@@ -2834,7 +2840,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getBusinessDetail() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.business")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getBusinessDetail().getBusinessEntity().size(); i++) {
                                                 sb.append("<tr><td><a href=\"businessEditor2.jsp?id=");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBusinessDetail().getBusinessEntity().get(i).getBusinessKey()));
@@ -2846,7 +2852,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getRelatedBusinessesList() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.assertion2")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         // for (int i = 0; i < subscriptionResults.getRelatedBusinessesList().getBusinessKey().size(); i++) {
                                         sb.append("<tr><td>");
                                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getRelatedBusinessesList().getBusinessKey()));
@@ -2856,7 +2862,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getServiceDetail() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.services")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getServiceDetail().getBusinessService().size(); i++) {
                                                 sb.append("<tr><td><a href=\"serviceEditor.jsp?id=");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceDetail().getBusinessService().get(i).getServiceKey()));
@@ -2868,7 +2874,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getServiceList() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.servicelist")).
-                                                append("<table class=\"table table-hover\">");
+                                             append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().size(); i++) {
                                                 sb.append("<tr><td>");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getServiceKey()));
@@ -2892,7 +2898,7 @@ public class UddiHub implements Serializ
                                 }
                                 if (subscriptionResults.getTModelList() != null) {
                                         sb.append(ResourceLoader.GetResource(session, "items.subscriptions.tmodels2"))
-                                                .append("<table class=\"table table-hover\">");
+                                             .append("<table class=\"table table-hover\">");
                                         for (int i = 0; i < subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().size(); i++) {
                                                 sb.append("<tr><td><a href=\"serviceEditor.jsp?id=");
                                                 sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().get(i).getTModelKey()));
@@ -2990,15 +2996,15 @@ public class UddiHub implements Serializ
 
                         StringBuilder sb = new StringBuilder();
                         sb.append("<table class=\"table\"><tr><th>").
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.business")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.service")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.bindingtemplate.key")).
-                                append("</th><th>").
-                                append(ResourceLoader.GetResource(session, "items.accesspoint.value")).
-                                append("</th></tr>");
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.business")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.service")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.bindingtemplate.key")).
+                             append("</th><th>").
+                             append(ResourceLoader.GetResource(session, "items.accesspoint.value")).
+                             append("</th></tr>");
 
                         for (int i = 0; i < serviceDetail.getBusinessService().size(); i++) {
                                 //   System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size());
@@ -3006,24 +3012,24 @@ public class UddiHub implements Serializ
                                         for (int k = 0; k < serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size(); k++) {
                                                 //System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue());
                                                 sb.append("<tr><td><input type=\"checkbox\" class=\"modalableBinding\" id=\"").
-                                                        append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
-                                                        append("\">").
-                                                        append("</td><td>").
-                                                        append("<a href=\"businessEditor2.jsp?id=").
-                                                        append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey())).
-                                                        append("\">").
-                                                        append(StringEscapeUtils.escapeHtml((findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()))).
-                                                        append("</a>").
-                                                        append("</td><td>").append("<a href=\"serviceEditor.jsp?id=").
-                                                        append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
-                                                        append("\" title=\"").
-                                                        append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
-                                                        append("\">").
-                                                        append(Printers.ListNamesToString(serviceDetail.getBusinessService().get(i).getName())).
-                                                        append("</a>").
-                                                        append("</td><td>").
-                                                        append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
-                                                        append("</td><td>");
+                                                     append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
+                                                     append("\">").
+                                                     append("</td><td>").
+                                                     append("<a href=\"businessEditor2.jsp?id=").
+                                                     append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey())).
+                                                     append("\">").
+                                                     append(StringEscapeUtils.escapeHtml((findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()))).
+                                                     append("</a>").
+                                                     append("</td><td>").append("<a href=\"serviceEditor.jsp?id=").
+                                                     append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
+                                                     append("\" title=\"").
+                                                     append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
+                                                     append("\">").
+                                                     append(Printers.ListNamesToString(serviceDetail.getBusinessService().get(i).getName())).
+                                                     append("</a>").
+                                                     append("</td><td>").
+                                                     append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
+                                                     append("</td><td>");
                                                 if (serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint() != null) {
                                                         sb.append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue()));
                                                 }

Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Sat Feb  1 02:43:48 2014
@@ -45,6 +45,8 @@ It currently does not use the ValueSet, 
             <node>
                 <name>jboss7</name> 
                 <description>UDDI node running on Jboss EAP6 or AS7</description>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
                 <!-- 
                 Jboss users, note that the url is typically different, here's an example for Jboss EAP 6.x-->
                 <custodyTransferUrl>http://localhost:8080/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
@@ -57,6 +59,8 @@ It currently does not use the ValueSet, 
              <node>
                 <name>jboss7-ssl</name> 
                 <description>Main UDDI node running on Jboss EAP6 or AS7</description>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
                 <!-- 
                 Jboss users, note that the url is typically different, here's an example for Jboss EAP 6.x-->
                 <custodyTransferUrl>https://localhost:8443/juddiv3/UDDICustodyTransferService</custodyTransferUrl>

Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp Sat Feb  1 02:43:48 2014
@@ -16,11 +16,19 @@
 <%  URL prop = application.getResource("/WEB-INF/config.properties");
         boolean ok = true;
         if (prop == null) { 
-                prop = application.getResource("WEB-INF/config.properties");
+                try {
+                        prop = application.getResource("WEB-INF/config.properties");
+                } catch (Exception e) {
+                        // ignore
+                }
 
         }
         if (prop == null) {
+                try {
                 prop = application.getResource("META-INF/config.properties");
+                } catch (Exception e) {
+                        // ignore
+                }
 
         }
         if (prop == null) {
@@ -72,4 +80,4 @@
         }
 
 
-%>
\ No newline at end of file
+%>

Modified: juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/build.xml?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/build.xml (original)
+++ juddi/trunk/juddi-tomcat/build.xml Sat Feb  1 02:43:48 2014
@@ -27,6 +27,7 @@
 		<copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/>
 		<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>
 		<copy file="${basedir}/keystore.jks" todir="${conf.dir}" overwrite="true"/>
+		<copy file="${basedir}/web.xml" todir="${conf.dir}" overwrite="true"/>
  		<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>

Modified: juddi/trunk/juddi-tomcat/tomcat-users.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/tomcat-users.xml?rev=1563364&r1=1563363&r2=1563364&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/tomcat-users.xml (original)
+++ juddi/trunk/juddi-tomcat/tomcat-users.xml Sat Feb  1 02:43:48 2014
@@ -39,6 +39,7 @@
     -   the juddi-gui configuration page http://localhost:8080/juddi-gui/settings.jsp
     
     -->
+	<role rolename="tomcat"/>
   <role rolename="uddiadmin"/>  
-  <user username="uddiadmin" password="da_password1" roles="uddiadmin" />
+  <user username="uddiadmin" password="da_password1" roles="uddiadmin,tomcat,manager" />
 </tomcat-users>



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


Mime
View raw message