continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r330803 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/scm/ continuum-model/src/main/mdo/ continuum-web/src/main/resources/forms/ continuum-web/s...
Date Fri, 04 Nov 2005 12:36:56 GMT
Author: evenisse
Date: Fri Nov  4 04:36:43 2005
New Revision: 330803

URL: http://svn.apache.org/viewcvs?rev=330803&view=rev
Log:
Remove tagbase for subversion.
If a user want to use a svn tag, he'll modify the scm url, so he'll respect the svn url standard.

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
    maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=330803&r1=330802&r2=330803&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Fri Nov  4 04:36:43 2005
@@ -1718,15 +1718,7 @@
 
             Project p = store.getProject( project.getId() );
 
-            if ( StringUtils.isEmpty( p.getScmTagBase() ) && !StringUtils.isEmpty(
project.getScmTagBase() ) )
-            {
-                removeWorkingDirectory = true;
-            }
-            else if ( !StringUtils.isEmpty( p.getScmTagBase() ) && StringUtils.isEmpty(
project.getScmTagBase() ) )
-            {
-                removeWorkingDirectory = true;
-            }
-            else if ( !StringUtils.isEmpty( p.getScmTagBase() ) && !p.getScmTagBase().equals(
project.getScmTagBase() ) )
+            if ( !p.getScmUrl().equals( project.getScmUrl() ) )
             {
                 removeWorkingDirectory = true;
             }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=330803&r1=330802&r2=330803&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
Fri Nov  4 04:36:43 2005
@@ -29,7 +29,6 @@
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -83,11 +82,6 @@
 
             ScmProviderRepository providerRepository = repository.getProviderRepository();
 
-            if ( providerRepository instanceof SvnScmProviderRepository && project.getScmTagBase()
!= null )
-            {
-                ( (SvnScmProviderRepository) providerRepository ).setTagBase( project.getScmTagBase()
);
-            }
-
             ScmResult result;
 
             synchronized ( this )
@@ -198,11 +192,6 @@
             ScmRepository repository = getScmRepositorty( project );
 
             ScmProviderRepository providerRepository = repository.getProviderRepository();
-
-            if ( providerRepository instanceof SvnScmProviderRepository && project.getScmTagBase()
!= null )
-            {
-                ( (SvnScmProviderRepository) providerRepository ).setTagBase( project.getScmTagBase()
);
-            }
 
             ScmResult result;
 

Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=330803&r1=330802&r2=330803&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Fri Nov  4 04:36:43 2005
@@ -112,11 +112,6 @@
           <version>1.0.0+</version>
           <type>String</type>
         </field>
-        <field stash.maxSize="256">
-          <name>scmTagBase</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-        </field>
         <field>
           <name>scmTag</name>
           <version>1.0.0+</version>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml?rev=330803&r1=330802&r2=330803&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml Fri
Nov  4 04:36:43 2005
@@ -53,13 +53,6 @@
       <expression>scmPassword</expression>
     </element>
     <element>
-      <id>projectScmTagBase</id>
-      <validators>
-      </validators>
-      <type>text</type>
-      <expression>scmTagBase</expression>
-    </element>
-    <element>
       <id>projectScmTag</id>
       <validators>
       </validators>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=330803&r1=330802&r2=330803&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
Fri Nov  4 04:36:43 2005
@@ -48,11 +48,8 @@
 projectScmPassword.label = Scm Password
 projectScmPassword.message = Enter the scm password
 
-projectScmTagBase.label = Scm branch/tag base
-projectScmTagBase.message = Enter the scm branch/tag base url (For subversion only)
-
 projectScmTag.label = Scm Branch/Tag
-projectScmTag.message = Enter the scm branch/tag name
+projectScmTag.message = Enter the scm branch/tag name ( For subversion, tag name must be
in scm URL and not in this field )
 
 project.version.label = Version
 project.version.error = You must provide a version



Mime
View raw message