Author: alexoree
Date: Wed Nov  6 03:43:23 2013
New Revision: 1539229

URL: http://svn.apache.org/r1539229
Log:
JUDDI-692 fixed a number of i28n issues on the editor(s)
JUDDI-693 autoLogoutModal.jsp added, added more config.properties settings to 
turn feature on and off, done
JUDDI-694 done

Added:
    juddi/trunk/juddi-gui/src/main/webapp/autoLogoutModal.jsp
    juddi/trunk/juddi-gui/src/main/webapp/logoutredir.jsp
      - copied, changed from r1534826, 
juddi/trunk/juddi-gui/src/main/webapp/logout.jsp
Modified:
    juddi/trunk/juddi-gui/pom.xml
    
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/resources/org/apache/juddi/webconsole/resources/web.properties
    
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
    juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
    juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
    juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
    juddi/trunk/juddi-gui/src/main/webapp/index.jsp
    juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
    juddi/trunk/juddi-gui/src/main/webapp/js/main.js
    juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js
    juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js
    juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
    juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp
    juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp

Modified: juddi/trunk/juddi-gui/pom.xml
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/pom.xml?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/pom.xml (original)
+++ juddi/trunk/juddi-gui/pom.xml Wed Nov  6 03:43:23 2013
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * Copyright 2001-2009 The Apache Software Foundation. * * Licensed under 
-       the Apache License, Version 2.0 (the "License"); * you may not use this 
file 
-       except in compliance with the License. * You may obtain a copy of the 
License 
-       at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required 
by 
-       applicable law or agreed to in writing, software * distributed under 
the 
-       License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR 
CONDITIONS 
-       OF ANY KIND, either express or implied. * See the License for the 
specific 
-       language governing permissions and * limitations under the License. * 
*/ -->
+the Apache License, Version 2.0 (the "License"); * you may not use this file 
+except in compliance with the License. * You may obtain a copy of the License 
+at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by 
+applicable law or agreed to in writing, software * distributed under the 
+License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS 
+OF ANY KIND, either express or implied. * See the License for the specific 
+language governing permissions and * limitations under the License. * */ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.apache.juddi</groupId>
-               <artifactId>juddi-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>juddi-gui-war</artifactId>
-       <packaging>war</packaging>
-       <name>jUDDI GUI WAR construction</name>
-       <url>http://juddi.apache.org</url>
-       <dependencies>
-               <dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>juddi-gui-war</artifactId>
+    <packaging>war</packaging>
+    <name>jUDDI GUI WAR construction</name>
+    <url>http://juddi.apache.org</url>
+    <dependencies>
+        <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi-client</artifactId>
             <version>3.2.0-SNAPSHOT</version>
@@ -31,34 +31,34 @@
             <classifier>jar-with-dependencies</classifier>
             <scope>provided</scope>
         </dependency>
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.9</version>
-               </dependency>
-                    <dependency>
-       <groupId>org.apache.commons</groupId>
-       <artifactId>commons-lang3</artifactId>
-       <version>3.1</version>
-</dependency>
-<dependency>
-         <groupId>commons-collections</groupId>
-         <artifactId>commons-collections</artifactId>
-         <version>3.2</version>
-        </dependency>
-            <dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${cxf.version}</version>
@@ -79,9 +79,9 @@
             <artifactId>cglib-nodep</artifactId>
             <version>2.1_3</version>
         </dependency>
-       </dependencies>
-       <build>
-               <finalName>juddi-gui</finalName>
+    </dependencies>
+    <build>
+        <finalName>juddi-gui</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -109,6 +109,26 @@
                     </execution>
                 </executions>
             </plugin>
+                       
+                       <!-- precompile the jsp files for speed and error 
catching at build time -->
+                       <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-jspc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile-jsp</id>
+                        <goals>
+                            <goal>jspc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                               <configuration>
+                                       
<sourceDirectory>${project.build.directory}/juddi-gui</sourceDirectory>
+                                       
<outputDirectory>${project.build.directory}/juddi-gui-precompiled</outputDirectory>
+                               </configuration>
+            </plugin>
+                       
+                       
         </plugins>
