Return-Path: 
 <commits-return-3274-apmail-juddi-commits-archive=juddi.apache.org@juddi.apache.org>
X-Original-To: apmail-juddi-commits-archive@www.apache.org
Delivered-To: apmail-juddi-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BC89D1072B
	for <apmail-juddi-commits-archive@www.apache.org>;
 Wed, 31 Jul 2013 23:48:26 +0000 (UTC)
Received: (qmail 22058 invoked by uid 500); 31 Jul 2013 23:48:26 -0000
Delivered-To: apmail-juddi-commits-archive@juddi.apache.org
Received: (qmail 22031 invoked by uid 500); 31 Jul 2013 23:48:26 -0000
Mailing-List: contact commits-help@juddi.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@juddi.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@juddi.apache.org>
List-Post: <mailto:commits@juddi.apache.org>
List-Id: <commits.juddi.apache.org>
Delivered-To: mailing list commits@juddi.apache.org
Received: (qmail 22022 invoked by uid 99); 31 Jul 2013 23:48:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Jul 2013 23:48:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Jul 2013 23:48:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8E755238889B;
	Wed, 31 Jul 2013 23:48:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1509052 - in /juddi/trunk:
 juddi-core/src/main/java/org/apache/juddi/config/
 juddi-gui/src/main/webapp/ juddiv3-war/src/main/webapp/admin/
Date: Wed, 31 Jul 2013 23:48:03 -0000
To: commits@juddi.apache.org
From: alexoree@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130731234803.8E755238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: alexoree
Date: Wed Jul 31 23:48:02 2013
New Revision: 1509052

URL: http://svn.apache.org/r1509052
Log:
JUDDI-607 added the ability to configure juddi via browser, adjusted the text to more accurate
JUDDI-579 tmodelEditor.jsp reformatted, no changes otherwise

Modified:
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
    juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
    juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp
    juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
    juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=1509052&r1=1509051&r2=1509052&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Wed Jul 31 23:48:02 2013
@@ -16,9 +16,13 @@
  */
 package org.apache.juddi.config;
 
+import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
@@ -61,6 +65,18 @@ public class AppConfig 
 	private Log log = LogFactory.getLog(AppConfig.class);
 	private Configuration config;
 	private static AppConfig instance=null;
