Modified: manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/jsp/JspWrapper.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/jsp/JspWrapper.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/jsp/JspWrapper.java (original) +++ manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/jsp/JspWrapper.java Mon Jul 15 14:02:29 2013 @@ -19,26 +19,31 @@ package org.apache.manifoldcf.ui.jsp; import org.apache.manifoldcf.core.interfaces.*; +import org.apache.manifoldcf.ui.beans.AdminProfile; import javax.servlet.jsp.*; import java.io.*; /** This class provides an implementation of IHTTPOutput, which provides output -* services to connector UI interfaces. +* services to connector UI interfaces. More broadly, it provides the services that all +* connectors will need in order to provide UI components. */ public class JspWrapper implements IHTTPOutput { public static final String _rcsid = "@(#)$Id: JspWrapper.java 988245 2010-08-23 18:39:35Z kwright $"; - protected JspWriter writer; + protected final JspWriter writer; + protected final AdminProfile adminProfile; /** Constructor. */ - public JspWrapper(JspWriter writer) + public JspWrapper(JspWriter writer, AdminProfile adminProfile) { this.writer = writer; + this.adminProfile = adminProfile; } /** Flush the stream */ + @Override public void flush() throws IOException { @@ -46,6 +51,7 @@ public class JspWrapper implements IHTTP } /** Write a newline */ + @Override public void newLine() throws IOException { @@ -53,6 +59,7 @@ public class JspWrapper implements IHTTP } /** Write a boolean */ + @Override public void print(boolean b) throws IOException { @@ -60,6 +67,7 @@ public class JspWrapper implements IHTTP } /** Write a char */ + @Override public void print(char c) throws IOException { @@ -67,6 +75,7 @@ public class JspWrapper implements IHTTP } /** Write an array of chars */ + @Override public void print(char[] c) throws IOException { @@ -74,6 +83,7 @@ public class JspWrapper implements IHTTP } /** Write a double */ + @Override public void print(double d) throws IOException { @@ -81,6 +91,7 @@ public class JspWrapper implements IHTTP } /** Write a float */ + @Override public void print(float f) throws IOException { @@ -88,6 +99,7 @@ public class JspWrapper implements IHTTP } /** Write an int */ + @Override public void print(int i) throws IOException { @@ -95,6 +107,7 @@ public class JspWrapper implements IHTTP } /** Write a long */ + @Override public void print(long l) throws IOException { @@ -102,6 +115,7 @@ public class JspWrapper implements IHTTP } /** Write an object */ + @Override public void print(Object o) throws IOException { @@ -109,6 +123,7 @@ public class JspWrapper implements IHTTP } /** Write a string */ + @Override public void print(String s) throws IOException { @@ -116,6 +131,7 @@ public class JspWrapper implements IHTTP } /** Write a boolean */ + @Override public void println(boolean b) throws IOException { @@ -123,6 +139,7 @@ public class JspWrapper implements IHTTP } /** Write a char */ + @Override public void println(char c) throws IOException { @@ -130,6 +147,7 @@ public class JspWrapper implements IHTTP } /** Write an array of chars */ + @Override public void println(char[] c) throws IOException { @@ -137,6 +155,7 @@ public class JspWrapper implements IHTTP } /** Write a double */ + @Override public void println(double d) throws IOException { @@ -144,6 +163,7 @@ public class JspWrapper implements IHTTP } /** Write a float */ + @Override public void println(float f) throws IOException { @@ -151,6 +171,7 @@ public class JspWrapper implements IHTTP } /** Write an int */ + @Override public void println(int i) throws IOException { @@ -158,6 +179,7 @@ public class JspWrapper implements IHTTP } /** Write a long */ + @Override public void println(long l) throws IOException { @@ -165,6 +187,7 @@ public class JspWrapper implements IHTTP } /** Write an object */ + @Override public void println(Object o) throws IOException { @@ -172,10 +195,35 @@ public class JspWrapper implements IHTTP } /** Write a string */ + @Override public void println(String s) throws IOException { writer.println(s); } + /** Map a password to a unique key. + * This method works within a specific given browser session to replace an existing password with + * a key which can be used to look up the password at a later time. + *@param password is the password. + *@return the key. + */ + @Override + public String mapPasswordToKey(String password) + { + return adminProfile.getPasswordMapper().mapPasswordToKey(password); + } + + /** Convert a key, created by mapPasswordToKey, back to the original password, within + * the lifetime of the browser session. If the provided key is not an actual key, instead + * the key value is assumed to be a new password value. + *@param key is the key. + *@return the password. + */ + @Override + public String mapKeyToPassword(String key) + { + return adminProfile.getPasswordMapper().mapKeyToPassword(key); + } + }
Modified: manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java (original) +++ manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java Mon Jul 15 14:02:29 2013 @@ -19,6 +19,7 @@ package org.apache.manifoldcf.ui.multipart; import org.apache.manifoldcf.core.interfaces.*; +import org.apache.manifoldcf.ui.beans.AdminProfile; import org.apache.commons.fileupload.*; import javax.servlet.*; import javax.servlet.http.*; @@ -33,6 +34,8 @@ public class MultipartWrapper implements { public static final String _rcsid = "@(#)$Id: MultipartWrapper.java 988245 2010-08-23 18:39:35Z kwright $"; + /** The Admin Profile bean, for password mapping. */ + protected final AdminProfile adminProfile; /** This is the HttpServletRequest object, which will be used for parameters only if * the form is not multipart. */ protected HttpServletRequest request = null; @@ -41,9 +44,11 @@ public class MultipartWrapper implements /** Constructor. */ - public MultipartWrapper(HttpServletRequest request) + public MultipartWrapper(HttpServletRequest request, AdminProfile adminProfile) throws ManifoldCFException { + this.adminProfile = adminProfile; + // Check that we have a file upload request boolean isMultipart = FileUpload.isMultipartContent(request); if (!isMultipart) @@ -95,6 +100,7 @@ public class MultipartWrapper implements /** Get multiple parameter values. */ + @Override public String[] getParameterValues(String name) { // Expect multiple items, all strings @@ -136,6 +142,7 @@ public class MultipartWrapper implements /** Get single parameter value. */ + @Override public String getParameter(String name) { // Get it as a parameter. @@ -167,6 +174,7 @@ public class MultipartWrapper implements /** Get a file parameter, as a binary input. */ + @Override public BinaryInput getBinaryStream(String name) throws ManifoldCFException { @@ -205,6 +213,7 @@ public class MultipartWrapper implements /** Get file parameter, as a byte array. */ + @Override public byte[] getBinaryBytes(String name) { if (request != null) @@ -227,6 +236,7 @@ public class MultipartWrapper implements /** Set a parameter value */ + @Override public void setParameter(String name, String value) { ArrayList values = new ArrayList(); @@ -237,6 +247,7 @@ public class MultipartWrapper implements /** Set an array of parameter values */ + @Override public void setParameterValues(String name, String[] values) { ArrayList valueArray = new ArrayList(); @@ -248,4 +259,30 @@ public class MultipartWrapper implements variableMap.put(name,valueArray); } + // Password mapping + + /** Map a password to a unique key. + * This method works within a specific given browser session to replace an existing password with + * a key which can be used to look up the password at a later time. + *@param password is the password. + *@return the key. + */ + @Override + public String mapPasswordToKey(String password) + { + return adminProfile.getPasswordMapper().mapPasswordToKey(password); + } + + /** Convert a key, created by mapPasswordToKey, back to the original password, within + * the lifetime of the browser session. If the provided key is not an actual key, instead + * the key value is assumed to be a new password value. + *@param key is the key. + *@return the password. + */ + @Override + public String mapKeyToPassword(String key) + { + return adminProfile.getPasswordMapper().mapKeyToPassword(key); + } + } Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original) +++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Mon Jul 15 14:02:29 2013 @@ -32,10 +32,17 @@ editjob.HopFilters=Hop Filters editjob.am=am editjob.pm=pm +index.ApacheManifoldCF=Apache ManifoldCF index.WelcomeToApacheManifoldFC=Welcome to Apache ManifoldCF +index.ApacheManifoldCFLogin=Apache ManifoldCF Login +index.UserIDColon=User ID: +index.PasswordColon=Password: +index.Login=Login +index.LoginFailed=Login failed! banner.DocumentIngestion=Document Ingestion +navigation.LogOut=Log Out navigation.Outputs=Outputs navigation.ListOutputConnections=List Output Connections navigation.UserMappings=User Mappings Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original) +++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Mon Jul 15 14:02:29 2013 @@ -32,10 +32,17 @@ editjob.HopFilters=ãããã� editjob.am=åå editjob.pm=åå¾ +index.ApacheManifoldCF=Apache ManifoldCF index.WelcomeToApacheManifoldFC=Apache ManifoldCFã¸ãããã +index.ApacheManifoldCFLogin=Apache ManifoldCF Login +index.UserIDColon=User ID: +index.PasswordColon=Password: +index.Login=Login +index.LoginFailed=Login failed! banner.DocumentIngestion=ã³ã³ãã³ãã®èªè¾¼ã¿ +navigation.LogOut=Log Out navigation.Outputs=åºå navigation.ListOutputConnections=åºåã³ãã¯ã·ã§ã³ä¸è¦§ navigation.UserMappings=User Mappings Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml (original) +++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml Mon Jul 15 14:02:29 2013 @@ -34,7 +34,13 @@ </p> <p>The ManifoldCF UI has been tested with Firefox and various incarnations of Internet Explorer. If you use another browser, there is a small chance that the UI will not work properly. Please let your system integrator know if you find any browser incompatibility problems.</p> - <p>When you do manage to enter the Framework user interface the first time, you should see a screen that looks something like this:</p> + <p>When you enter the Framework user interface the first time, you will first be asked to log in:</p> + <br/><br/> + <figure src="images/en_US/login.PNG" alt="Login Screen" width="80%"/> + <br/><br/> + <p>Enter the login user name and password for your system. By default, the user name is "admin" and the password is "admin", although your + system administrator can (and should) change this. Then, click the "Login" button. If you entered the correct credentials, you should see a + screen that looks something like this:</p> <br/><br/> <figure src="images/en_US/welcome-screen.PNG" alt="Welcome Screen" width="80%"/> <br/><br/> Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original) +++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Mon Jul 15 14:02:29 2013 @@ -554,6 +554,14 @@ cd example correct arguments and settings.</p> <p></p> <table> + <tr><th>User Mapping Command Class</th><th>Arguments</th><th>Function</th></tr> + <tr><td>org.apache.manifoldcf.authorities.RegisterMapper</td><td><em>classname</em> <em>description</em></td><td>Register a mapping connector class</td></tr> + <tr><td>org.apache.manifoldcf.authorities.UnRegisterMapper</td><td><em>classname</em></td><td>Un-register a mapping connector class</td></tr> + <tr><td>org.apache.manifoldcf.authorities.UnRegisterAllMappers</td><td>None</td><td>Un-register all mapping connector classes</td></tr> + <tr><td>org.apache.manifoldcf.authorities.SynchronizeMappers</td><td>None</td><td>Un-register all registered mapping connector classes that can't be found</td></tr> + </table> + <p></p> + <table> <tr><th>Authority Command Class</th><th>Arguments</th><th>Function</th></tr> <tr><td>org.apache.manifoldcf.authorities.RegisterAuthority</td><td><em>classname</em> <em>description</em></td><td>Register an authority connector class</td></tr> <tr><td>org.apache.manifoldcf.authorities.UnRegisterAuthority</td><td><em>classname</em></td><td>Un-register an authority connector class</td></tr> @@ -785,6 +793,8 @@ cd example <table> <caption>Property.xml properties</caption> <tr><th>Property</th><th>Required?</th><th>Function</th></tr> + <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login user ID (defaults to "admin")</td></tr> + <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI login user password (defaults to "admin")</td></tr> <tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for Jetty</td><td>Location of Crawler UI war</td></tr> <tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes, for Jetty</td><td>Location of Authority Service war</td></tr> <tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for Jetty</td><td>Location of API Service war</td></tr> Modified: manifoldcf/trunk/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -49,7 +49,16 @@ public class NavigationDerbyUI extends B HTMLTester.Loop loop; window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - + + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + // Define an authority connection via the UI window = testerInstance.findWindow(null); link = window.findLink(testerInstance.createStringDescription("List authorities")); Modified: manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -44,6 +44,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -43,7 +43,17 @@ public class NavigationDerbyUI extends B HTMLTester.Loop loop; window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - + + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -43,7 +43,17 @@ public class NavigationDerbyUI extends B HTMLTester.Loop loop; window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - + + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java (original) +++ manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java Mon Jul 15 14:02:29 2013 @@ -57,6 +57,16 @@ public class NavigationUITester window = testerInstance.openMainWindow(startURL); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/gts/src/test/java/org/apache/manifoldcf/gts_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/gts/src/test/java/org/apache/manifoldcf/gts_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/gts/src/test/java/org/apache/manifoldcf/gts_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/gts/src/test/java/org/apache/manifoldcf/gts_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/hdfs/src/test/java/org/apache/manifoldcf/hdfs_tests/NavigationUITester.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/hdfs/src/test/java/org/apache/manifoldcf/hdfs_tests/NavigationUITester.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/hdfs/src/test/java/org/apache/manifoldcf/hdfs_tests/NavigationUITester.java (original) +++ manifoldcf/trunk/tests/hdfs/src/test/java/org/apache/manifoldcf/hdfs_tests/NavigationUITester.java Mon Jul 15 14:02:29 2013 @@ -57,6 +57,16 @@ public class NavigationUITester window = testerInstance.openMainWindow(startURL); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/jcifs/src/test/java/org/apache/manifoldcf/jcifs_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/jcifs/src/test/java/org/apache/manifoldcf/jcifs_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/jcifs/src/test/java/org/apache/manifoldcf/jcifs_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/jcifs/src/test/java/org/apache/manifoldcf/jcifs_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/jdbc/src/test/java/org/apache/manifoldcf/jdbc_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/jdbc/src/test/java/org/apache/manifoldcf/jdbc_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/jdbc/src/test/java/org/apache/manifoldcf/jdbc_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/jdbc/src/test/java/org/apache/manifoldcf/jdbc_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/ldap/src/test/java/org/apache/manifoldcf/ldap_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/ldap/src/test/java/org/apache/manifoldcf/ldap_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/ldap/src/test/java/org/apache/manifoldcf/ldap_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/ldap/src/test/java/org/apache/manifoldcf/ldap_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -49,7 +49,17 @@ public class NavigationDerbyUI extends B HTMLTester.Loop loop; window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - + + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an authority connection via the UI window = testerInstance.findWindow(null); link = window.findLink(testerInstance.createStringDescription("List authorities")); Modified: manifoldcf/trunk/tests/nullauthority/src/test/java/org/apache/manifoldcf/nullauthority_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/nullauthority/src/test/java/org/apache/manifoldcf/nullauthority_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/nullauthority/src/test/java/org/apache/manifoldcf/nullauthority_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/nullauthority/src/test/java/org/apache/manifoldcf/nullauthority_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an authority connection via the UI link = window.findLink(testerInstance.createStringDescription("List authorities")); link.click(); Modified: manifoldcf/trunk/tests/opensearchserver/src/test/java/org/apache/manifoldcf/opensearchserver_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/opensearchserver/src/test/java/org/apache/manifoldcf/opensearchserver_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/opensearchserver/src/test/java/org/apache/manifoldcf/opensearchserver_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/opensearchserver/src/test/java/org/apache/manifoldcf/opensearchserver_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,6 +50,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/webcrawler/src/test/java/org/apache/manifoldcf/webcrawler_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/webcrawler/src/test/java/org/apache/manifoldcf/webcrawler_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/webcrawler/src/test/java/org/apache/manifoldcf/webcrawler_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/webcrawler/src/test/java/org/apache/manifoldcf/webcrawler_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -50,7 +50,17 @@ public class NavigationDerbyUI extends B HTMLTester.Loop loop; window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - + + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click(); Modified: manifoldcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/NavigationDerbyUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/NavigationDerbyUI.java?rev=1503255&r1=1503254&r2=1503255&view=diff ============================================================================== --- manifoldcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/NavigationDerbyUI.java (original) +++ manifoldcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/NavigationDerbyUI.java Mon Jul 15 14:02:29 2013 @@ -80,6 +80,16 @@ public class NavigationDerbyUI extends B window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); + // Login + form = window.findForm(testerInstance.createStringDescription("loginform")); + textarea = form.findTextarea(testerInstance.createStringDescription("userID")); + textarea.setValue(testerInstance.createStringDescription("admin")); + textarea = form.findTextarea(testerInstance.createStringDescription("password")); + textarea.setValue(testerInstance.createStringDescription("admin")); + button = window.findButton(testerInstance.createStringDescription("Login")); + button.click(); + window = testerInstance.findWindow(null); + // Define an output connection via the UI link = window.findLink(testerInstance.createStringDescription("List output connections")); link.click();
