You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2006/08/08 01:33:17 UTC
svn commit: r429511 - in /maven/maven-1/plugins/trunk/idea: project.xml
src/plugin-resources/templates/v4/workspace.jelly xdocs/changes.xml
Author: dennisl
Date: Mon Aug 7 16:33:17 2006
New Revision: 429511
URL: http://svn.apache.org/viewvc?rev=429511&view=rev
Log:
[MPIDEA-43] Autodetect which version control system to use.
Modified:
maven/maven-1/plugins/trunk/idea/project.xml
maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/workspace.jelly
maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/idea/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/idea/project.xml?rev=429511&r1=429510&r2=429511&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/project.xml (original)
+++ maven/maven-1/plugins/trunk/idea/project.xml Mon Aug 7 16:33:17 2006
@@ -24,7 +24,7 @@
<pomVersion>3</pomVersion>
<id>maven-idea-plugin</id>
<name>Maven IDEA Plugin</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<shortDescription>IDEA Plugin for Maven</shortDescription>
<description>IDEA Plugin for Maven.</description>
<versions>
Modified: maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/workspace.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/workspace.jelly?rev=429511&r1=429510&r2=429511&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/workspace.jelly (original)
+++ maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/workspace.jelly Mon Aug 7 16:33:17 2006
@@ -17,7 +17,7 @@
*/
-->
-<j:whitespace xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns="dummy" trim="true">
+<j:whitespace xmlns:ant="jelly:ant" xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns="dummy" trim="true">
<project version="4" relativePaths="true">
<component name="LvcsProjectConfiguration">
@@ -244,7 +244,36 @@
</configuration>
</component>
<component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="" /> <!-- TODO: CVS value -->
+ <j:set var="scmConnection" value="${pom.repository.connection}"/>
+ <j:if test="${empty(scmConnection)}">
+ <j:set var="scmConnection" value="${pom.repository.developerConnection}"/>
+ </j:if>
+ <j:choose>
+ <j:when test="${empty(scmConnection)}">
+ <j:set var="vcsName" value=""/>
+ </j:when>
+ <j:when test="${5 > scmConnection.length()}">
+ <j:set var="vcsName" value=""/>
+ <ant:echo>Invalid SCM Connection. Unable to determine VCS name.</ant:echo>
+ </j:when>
+ <j:otherwise>
+ <j:set var="scmNoPrefix" value="${scmConnection.substring(4)}"/>
+ <j:set var="scmEndIndex" value="${scmNoPrefix.indexOf('|')}" />
+ <j:if test="${0 > scmEndIndex}">
+ <j:set var="scmEndIndex" value="${scmNoPrefix.indexOf(':')}" />
+ </j:if>
+ <j:choose>
+ <j:when test="${0 > scmEndIndex}">
+ <j:set var="vcsName" value=""/>
+ <ant:echo>Invalid SCM Connection. Unable to determine VCS name.</ant:echo>
+ </j:when>
+ <j:otherwise>
+ <j:set var="vcsName" value="${scmNoPrefix.substring(0, scmEndIndex)}"/>
+ </j:otherwise>
+ </j:choose>
+ </j:otherwise>
+ </j:choose>
+ <option name="ACTIVE_VCS_NAME" value="${vcsName}" />
</component>
<component name="VssConfiguration">
<CheckoutOptions>
Modified: maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/idea/xdocs/changes.xml?rev=429511&r1=429510&r2=429511&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/idea/xdocs/changes.xml Mon Aug 7 16:33:17 2006
@@ -24,6 +24,9 @@
<author email="michal.maczka@dimatic.com">Michal Maczka</author>
</properties>
<body>
+ <release version="1.7-SNAPSHOT" date="In SVN">
+ <action dev="dennisl" type="add" issue="MPIDEA-43">Autodetect which version control system to use</action>
+ </release>
<release version="1.6" date="2005-06-15">
<action dev="brett" type="update" issue="MPIDEA-25">Use relative paths for projects and modules for projects easier to check into SCM</action>
<action dev="brett" type="update" issue="MPIDEA-7" due-to="David Jencks">Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies</action>