+        private static URL loadedFrom=null;
+        
+        /**
+         * Enables an administrator to identify the physical location of the configuration file from which it was loaded.<br>
+         * Always call via the singleton function AppConfig.getInstance().getConfigFileURL()
+         * @since 3.2
+         * @return, may return null if no config file was found
+         */
+        public static  URL getConfigFileURL()
+        {
+            return loadedFrom;
+        }
 	
 	/**
 	 * Constructor (note Singleton pattern).
@@ -87,15 +103,25 @@ public class AppConfig 
 	        final String filename = System.getProperty(JUDDI_CONFIGURATION_FILE_SYSTEM_PROPERTY);
 		if (filename != null) {
                   propConfig = new XMLConfiguration (filename); 
-		//	propConfig = new PropertiesConfiguration(filename);
+                    try {
+                        loadedFrom = new File(filename).toURI().toURL();
+                    //	propConfig = new PropertiesConfiguration(filename);
+                    } catch (MalformedURLException ex) {
+                      try {
+                          loadedFrom = new URL("file://" + filename);
+                      } catch (MalformedURLException ex1) {
+                          log.warn("unable to get an absolute path to " + filename + ". This may be ignorable if everything works properly.", ex1);
+                      }
+                    }
 		} else {
 			//propConfig = new PropertiesConfiguration(JUDDI_PROPERTIES);
                     propConfig = new XMLConfiguration(JUDDI_PROPERTIES);
+                    loadedFrom = ClassUtil.getResource(JUDDI_PROPERTIES, this.getClass()); 
 		}
                 //Hey! this may break things
                 propConfig.setAutoSave(true);
-		URL url = ClassUtil.getResource(JUDDI_PROPERTIES, this.getClass()); 
-		log.info("Reading from properties file:  " + url);
+		
+		log.info("Reading from properties file:  " + loadedFrom);
 		long refreshDelay = propConfig.getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY, 1000l);
 		log.debug("Setting refreshDelay to " + refreshDelay);
 		FileChangedReloadingStrategy fileChangedReloadingStrategy = new FileChangedReloadingStrategy();

Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1509052&r1=1509051&r2=1509052&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Wed Jul 31 23:48:02 2013
@@ -60,42 +60,42 @@
 
                 <li><a href="#signatures"  id="sigtagheader"><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.signatures")%></a></li>
                 <li><a href="#Instances" >Instances</a></li>
-                
-                
+
+
             </ul>
             <script type="text/javascript">
-                $(function () {
+                $(function() {
                     $('#myTab').tab;//('show');
                 })
-                $('#myTab a[href=#general]').click(function (e) {
+                $('#myTab a[href=#general]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
-                $('#myTab a[href=#discovery]').click(function (e) {
+                $('#myTab a[href=#discovery]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
-                
-                $('#myTab a[href=#categories]').click(function (e) {
+
+                $('#myTab a[href=#categories]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
-                $('#myTab a[href=#identifiers]').click(function (e) {
+                $('#myTab a[href=#identifiers]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
 
-                $('#myTab a[href=#signatures]').click(function (e) {
+                $('#myTab a[href=#signatures]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
-                   $('#myTab a[href=#Instances]').click(function (e) {
+                $('#myTab a[href=#Instances]').click(function(e) {
                     e.preventDefault();
                     $(this).tab('show');
                 });
-                    
-                var currentDescriptionEntries=<%=bd.getDescription().size()%>;
-                var currentOverviewDocs=<%=bd.getOverviewDoc().size()%>;
+
+                var currentDescriptionEntries =<%=bd.getDescription().size()%>;
+                var currentOverviewDocs =<%=bd.getOverviewDoc().size()%>;
                 <%
                     int currentDescriptionSpecific = 0;
                     for (int i = 0; i < bd.getOverviewDoc().size(); i++) {
@@ -111,9 +111,9 @@
                         currentident = bd.getIdentifierBag().getKeyedReference().size();
                     }
                 %>
-                    var currentcatkeyref =<%=currentcatkeyref%>;
-                    var currentDescriptionSpecific=<%=currentDescriptionSpecific%>;
-                    var currentident=<%=currentident%>;
+                var currentcatkeyref =<%=currentcatkeyref%>;
+                var currentDescriptionSpecific =<%=currentDescriptionSpecific%>;
+                var currentident =<%=currentident%>;
             </script>
             <div class="tab-content">
                 <div class="tab-pane active" id="general">
@@ -190,35 +190,35 @@
 
                 <div class="tab-pane " id="discovery">
                     <a href="javascript:AddOverviewDocument();"><i class="icon-plus-sign icon-large"></i></a><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.overview")%> - <%=ResourceLoader.GetResource(session, "pages.editor.tabnav.overview.description")%>
-                    <%
-                        out.write("<div id=\"" + PostBackConstants.OVERVIEW + "\" style=\"border-width:2px; border-style:solid\">");
-                        for (int i = 0; i < bd.getOverviewDoc().size(); i++) {
-                            out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + "\" style=\"border-width:1px; border-style:solid\">");
-                            out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.OVERVIEW + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
-                            out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
-                                    + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getOverviewURL().getValue()) + "</div>");
-                            out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.type") + ":&nbsp;</div>"
-                                    + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.TYPE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getOverviewURL().getUseType()) + "</div>");
+                        <%
+                            out.write("<div id=\"" + PostBackConstants.OVERVIEW + "\" style=\"border-width:2px; border-style:solid\">");
+                            for (int i = 0; i < bd.getOverviewDoc().size(); i++) {
+                                out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + "\" style=\"border-width:1px; border-style:solid\">");
+                                out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.OVERVIEW + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+                                out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
+                                        + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getOverviewURL().getValue()) + "</div>");
+                                out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.type") + ":&nbsp;</div>"
+                                        + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.TYPE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getOverviewURL().getUseType()) + "</div>");
 
-                    %>
+                        %>
 
                     <a href="javascript:AddDescriptionSpecific('<%=PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION%>');"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.description.add")%>
-                    <%
-                            out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + "\" style=\"border-width:1px; border-style:dotted\">");
-                            for (int k = 0; k < bd.getOverviewDoc().get(i).getDescription().size(); k++) {
-                                out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + "\" style=\"border-width:1px; border-style:solid\">");
-                                out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + "');\"><i class=\"icon-trash\"></i></a></div>");
-                                out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
-                                        + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getDescription().get(k).getValue()) + "</div>");
-                                out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ":&nbsp;</div>"
-                                        + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + PostBackConstants.LANG + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getDescription().get(k).getLang()) + "</div>");
-                                out.write("</div>"); //end of this instance of overview doc description
+                        <%
+                                out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + "\" style=\"border-width:1px; border-style:dotted\">");
+                                for (int k = 0; k < bd.getOverviewDoc().get(i).getDescription().size(); k++) {
+                                    out.write("<div id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + "\" style=\"border-width:1px; border-style:solid\">");
+                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + "');\"><i class=\"icon-trash\"></i></a></div>");
+                                    out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
+                                            + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getDescription().get(k).getValue()) + "</div>");
+                                    out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ":&nbsp;</div>"
+                                            + "<div class=\"edit\" id=\"" + PostBackConstants.OVERVIEW + i + PostBackConstants.DESCRIPTION + k + PostBackConstants.LANG + "\">" + StringEscapeUtils.escapeHtml(bd.getOverviewDoc().get(i).getDescription().get(k).getLang()) + "</div>");
+                                    out.write("</div>"); //end of this instance of overview doc description
+                                }
+                                out.write("</div>");//end description
+                                out.write("</div>");//end this block
                             }
-                            out.write("</div>");//end description
-                            out.write("</div>");//end this block
-                        }
-                        out.write("</div>");//end of overview
-                    %>
+                            out.write("</div>");//end of overview
+%>
 
                 </div>
 
@@ -291,9 +291,9 @@
                                 out.write("</td><td><div id=\"digsig" + k + "\">" + ResourceLoader.GetResource(session, "items.loading") + "</div>");
                         %>
                         <script type="text/javascript">
-                            $.get("ajax/validateSignature.jsp?type=tmodel&id=<%=StringEscapeUtils.escapeJavaScript(bd.getTModelKey())%>", function(data){
+                            $.get("ajax/validateSignature.jsp?type=tmodel&id=<%=StringEscapeUtils.escapeJavaScript(bd.getTModelKey())%>", function(data) {
                                 $("#digsig<%=k%>").html(data);
-                                if (data.indexOf("invalid") !== -1 )
+                                if (data.indexOf("invalid") !== -1)
                                 {
                                     $("#sigtagheader").html($("#sigtagheader").html() + "<i class=\"icon-thumbs-down icon-large\" style=\"color:red\"></i>");
                                 }
@@ -301,7 +301,7 @@
                                 {
                                     $("#sigtagheader").html($("#sigtagheader").html() + "<i class=\"icon-thumbs-up icon-large\" style=\"color:green\"></i>");
                                 }
-                            } )
+                            })
                         </script>
                         <%
                                 out.write("</td></tr>");
@@ -312,106 +312,111 @@
                         }
                     %>
                 </div>
-				     <div class="tab-pane " id="Instances">
+                <div class="tab-pane " id="Instances">
                     <b>Instances</b> - Use this to search for other entities in this registery that reference this tModel<Br>
-					<select id="relatedSearches" onchange="search()">
-						<option></option>
-						<option value="business">Find businesses</option>
-						<option value="bindingTemplate">Find binding</option>
-						<option value="service">Find services</option>
-		<!--				<option value="tModel">Find tModels</option>-->
-					</select>
-                   <script type="text/javascript">
-					
-					  var offset=0;
-        var maxrecords=20;
-        function search()
-        {
-			var val = $("#relatedSearches").val();
-         
-            var selection = "tmodel";
-            
-            var searchfor = $("#relatedSearches").val();
-            
-            var searchcontent = "<%
-			if (bd.getTModelKey()!=null)
-				out.write(StringEscapeUtils.escapeJavaScript(bd.getTModelKey()));
-			%>";
-            
-            var url='ajax/search.jsp';
-            
-            var postbackdata = new Array();
-           
-            postbackdata.push({
-                name:"selection", 
-                value: selection
-            });
-            
-            postbackdata.push({
-                name:"searchcontent", 
-                value: searchcontent
-            });
-            
-            //postbackdata.push({
-                //name:"lang", 
-                //value: $("#lang").val()
-            //});
-            
-            
-            /*$.each($('input:checkbox'), function(index,item){
-                var itemname = item.name;
-                if (item.checked)
-                {
-                    postbackdata.push({
-                        name:"findqualifier", 
-                        value: itemname
-                    });
-                }
-            });
-            */
-            
-            postbackdata.push({
-                name:"searchfor", 
-                value: searchfor
-            });
-            
-            postbackdata.push({
-                name:"nonce", 
-                value: $("#nonce").val()
-            });
-            
-            var request=   $.ajax({
-                url: url,
-                type:"POST",
-                //  dataType: "html", 
-                cache: false, 
-                //  processData: false,f
-                data: postbackdata
-            });
-                
-                
-            request.done(function(msg) {
-                window.console && console.log('postback done '  + url);                
-        
-                $("#InstancesContainer").html(msg);
-                
-        
-            });
-
-            request.fail(function(jqXHR, textStatus) {
-                window.console && console.log('postback failed ' + url);                                
-                $("#InstancesContainer").html(jqXHR.responseText  + textStatus);
-                //$(".alert").alert();
-                
-        
-            });
-                                    
-        }
-		
-				   </script>
+                    <select id="relatedSearches" onchange="search()">
+                        <option></option>
+                        <option value="business">Find businesses</option>
+                        <option value="bindingTemplate">Find binding</option>
+                        <option value="service">Find services</option>
+                        <!--				<option value="tModel">Find tModels</option>-->
+                    </select>
+                    <script type="text/javascript">
+
+                            var offset = 0;
+                            var maxrecords = 20;
+                            function search()
+                            {
+                                var val = $("#relatedSearches").val();
+
+                                var selection = "tmodel";
+
+                                var searchfor = $("#relatedSearches").val();
+                                if (searchfor == "" || searchfor == null)
+                                {
+                                    $("#InstancesContainer").html("");
+                                    return;
+                                }
+                                var searchcontent = "<%
+                 if (bd.getTModelKey() != null) {
+                     out.write(StringEscapeUtils.escapeJavaScript(bd.getTModelKey()));
+                 }
+                        %>";
+
+                                var url = 'ajax/search.jsp';
+
+                                var postbackdata = new Array();
+
+                                postbackdata.push({
+                                    name: "selection",
+                                    value: selection
+                                });
+
+                                postbackdata.push({
+                                    name: "searchcontent",
+                                    value: searchcontent
+                                });
+
+                                //postbackdata.push({
+                                //name:"lang", 
+                                //value: $("#lang").val()
+                                //});
+
+
+                                /*$.each($('input:checkbox'), function(index,item){
+                                 var itemname = item.name;
+                                 if (item.checked)
+                                 {
+                                 postbackdata.push({
+                                 name:"findqualifier", 
+                                 value: itemname
+                                 });
+                                 }
+                                 });
+                                 */
+
+                                postbackdata.push({
+                                    name: "searchfor",
+                                    value: searchfor
+                                });
+
+                                postbackdata.push({
+                                    name: "nonce",
+                                    value: $("#nonce").val()
+                                });
+
+                                var request = $.ajax({
+                                    url: url,
+                                    type: "POST",
+                                    //  dataType: "html", 
+                                    cache: false,
+                                    //  processData: false,f
+                                    data: postbackdata
+                                });
+
+
+                                request.done(function(msg) {
+                                    window.console && console.log('postback done ' + url);
+
+                                    $("#InstancesContainer").html(msg);
+
+
+                                });
+
+                                request.fail(function(jqXHR, textStatus) {
+                                    window.console && console.log('postback failed ' + url);
+                                    $("#InstancesContainer").html(jqXHR.responseText + textStatus);
+                                    //$(".alert").alert();
+
+
+                                });
+
+                            }
+
+                    </script>
                     <div id="InstancesContainer" style="border-width: 2px; border-style: solid;" >
                         <%
