continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r498009 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java webapp/WEB-INF/jsp/addMavenOneProject.jsp webapp/WEB-INF/jsp/addMavenTwoProject.jsp
Date Fri, 19 Jan 2007 23:51:12 GMT
Author: jmcconnell
Date: Fri Jan 19 15:51:11 2007
New Revision: 498009

URL: http://svn.apache.org/viewvc?view=rev&rev=498009
Log:
changed the username and password to scmUsername and scmPassword so that browsers will not
attempt to prefill these with the users authentication information, its also more desciptive
and matchs the db better

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java?view=diff&rev=498009&r1=498008&r2=498009
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
Fri Jan 19 15:51:11 2007
@@ -56,9 +56,9 @@
 
     private String pom = null;
     
-    private String username;
+    private String scmUsername;
     
-    private String password;
+    private String scmPassword;
 
     private Collection projectGroups;
 
@@ -78,11 +78,11 @@
             try
             {
                 URL url = new URL( pomUrl );
-                if ( pomUrl.startsWith( "http" ) && !StringUtils.isEmpty( username
) )
+                if ( pomUrl.startsWith( "http" ) && !StringUtils.isEmpty(scmUsername)
)
                 {
                     StringBuffer urlBuffer = new StringBuffer();
                     urlBuffer.append( url.getProtocol() ).append( "://" );
-                    urlBuffer.append( username ).append( ':' ).append( password ).append(
'@' ).append( url.getHost() );
+                    urlBuffer.append(scmUsername).append( ':' ).append(scmPassword).append(
'@' ).append( url.getHost() );
                     if ( url.getPort() != -1 )
                     {
                         urlBuffer.append( url.getPort() );
@@ -218,19 +218,19 @@
         this.pomUrl = pomUrl;
     }
 
-    public void setPassword( String password )
+    public void setScmPassword( String scmPassword)
     {
-        this.password = password;
+        this.scmPassword = scmPassword;
     }
 
-    public String getUsername()
+    public String getScmUsername()
     {
-        return username;
+        return scmUsername;
     }
 
-    public void setUsername( String username )
+    public void setScmUsername( String scmUsername)
     {
-        this.username = username;
+        this.scmUsername = scmUsername;
     }
 
     public Collection getProjectGroups()

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?view=diff&rev=498009&r1=498008&r2=498009
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
Fri Jan 19 15:51:11 2007
@@ -46,11 +46,11 @@
                                   <tbody>
                                     <tr>
                                       <td><ww:text name="add.m1.project.m1PomUrl.username.label"/>:
</td>
-                                      <td><input type="text" name="username" size="20"
id="addMavenOneProject_username"/><td>
+                                      <td><input type="text" name="scmUsername"
size="20" id="addMavenOneProject_scmUsername"/><td>
                                     </tr>  
                                     <tr>
                                       <td><ww:text name="add.m1.project.m1PomUrl.password.label"/>:
</td>
-                                      <td><input type="password" name="password"
size="20" id="addMavenOneProject_password"/><td>
+                                      <td><input type="password" name="scmPassword"
size="20" id="addMavenOneProject_scmPassword"/><td>
                                     </tr>  
                                   </tbody>
                                 </table>  

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?view=diff&rev=498009&r1=498008&r2=498009
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
Fri Jan 19 15:51:11 2007
@@ -46,11 +46,11 @@
                                   <tbody>
                                     <tr>
                                       <td><ww:text name="add.m2.project.m2PomUrl.username.label"/>:
</td>
-                                      <td><input type="text" name="username" size="20"
id="addMavenTwoProject_username"/><td>
+                                      <td><input type="text" name="scmUsername"
size="20" id="addMavenTwoProject_scmUsername"/><td>
                                     </tr>  
                                     <tr>
                                       <td><ww:text name="add.m2.project.m2PomUrl.password.label"/>:
</td>
-                                      <td><input type="password" name="password"
size="20" id="addMavenTwoProject_password"/><td>
+                                      <td><input type="password" name="scmPassword"
size="20" id="addMavenTwoProject_scmPassword"/><td>
                                     </tr>  
                                   </tbody>
                                 </table>  



Mime
View raw message