You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jz...@apache.org on 2009/04/23 09:40:53 UTC
svn commit: r767836 -
/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
Author: jzurbano
Date: Thu Apr 23 07:40:53 2009
New Revision: 767836
URL: http://svn.apache.org/viewvc?rev=767836&view=rev
Log:
merge -r 767815:767816
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=767836&r1=767835&r2=767836&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Thu Apr 23 07:40:53 2009
@@ -112,7 +112,18 @@
this.getBuildDefinitionTemplateId() );
}
- AuditLog event = new AuditLog( pomUrl, AuditLogConstants.ADD_M2_PROJECT );
+ String projectUrl = pomUrl;
+
+ if ( projectUrl.indexOf( "@" ) > 0 )
+ {
+ // remove scm credentials from the url
+ StringBuilder urlBuilder = new StringBuilder();
+ urlBuilder.append( projectUrl.substring( 0, projectUrl.indexOf( "://" ) + 3 ) );
+ urlBuilder.append( projectUrl.substring( projectUrl.indexOf( "@" ) + 1 ) );
+ projectUrl = urlBuilder.toString();
+ }
+
+ AuditLog event = new AuditLog( projectUrl, AuditLogConstants.ADD_M2_PROJECT );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
event.log();