-                           
+
                         %>
                     </div>
                 </div>
@@ -443,28 +448,28 @@
 
 
                 </div>
-                    
-                    
-               
-                    
+
+
+
+
             </div>
             <script src="js/tmodeledit.js"></script>
             <script src="js/businessEditor.js"></script>
             <script type="text/javascript">
-                Reedit();
+                            Reedit();
                 <%
                     if (!newitem) {
                 %>
-                
-                    function ViewAsXML()
-                    {
-                        $.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>&type=tmodel", function(data){
-                            window.console && console.log('asXml success');                
-                            $("#viewAsXmlContent").html(safe_tags_replace(data));
-                            $( "#viewAsXml" ).modal('show');
-                        });
-                       
-                    }
+
+                            function ViewAsXML()
+                            {
+                                $.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>&type=tmodel", function(data) {
+                                    window.console && console.log('asXml success');
+                                    $("#viewAsXmlContent").html(safe_tags_replace(data));
+                                    $("#viewAsXml").modal('show');
+                                });
+
+                            }
                 <%
                     }
                 %>

Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp?rev=1509052&r1=1509051&r2=1509052&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp Wed Jul 31 23:48:02 2013
@@ -24,18 +24,79 @@
 
 
         <div class="span12">
-            
-            <table class="table table-hover">
-                <tr><th>Field</th><th>Value</th></tr>
             <%