-   </build>
+    </build>
 </project>

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=1539229&r1=1539228&r2=1539229&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
 Wed Nov  6 03:43:23 2013
@@ -18,6 +18,7 @@ package org.apache.juddi.webconsole.hub;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URISyntaxException;
@@ -80,7 +81,7 @@ import sun.misc.BASE64Encoder;
  *
  * @author <a href="mailto:[email protected]";>Alex O'Ree</a>
  */
-public class UddiHub {
+public class UddiHub implements Serializable{
 
     /**
      * The logger name
@@ -971,25 +972,15 @@ public class UddiHub {
     public enum AuthStyle {
 
         /**
-         * Http Basic
+         * Http 
          */
-        HTTP_BASIC,
-        /**
-         * Http Digest
-         */
-        HTTP_DIGEST,
-        /**
-         * HTTP NTLM
-         */
-        HTTP_NTLM,
+        HTTP,
+        
         /**
          * UDDI Authentication via the Security API
          */
-        UDDI_AUTH,
-        /**
-         * HTTP Client Certificate Authentication
-         */
-        HTTP_CLIENT_CERT
+        UDDI_AUTH
+        
     }
 
     /**
@@ -3674,6 +3665,39 @@ public class UddiHub {
     }
     
     public static final String PROP_AUTH_TYPE="config.props.authtype";
+    public static final String 
PROP_AUTO_LOGOUT="config.props.enableAutomaticLogouts";
+    public static final String 
PROP_AUTO_LOGOUT_TIMER="config.props.enableAutomaticLogouts.duration";
     public static final String PROP_PREFIX="config.props.";
     
+    /**
+     * returns true if automatic logouts are configured
+     * @return 
+     */
+    public boolean isAutoLogoutEnabled(){
+        String val=properties.getProperty(PROP_AUTO_LOGOUT);
+        if (val==null)
+            return false;
+        try{
+            return Boolean.parseBoolean(val);
+        }catch (Exception ex){
+            log.warn("unable to parse the value for " + PROP_AUTO_LOGOUT + " 
in config.properties, defaulting to false",ex);
+        }
+        return false;
+    }
+    
+    /**
+     * defaults to 15 minutes if not defined
+     * @return 
+     */
+    public long GetAutoLogoutDuration(){
+        String val=properties.getProperty(PROP_AUTO_LOGOUT_TIMER);
+        if (val==null)
+            return 15 * 60 * 1000;
+        try{
+            return Long.parseLong(val);
+        }catch (Exception ex){
+            log.warn("unable to parse the value for " + PROP_AUTO_LOGOUT_TIMER 
+ " in config.properties, defaulting to 15 minutes",ex);
+        }
+        return 15 * 60 * 1000;
+    }
 }

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=1539229&r1=1539228&r2=1539229&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 Wed Nov  6 
03:43:23 2013
@@ -7,15 +7,6 @@
             <node>
                 <!-- required 'default' node -->
                 <name>default</name> 
-                <properties>
-                    <property name="serverName" value="localhost"/>
-                    <property name="serverPort" value="8080"/>
-                                       <!-- for UDDI nodes that use HTTP u/p, 
using the following 
-                                       <property name="basicAuthUsername" 
value="root" />
-                                       <property name="basicAuthPassword" 
value="password" />
-                                       <property 
name="basicAuthPasswordIsEncrypted" value="false" />
-                                       <property 
name="basicAuthPasswordCryptoProvider" 
value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-                </properties>
                 <description>Main jUDDI node</description>
                 <!-- JAX-WS Transport -->
                 
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>

Modified: 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
 (original)
+++ 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
 Wed Nov  6 03:43:23 2013
@@ -360,3 +360,13 @@ items.publisherassertion.add.fromkey=Fro
 items.publisherassertion.add.keyname=Key Name
 items.publisherassertion.add.keyvalue=Key Value
 pages.settings.loading=Loading from 
+pages.session.expire=Hey! You've been inactive for a while and are about to be 
kicked out!
+pages.editor.tmodel.instances=Instances
+pages.editor.tmodel.deleted=Is this tModel Deleted? (not available for future 
use).
+pages.signatures.signedby=Signed By
+pages.signatures.status=Signature Status
+pages.editor.tmodel.instances.content=Use this to search for other entities in 
this registery that reference this tModel
+pages.editor.tmodel.search.business=Find Businesses
+pages.editor.tmodel.search.binding=Find binding
+pages.editor.tmodel.search.services=Find services
+pages.settings.accessdenied.remote=This is only accessible from the server 
hosting juddi-gui. sorry!

Modified: 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
 (original)
+++ 
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
 Wed Nov  6 03:43:23 2013
@@ -362,3 +362,13 @@ items.publisherassertion.add.fromkey=Des
 items.publisherassertion.add.keyname=Nombre de clave
 items.publisherassertion.add.keyvalue=Clave Valor
 pages.settings.loading=Carga desde
+pages.session.expire=\u00a1Atenci\u00f3n! Usted ha estado inactivo por un 
tiempo y est\u00e1 a punto de ser expulsado!
+pages.editor.tmodel.instances=Instancias
+pages.editor.tmodel.deleted=Se elimina este tModel? (no disponible en el 
futuro).
+pages.signatures.signedby=Firmado por
+pages.signatures.status=Estado de la firma
+pages.editor.tmodel.instances.content=Utilice esta opci\u00f3n para buscar 
otras entidades en este registery que hacen referencia a esta tModel
+pages.editor.tmodel.search.business=Buscar Negocios
+pages.editor.tmodel.search.binding=Buscar vinculante
+pages.editor.tmodel.search.services=Buscar Servicios
+pages.settings.accessdenied.remote=Esto s\u00f3lo es accesible desde el 
servidor que aloja jUDDI-gui. lo siento!

Modified: juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties Wed Nov  6 
03:43:23 2013
@@ -1,7 +1,10 @@
 
 #required. if this uddi client is connected to uddi services that use the auth 
token, then set to UDDI_AUTH
-#if not, set authtype to HTTP_BASIC (even if its digest or NTLM, it's all 
handled the same way)
+#if not, set authtype to HTTP
 config.props.authtype=UDDI_AUTH
 