-                Iterator it = AppConfig.getConfiguration().getKeys();
-                while (it.hasNext()) {
-                    String key = (String) it.next();
-                    out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(key) + "\"><td>"+ StringEscapeUtils.escapeHtml(key) + "</td><td>" +
-                             StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getProperty(key).toString()) + "</td></tr>");
+                URL file = AppConfig.getInstance().getConfigFileURL();
+                if (file != null) {
+                    out.write("Loaded from: " + StringEscapeUtils.escapeHtml(file.toString()) + "<br>");
+                } else {
+                    out.write("Loaded from: (location unknown)<br>");
                 }
             %>
+            <table class="table table-hover">
+                <tr><th>Field</th><th>Value</th></tr>
+                        <%
+
+                            Iterator it = AppConfig.getConfiguration().getKeys();
+                            while (it.hasNext()) {
+                                String key = (String) it.next();
+                                if (!key.equalsIgnoreCase("nonce")) {
+                                    out.write("<tr ><td>" + StringEscapeUtils.escapeHtml(key) + "</td><td><div ");
+                                    if (key.startsWith("juddi.")) {
+                                        out.write(" id=\"" + StringEscapeUtils.escapeHtml(key) + "\" class=\"edit\"");
+                                    }
+                                    out.write(">" + StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getProperty(key).toString()) + "</div></td></tr>");
+                                }
+                            }
+                        %>
             </table>
+            <script type="text/javascript">
+                function save()
+                {
+                    alert("hi");
+                    var url = 'ajax/saveconfig.jsp';
+                    var postbackdata = new Array();
+                    $("div.edit").each(function()
+                    {
+                        var id = $(this).attr("id");
+                        var value = $(this).text();
+                        postbackdata.push({
+                            name: id,
+                            value: value
+                        });
+                    });
+                    postbackdata.push({
+                        name: "nonce",
+                        value: $("#nonce").val()
+                    });
+
+                    var request = $.ajax({
+                        url: url,
+                        type: "POST",
+                        //  data" + i18n_type + ": "html", 
+                        cache: false,
+                        //  processData: false,f
+                        data: postbackdata
+                    });
+
+
+                    request.done(function(msg) {
+                        window.console && console.log('postback done ' + url);
+
+                        $("#saveConfigresultBar").html(msg);
+
+
+                    });
+
+                    request.fail(function(jqXHR, textStatus) {
+                        window.console && console.log('postback failed ' + url);
+                        $("#saveConfigresultBar").html(jqXHR.responseText + textStatus);
+
+                    });
+                }
+                Reedit();
+            </script>
+            <a class="btn btn-primary" href="javascript:save();">Save</a><br><br>
+            <div id="saveConfigresultBar" class="well-small"></div>
         </div>
 
     </div>

Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp?rev=1509052&r1=1509051&r2=1509052&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp Wed Jul 31 23:48:02 2013
@@ -109,35 +109,10 @@
                         <a class="brand" href="home.jsp" style="padding-left:19px; padding-top:0px; padding-bottom:0px"><img src="img/logo2.png"></a>
                         <div class="nav-collapse collapse">
                             <ul class="nav">