-#future use
-#config.props.enableAutomaticLogouts=false
\ No newline at end of file
+#enables automatic logout timer, defaults to false if not defined
+config.props.enableAutomaticLogouts=true
+
+#defines the duration of time to wait for the automatic logout, defaults to 
15min if not defined
+config.props.enableAutomaticLogouts.duration=900000
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Wed Nov  6 03:43:23 
2013
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
+
+    <display-name>jUDDI Graphical User Interface (juddi-gui)</display-name>
+    <description>This is an end user web application for an implementation of 
OASIS's UDDI v3 specification</description>
+    <distributable />
+    
     <listener>
         <!-- this class setups the encryption key for the session-->
         
<listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
@@ -17,6 +22,7 @@
         <extension>woff</extension>
         <mime-type>application/x-font-woff</mime-type>
     </mime-mapping>    
+    
     <!--<error-page>
          <description>Missing login</description> 
         <error-code>401</error-code>
@@ -37,7 +43,9 @@
         <error-code>503</error-code>
         <location>/error.jsp</location>
     </error-page>
+
     
+        
     <security-constraint>
         <display-name>jUDDI Admin content</display-name>
         <web-resource-collection>

Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp Wed Nov  6 03:43:23 
2013
@@ -4,60 +4,62 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="java.io.File"%>
 <%@page import="java.io.FileOutputStream"%>
 <%@page import="java.util.Properties"%>
 <%@page import="java.util.Enumeration"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@include  file="../csrf.jsp" %>
-<%    
-    if (!request.getRemoteHost().equalsIgnoreCase("localhost") && 
!request.getRemoteHost().equalsIgnoreCase("127.0.0.1")) {
-        out.write("This is only accessible from the server hosting juddi-gui. 
sorry!")
+<%
+    if (!request.getRemoteAddr().equalsIgnoreCase("localhost") && 
!request.getRemoteHost().equalsIgnoreCase("127.0.0.1")) {
+        out.write(ResourceLoader.GetResource(session, 
"pages.settings.accessdenied.remote"));
+        UddiHub.log.warn("Audit: Attempt to alter configuration remotely from 
" + 
+                request.getRemoteAddr() + " " +
+                request.getRemoteHost() + " " + 
+                request.getRemoteUser());
         response.setStatus(403);
-    }
-    if (!request.isUserInRole("uddiadmin")) {
-        out.write("Sorry, you need to have the 'uddiadmin' admin role to 
access this page.")
-        response.setStatus(403);
-    }
-    if (request.getMethod().equalsIgnoreCase("post")) {
-        UddiHub x = UddiHub.getInstance(application, session);
-        Properties p = x.GetRawConfiguration();
-        Enumeration it = request.getParameterNames();
-        while (it.hasMoreElements()) {
-            String key = (String) it.nextElement();
-            String value = request.getParameter(key);
-            if (key.startsWith(UddiHub.PROP_PREFIX)) {
-                p.setProperty(key, value);
+    } else {
+        //this is controlled by web.xml
+    /*if (!request.isUserInRole("uddiadmin")) {
+         out.write("Sorry, you need to have the 'uddiadmin' admin role to 
access this page.");
+         response.setStatus(403);
+         }*/
+        if (request.getMethod().equalsIgnoreCase("post")) {
+            UddiHub x = UddiHub.getInstance(application, session);
+            Properties p = x.GetRawConfiguration();
+            Enumeration it = request.getParameterNames();
+            while (it.hasMoreElements()) {
+                String key = (String) it.nextElement();
+                String value = request.getParameter(key);
+                if (key.startsWith(UddiHub.PROP_PREFIX)) {
+                    p.setProperty(key, value);
+                } else if (key.startsWith("client")) {
+                    //its part of the juddi client config file
+                    
x.GetJuddiClientConfig().getConfiguration().setProperty(key, value);
+                    //this just sets the runtime config
+
+                }
             }
-            else if (key.startsWith("client"))
-            {
-                //its part of the juddi client config file
-                x.GetJuddiClientConfig().getConfiguration().setProperty(key, 
value);
-                //this just sets the runtime config
-                
+            try {
+                x.GetJuddiClientConfig().saveConfig();
+            } catch (Exception ex) {
+                response.setStatus(500);
+                out.write("Error saving Juddi Client Config" + 
ex.getMessage());
             }
-        }
-        try{
-            x.GetJuddiClientConfig().saveConfig();
-        }
-        catch (Exception ex)
-        {
-            response.setStatus(500);
-            out.write("Error saving Juddi Client Config" + ex.getMessage());
-        }
-        //attempt to save the properties file
-        try {
-            FileOutputStream fos = new FileOutputStream(new 
File(x.GetRawConfigurationPath()));
-            String msg = "Edited at " + System.currentTimeMillis() + " by " + 
request.getRemoteUser();
-            if (request.getUserPrincipal() != null) {
-                msg += " " + request.getUserPrincipal().toString();
+            //attempt to save the properties file
+            try {
+                FileOutputStream fos = new FileOutputStream(new 
File(x.GetRawConfigurationPath()));
+                String msg = "Edited at " + System.currentTimeMillis() + " by 
" + request.getRemoteUser();
+                if (request.getUserPrincipal() != null) {
+                    msg += " " + request.getUserPrincipal().toString();
+                }
+                p.store(fos, msg);
+                fos.close();
+            } catch (Exception ex) {
+                response.setStatus(500);
+                out.write("Error saving config.properties (authmode only) " + 
ex.getMessage());
             }
-            p.store(fos, msg);
-            fos.close();
-        } catch (Exception ex) {
-            response.setStatus(500);
-            out.write("Error saving config.properties (authmode only) " + 
ex.getMessage());
         }
-        
     }
 %>
\ No newline at end of file

Added: juddi/trunk/juddi-gui/src/main/webapp/autoLogoutModal.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/autoLogoutModal.jsp?rev=1539229&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/autoLogoutModal.jsp (added)
+++ juddi/trunk/juddi-gui/src/main/webapp/autoLogoutModal.jsp Wed Nov  6 
03:43:23 2013
@@ -0,0 +1,69 @@
+<%-- 
+    Document   : autoLogoutModal
+    Created on : Nov 5, 2013, 6:25:56 PM
+    Author     : Alex O'Ree
+--%>
+
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%
+    UddiHub internal_ = UddiHub.getInstance(application, session);
+    if (internal_.isAutoLogoutEnabled()) {
+        
+%>
+<script type="text/javascript">
+
+    var timer1, timer2;
+    document.onkeypress = resetTimer;
+    document.onmousemove = resetTimer;
+    var counterzxy=0;
+    function resetTimer()
+    {
+         window.console && console.log("time reset " + counterzxy++);
+        $("#autologout").modal('hide');
+        clearTimeout(timer1);
+        clearTimeout(timer2);
+
+        // waiting time in minutes
+        var wait = <%=internal_.GetAutoLogoutDuration()%>;
+
+        // alert user one minute before
+        timer1 = setTimeout("alertUser()", (wait) - 30000);
+
+        // logout user
+        timer2 = setTimeout("logout()", wait);
+    }
+
+    function alertUser()
+    {
+        $("#autologout").modal('hide');
+        $("#autologout").modal('show');
+        // document.getElementById('timeoutPopup').style.display = 'block';
+    }
+
+    function logout()
+    {
+        window.location.href = 'logoutredir.jsp';
+    }
+
+</script>
+
+
+<div class="modal hide fade container" id="autologout">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">&times;</button>
+        <h3><%=ResourceLoader.GetResource(session, 
"pages.serviceimport.content.sslwarning")%></h3>
+    </div>
+    <div class="modal-body">
+        <%=ResourceLoader.GetResource(session, "pages.session.expire")%>
+    </div>
+    <div class="modal-footer">
+
+        <a href="javascript:closeXmlPop('autologout');" 
class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+    </div>
+</div>
+
+<%
+    }
+
+%>
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Wed Nov  6 
03:43:23 2013
@@ -160,7 +160,7 @@
                                     out.write("<div id=\"" + 
PostBackConstants.NAME + i + "\" style=\"border-width:1px; border-style:solid\" 
>");
                                     out.write("<div style=\"float:left; 
height:100%\"><a href=\"javascript:Remove('Name" + 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.NAME + i + PostBackConstants.VALUE + "\">" + 
StringEscapeUtils.escapeHtml(bd.getName().get(i).getValue()) + "</div>");
+                                            + "<div class=\"edit\" id=\"" + 
PostBackConstants.NAME + i + PostBackConstants.VALUE + "\">" + 
(bd.getName().get(i).getValue()!=null ? 
StringEscapeUtils.escapeHtml(bd.getName().get(i).getValue()) : "") + "</div>");
                                     out.write("<div style=\"float:left\">" + 
ResourceLoader.GetResource(session, "items.lang") + "&nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + 
PostBackConstants.NAME + i + PostBackConstants.LANG + "\">");
                                     if (bd.getName().get(i).getLang() != null) 
{
@@ -523,7 +523,10 @@
                                 out.write(ResourceLoader.GetResource(session, 
"items.signed") + " " + bd.getSignature().size());
                         %>
                         <table class="table table-hover">
-                            <tr><th>#</th><th>Signed 
by</th><th></th><th>Signature Status</th></tr>
+                             <tr><th>#</th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.signedby")%></th>
+                            <th></th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.status")%></th></tr>
 
                             <%
                                 for (int k = 0; k < bd.getSignature().size(); 
k++) {
@@ -685,10 +688,7 @@
         </div>
     </div>
     <script type="text/javascript">
-        function closeXmlPop(modaldiv)
-        {
-            $('#' + modaldiv).modal('hide');
-        }
+       
     </script>
     <div class="modal hide fade container" id="addSubscriptionModal">
         <div class="modal-header">

Modified: juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Wed Nov  6 03:43:23 
2013
@@ -90,6 +90,7 @@
 
     <body>
         <%@include file="user/banner.jsp" %>        
+        <%@include file="autoLogoutModal.jsp" %>        
         <form id="uddiform">
             <%@include  file="csrf.jsp" %>
             <input type="hidden" name="nonce" id="nonce" 
value="<%=StringEscapeUtils.escapeHtml((String) 
session.getAttribute("nonce"))%>" />

Modified: juddi/trunk/juddi-gui/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/index.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/index.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/index.jsp Wed Nov  6 03:43:23 2013
@@ -46,7 +46,7 @@
                 //this is in ms, Maxvalue represents something like 70 years
                 cookie.setMaxAge(Integer.MAX_VALUE);
                 //cookie.setDomain("/UDDIBrowser");
-                cookie.setPath("/UDDIBrowser");
+                cookie.setPath("/juddi-gui");
                 response.addCookie(cookie);
             }
             response.sendRedirect("home.jsp");
@@ -56,9 +56,8 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Welcome to jUDDI</title>
-        <meta charset="utf-8">
         <title>Welcome to Apache jUDDI</title>
+        <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Apache jUDDI">
         <meta name="author" content="Apache Software Foundation">
@@ -103,12 +102,8 @@
                     <br>
                     <input type="checkbox" name="setcookie" checked> Remember 
my decision<br>
                     <button type="submit" value="Go" class="btn 
btn-primary">Go</button>
-
-                </form><br>
-                <b>We welcome help internationalizing jUDDI!</b><br>
-                <script type="text/javascript">
-                
-                </script>
+                </form>
+                <b>We welcome help internationalizing jUDDI!</b>
                 <noscript>Your browser does not support JavaScript! 
Functionality will be so severely reduced, that you might as well give up, 
sorry!</noscript>
             </div>
         </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js Wed Nov  6 
03:43:23 2013
@@ -52,6 +52,8 @@ var selectedItemBinding=null;
 //offset, maxrecords, keyword
 function RenderBindingListBySearch(keyword1, offset1, maxrecords1, 
isForChooser)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#langBinding").text();
     $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js Wed Nov  6 
03:43:23 2013
@@ -53,6 +53,8 @@ var selectedItemBusiness=null;
 //offset, maxrecords, keyword
 function RenderBusinessListBySearchModal(keyword1, offset1, maxrecords1, 
isForChooser)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#langBusiness").text();
     $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js Wed Nov  6 
03:43:23 2013
@@ -55,6 +55,8 @@ function pageupBusiness()
 //offset, maxrecords, keyword
 function RenderBusinessListBySearch(keyword1, offset1, maxrecords1)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#lang").text();
     $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/main.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/main.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/main.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/main.js Wed Nov  6 03:43:23 2013
@@ -15,7 +15,7 @@
  *
  */
 
-var loggedin=false;
+var loggedin = false;
 
 var tagsToReplace = {
     '&': '&amp;',
@@ -34,26 +34,26 @@ function safe_tags_replace(str) {
 function escapeJquerySelector(str)
 {
     if (str)
-        return str.replace(/([ #;?&,.+*~\':"!^$[\]()=>|\/@])/g,'\\$1');
+        return str.replace(/([ #;?&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
     return str;
 }
 
-  
+
 function Reedit()
 {
-    window.console && console.log('Reedit');                
-    $('.edit').editable(function(value, settings) { 
-                
+    window.console && console.log('Reedit');
+    $('.edit').editable(function(value, settings) {
+
         window.console && console.log(this);
         window.console && console.log(value);
         window.console && console.log(settings);
         //replace tags with escaped characters to prevent XSS
         return(safe_tags_replace(value));
-    }, { 
-        type    : 'text',
-        submit  : 'OK'
+    }, {
+        type: 'text',
+        submit: 'OK'
     });
- 
+
 }
 
 Reedit();
@@ -61,29 +61,29 @@ Reedit();
 
 function Login()
 {
-    
+
     $("#loginbutton").addClass("disabled");
     $("#loginbutton").text(i18n_loading);
-    
+
     var form = $("#uddiform");
     var d = form.serializeArray();
-    var request=   $.ajax({
+    var request = $.ajax({
         url: 'ajax/loginpost.jsp',
-        type:"POST",
+        type: "POST",
         //  dataType: "html", 
-        cache: false, 
+        cache: false,
         //  processData: false,f
         data: d
     });
-                  
+
     request.done(function(msg) {
-        window.console && console.log('postback done ');                
+        window.console && console.log('postback done ');
         $("#loginbutton").text(i18n_login);
         RefreshLoginPage();
     });
 
     request.fail(function(jqXHR, textStatus) {
-        window.console && console.log('postback failed ');                     
           
+        window.console && console.log('postback failed ');
         //TODO handle expired nonce values?
         RefreshLoginPage();
         $("#loginbutton").text(i18n_login);
@@ -92,7 +92,7 @@ function Login()
 
 function logout()
 {
-    
+
     $.get('logout.jsp', function(data) {
         window.location = "index.jsp";
     });
@@ -114,24 +114,24 @@ function jqSelector(str)
 
 function ShowServicesByBusinessKey(bizid)
 {
-    window.console && console.log('fetching service list for business ' + 
bizid);                
-    var request=   $.ajax({
+    window.console && console.log('fetching service list for business ' + 
bizid);
+    var request = $.ajax({
         url: 'ajax/servicelist.jsp?id=' + bizid,
-        type:"GET",
+        type: "GET",
         cache: false
     });
-                  
+
     request.done(function(msg) {
-        window.console && console.log(msg);                
-        window.console && console.log('postback done to div ' + bizid);        
        
+        window.console && console.log(msg);
+        window.console && console.log('postback done to div ' + bizid);
         $("#" + jqSelector(bizid)).html(msg);
-    //refresh();
+        //refresh();
     });
 
     request.fail(function(jqXHR, textStatus) {
-        window.console && console.log('postback failed ');                     
           
+        window.console && console.log('postback failed ');
         $("#" + jqSelector(bizid)).html("An error occured! " + 
jqXHR.responseText + textStatus);
-    //refresh();
+        //refresh();
     });
 
 }
@@ -155,4 +155,9 @@ function GetServiceDetails(svcid)
 function hideAlert()
 {
     $("#resultBar").hide();
+}
+
+function closeXmlPop(modaldiv)
+{
+    $('#' + modaldiv).modal('hide');
 }
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js Wed Nov  6 
03:43:23 2013
@@ -53,6 +53,8 @@ function pageupService()
 
 function RenderServiceListBySearch(keyword, offset, maxrecords)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#lang").text();
     $("#serviceBrowserListing").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js Wed Nov  6 
03:43:23 2013
@@ -53,6 +53,8 @@ var selectedItemService=null;
 //offset, maxrecords, keyword
 function RenderServiceListBySearchModal(keyword1, offset1, maxrecords1, 
isForChooser)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#langService").text();
     $("#servicelist").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js Wed Nov  6 
03:43:23 2013
@@ -63,6 +63,8 @@ var selectedItem=null;
 //offset, maxrecords, keyword
 function RenderTmodelListBySearch(keyword1, offset1, maxrecords1, isForChooser)
 {
+    if (keyword1 === "%")
+        keyword1 = "%25";
     var lang = $("#lang").text();
     $("#tmodellist").html("<img src=\"img/bigrollergreen.gif\" 
title=\"Loading\"/>");
     var request=   $.ajax({

Copied: juddi/trunk/juddi-gui/src/main/webapp/logoutredir.jsp (from r1534826, 
juddi/trunk/juddi-gui/src/main/webapp/logout.jsp)
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/logoutredir.jsp?p2=juddi/trunk/juddi-gui/src/main/webapp/logoutredir.jsp&p1=juddi/trunk/juddi-gui/src/main/webapp/logout.jsp&r1=1534826&r2=1539229&rev=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/logout.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/logoutredir.jsp Wed Nov  6 03:43:23 
2013
@@ -12,7 +12,6 @@
     hub.die();
     session.removeAttribute("username");
     session.removeAttribute("password");
-    // session.invalidate();
-    // response.sendRedirect("index.jsp");
-//do not invalidate the session, this will cause the form nonce to clear until 
the browser url changes
+   
+    response.sendRedirect("index.jsp");
 %>
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Wed Nov  6 03:43:23 
2013
@@ -585,7 +585,10 @@
                             out.write(ResourceLoader.GetResource(session, 
"items.signed") + " " + bd.getSignature().size());
                     %>
                     <table class="table table-hover">
-                        <tr><th>#</th><th>Signed by</th><th></th><th>Signature 
Status</th></tr>
+                        <tr><th>#</th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.signedby")%></th>
+                            <th></th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.status")%></th></tr>
 
                         <%
                             for (int k = 0; k < bd.getSignature().size(); k++) 
{
@@ -706,12 +709,7 @@
         <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">&times;</button>
         <h3><%=ResourceLoader.GetResource(session, "actions.asxml")%> </h3>
     </div>
-    <script type="text/javascript">
-        function closeXmlPop(modaldiv)
-        {
-            $('#' + modaldiv).modal('hide');
-        }
-    </script>
+   
     <div class="modal-body" id="viewAsXmlContent">
 
 

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=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Wed Nov  6 03:43:23 
2013
@@ -59,7 +59,7 @@
                 <li><a href="#identifiers" 
><%=ResourceLoader.GetResource(session, 
"pages.editor.tabnav.identifiers")%></a></li>
 
                 <li><a href="#signatures"  
id="sigtagheader"><%=ResourceLoader.GetResource(session, 
"pages.editor.tabnav.signatures")%></a></li>
-                <li><a href="#Instances" >Instances</a></li>
+                <li><a href="#Instances" 
><%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.instances")%></a></li>
 
 
             </ul>
@@ -186,7 +186,7 @@
                         if (bd.isDeleted()) {
                             out.write("checked=checked");
                         }
-                           %>> Is this tModel Deleted? (not available for 
future use).<br>
+                           %>> <%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.deleted")%><br>
                 </div>
 
                 <div class="tab-pane " id="discovery">
@@ -276,12 +276,15 @@
 
                     <%
                         if (bd.getSignature().isEmpty()) {
-                            out.write("This item is not digitally signed.");
+                            out.write(ResourceLoader.GetResource(session, 
"items.signed.not"));
                         } else {
-                            out.write("This item is digitally signed " + 
bd.getSignature().size());
+                            out.write(ResourceLoader.GetResource(session, 
"items.signed") + " " + bd.getSignature().size());
                     %>
                     <table class="table table-hover">
-                        <tr><th>#</th><th>Signed by</th><th></th><th>Signature 
Status</th></tr>
+                         <tr><th>#</th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.signedby")%></th>
+                            <th></th>
+                            <th><%=ResourceLoader.GetResource(session, 
"pages.signatures.status")%></th></tr>
 
                         <%
                             for (int k = 0; k < bd.getSignature().size(); k++) 
{
@@ -314,13 +317,13 @@
                     %>
                 </div>
                 <div class="tab-pane " id="Instances">
-                    <b>Instances</b> - Use this to search for other entities 
in this registery that reference this tModel<Br>
+                    <b><%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.instances")%></b> - 
+                    <%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.instances.content")%><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>-->
+                        <option value="business"> 
<%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.search.business")%></option>
+                        <option value="bindingTemplate"> 
<%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.search.binding")%></option>
+                        <option value="service"> 
<%=ResourceLoader.GetResource(session, 
"pages.editor.tmodel.search.services")%></option>
                     </select>
                     <script type="text/javascript">
 
@@ -358,24 +361,6 @@
                                     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
@@ -416,9 +401,6 @@
 
                     </script>
                     <div id="InstancesContainer" style="border-width: 2px; 
border-style: solid;" >
-                        <%
-
-                        %>
                     </div>
                 </div>
                 <div><br>
@@ -507,12 +489,7 @@
 
 
         </div>
-        <script type="text/javascript">
-            function closeXmlPop(modaldiv)
-            {
-                $('#' + modaldiv).modal('hide');
-            }
-        </script>
+      
         <div class="modal-footer">
             <a href="ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), 
"UTF-8")%>&type=tmodel" class="btn btn-primary" target="_blank">Popout</a> 
             <a href="javascript:closeXmlPop('viewAsXml');" 
class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>

Modified: juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp Wed Nov  6 03:43:23 2013
@@ -199,10 +199,7 @@
                         }
                         
                         
-                        function closeXmlPop(div)
-                        {
-                                $("#" + div).modal("hide");
-                        }
+                      
                         
                         
                         function acceptToken()

Modified: juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp?rev=1539229&r1=1539228&r2=1539229&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp Wed Nov  6 
03:43:23 2013
@@ -171,9 +171,5 @@
                        
         }
                    
-        function closeXmlPop(modaldiv)
-        {
-            $('#' + modaldiv).modal('hide');
-        }
     </script>
     <%@include file="header-bottom.jsp" %>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to