-                                <li class="dropdown"><a href="home.jsp" data-toggle="dropdown" class="dropdowb-town"><i class="icon-home icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.home")%><b class="caret"></b></a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="reginfo.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></a></li>
-                                        <li><a href="assertions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></a></li>
-                                        <li><a href="transfer.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.transfer")%></a></li>
-                                        <li class="divider"></li>
-                                        <li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
-                                        <li><a href="editSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a></li>
-                                        <li><a href="subscriptionFeed.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed")%></a></li>
-                                    </ul>
-
+                                <li><a href="home.jsp" ><i class="icon-home icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
+                                <li><a href="status.jsp" ><i class="icon-compass icon-large"></i>Status<%//=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
+                                <li><a href="admin.jsp" ><i class="icon-cogs icon-large"></i>Admin<%//=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
 
-                                </li>
-                                
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-pencil icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.create")%><b class="caret"></b></a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="businessEditor2.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.business.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.business")%></a></li>
-                                        <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.service")%></a></li>
-                                        <li><a href="importFromWsdl.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></a></li>
-                                        <li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodel")%></a></li>
-                                        <li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen")%></a></li>
-                                    </ul>
-                                </li>
-
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-cog icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.settings")%><b class="caret"></b></a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="settings.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.settings.config.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.settings.config")%></a></li>
-                                    </ul>
-                                </li>
 
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-question-sign icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
                                     <ul class="dropdown-menu">

Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp?rev=1509052&r1=1509051&r2=1509052&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp Wed Jul 31 23:48:02 2013
@@ -21,17 +21,17 @@
 
         <div class="span4">
             <h2>Configure jUDDI</h2>
-            <p><%=ResourceLoader.GetResource(session, "index.browse")%></p>
+            <p><% //=ResourceLoader.GetResource(session, "index.config")%>Configure jUDDI</p>
             <p><a class="btn" href="configure.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
         </div>
         <div class="span4">
             <h2>Status and Statistics</h2>
-            <p><%=ResourceLoader.GetResource(session, "index.search")%></p>
+            <p><% //=ResourceLoader.GetResource(session, "index.search")%>Find out how busy jUDDI is.</p>
             <p><a class="btn" href="stats.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
         </div>
         <div class="span4">
             <h2>Administration</h2>
-            <p><%=ResourceLoader.GetResource(session, "index.learn")%></p>
+            <p><%//=ResourceLoader.GetResource(session, "index.learn")%>Administration options, such as deleting entities.</p>
             <p><a class="btn" href="admin.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
         </div>
 



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