svn commit: r558795 - in /maven/archiva/trunk: archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/
Author: oching
Date: Mon Jul 23 09:48:30 2007
New Revision: 558795
URL: http://svn.apache.org/viewvc?view=revrev=558795
Log:
[MRM-425 and MRM-426]
- Added and modified code for handling snapshots (if the versions of a specific
artifact snapshot are only timestamped versions, add a
generic snapshot which is pointing to the latest timestamp version) in
DefaultRepositoryBrowsing and ProjectModelToDatabaseConsumer.
- Updated pom validations in ProjectModelToDatabaseConsumer - handling of
timestamped versions were considered
- Added isUniqueSnapshot(..) and isGenericSnapshot(..) in VersionUtil
- Added new attribute 'modelVersion' in DependencyTreeTag to get the in-pom
version. Did not use the version attribute so as to retain the
actual version being browsed. Also updated DependencyTree
- Updated the ff. pages for the version to be displayed: artifactInfo.jspf,
showArtifact.jsp, dependencyTree.jsp and artifactDecorator.jsp
- Updated the version in SearchResultHit
Modified:
maven/archiva/trunk/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/artifact/dependencyTree.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Modified:
maven/archiva/trunk/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java?view=diffrev=558795r1=558794r2=558795
==
---
maven/archiva/trunk/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
Mon Jul 23 09:48:30 2007
@@ -151,4 +151,20 @@
return version;
}
}
+
+public static boolean isUniqueSnapshot( String version )
+{
+Matcher m = UNIQUE_SNAPSHOT_PATTERN.matcher( version );
+if( m.matches() )
+{
+return true;
+}
+
+return false;
+}
+
+public static boolean isGenericSnapshot( String version )
+{
+return version.endsWith( SNAPSHOT );
+}
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?view=diffrev=558795r1=558794r2=558795
==
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Mon Jul 23 09:48:30 2007
@@ -42,20 +42,20 @@
import org.apache.maven.archiva.repository.project.ProjectModelFilter;
import org.apache.maven.archiva.repository.project.ProjectModelReader;
import
org.apache.maven.archiva.repository.project.filters.EffectiveProjectModelFilter;
+import org.apache.maven.archiva.common.utils.VersionUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
- * ProjectModelToDatabaseConsumer
+ * ProjectModelToDatabaseConsumer
*
* @author a href=mailto:[EMAIL PROTECTED]Joakim Erdfelt/a
* @version $Id$
- *
* @plexus.component
role=org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer
svn commit: r558776 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Author: ltheussl
Date: Mon Jul 23 08:30:07 2007
New Revision: 558776
URL: http://svn.apache.org/viewvc?view=revrev=558776
Log:
Code convention (tabs, whitespace), javadocs. No code changes.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?view=diffrev=558776r1=558775r2=558776
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Mon Jul 23 08:30:07 2007
@@ -34,7 +34,7 @@
*/
public class AptSink extends SinkAdapter
{
-private static final String EOL = System.getProperty(line.separator);
+private static final String EOL = System.getProperty( line.separator );
private StringBuffer buffer;
private StringBuffer tableCaptionBuffer;
private String author;
@@ -54,25 +54,43 @@
private String listNestingIndent;
private Stack listStyles;
+/**
+ * Constructor, initialize the variables.
+ *
+ * @param writer The writer to write the result.
+ */
public AptSink( Writer writer )
{
- this.buffer = new StringBuffer();
+this.buffer = new StringBuffer();
this.tableCaptionBuffer = new StringBuffer();
-this.writer = new PrintWriter(writer);
+this.writer = new PrintWriter( writer );
this.listNestingIndent = ;
this.listStyles = new Stack();
}
+/**
+ * Returns the buffer that holds the current text.
+ *
+ * @return A StringBuffer.
+ */
protected StringBuffer getBuffer()
{
return buffer;
}
-protected void setHeadFlag(boolean headFlag)
+/**
+ * Used to determine whether we are in head mode.
+ *
+ * @param headFlag True for head mode.
+ */
+protected void setHeadFlag( boolean headFlag )
{
this.headerFlag = headFlag;
}
+/**
+ * Reset all variables.
+ */
protected void resetState()
{
headerFlag = false;
@@ -82,22 +100,30 @@
cellCount = 0;
}
+/**
+ * Reset the StringBuffer.
+ */
protected void resetBuffer()
{
buffer = new StringBuffer();
}
+/**
+ * Reset the TableCaptionBuffer.
+ */
protected void resetTableCaptionBuffer()
{
- tableCaptionBuffer = new StringBuffer();
+tableCaptionBuffer = new StringBuffer();
}
+/** [EMAIL PROTECTED] */
public void head()
{
- resetState();
- headerFlag = true;
+resetState();
+headerFlag = true;
}
+/** [EMAIL PROTECTED] */
public void head_()
{
headerFlag = false;
@@ -111,143 +137,170 @@
write( - + EOL );
}
+/** [EMAIL PROTECTED] */
public void title_()
{
-if(buffer.length() 0)
+if ( buffer.length() 0 )
{
- title = buffer.toString();
+title = buffer.toString();
resetBuffer();
}
}
+/** [EMAIL PROTECTED] */
public void author_()
{
-if(buffer.length() 0)
+if ( buffer.length() 0 )
{
- author = buffer.toString();
+author = buffer.toString();
resetBuffer();
}
}
+/** [EMAIL PROTECTED] */
public void date_()
{
-if(buffer.length() 0)
+if ( buffer.length() 0 )
{
- date = buffer.toString();
+date = buffer.toString();
resetBuffer();
}
}
+/** [EMAIL PROTECTED] */
public void section1_()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void section2_()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void section3_()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void section4_()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void section5_()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void sectionTitle1()
{
write( EOL );
}
+/** [EMAIL PROTECTED] */
public void sectionTitle1_()
{
write( EOL + EOL );
}
+/** [EMAIL PROTECTED] */
public void sectionTitle2()
{
write( EOL + * );
}
+/** [EMAIL PROTECTED] */
public void sectionTitle2_()
{
write( EOL + EOL );
}
+/** [EMAIL PROTECTED]
svn commit: r558695 - /maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
Author: dennisl Date: Mon Jul 23 05:14:01 2007 New Revision: 558695 URL: http://svn.apache.org/viewvc?view=revrev=558695 Log: o Use standard indentation in code examples. o Reorder pom elements so that they come in the same order as the do in the model documentation. Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt?view=diffrev=558695r1=558694r2=558695 == --- maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt (original) +++ maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Mon Jul 23 05:14:01 2007 @@ -47,84 +47,84 @@ Minimum Elements for a valid pom - *modelVersion - POM model version, currently 4.0.0 + * modelVersion - POM model version, currently 4.0.0 - *version - the plugin version + * groupId - the package name - *groupId - the package name + * artifactId - artifact name - *artifactId - artifact name - - *packaging - type of artifact produced by the POM + * packaging - type of artifact produced by the POM + + * version - the plugin version **Optional Elements This might be optional elements in a valid POM but they are important basic project information required by the users to effectively use the plugin. - *name - plugin's name + * name - plugin's name - *description - project description, an overview of what the plugin can do + * description - project description, an overview of what the plugin can do - *url - the site of the plugin, normally maven.apache.org or mojo.codehaus.org + * url - the site of the plugin, normally maven.apache.org or mojo.codehaus.org - *issueManagement - describes the system used for reporting problems and modification requests + * prerequisites - would have an initial value of maven, list of descriptive name of dependencies. + + * issueManagement - describes the system used for reporting problems and modification requests +--+ - [...] -issueManagement - systemjira/system - urlhttp://jira.someproject.org/url -/issueManagement - [...] + [...] + issueManagement +systemjira/system +urlhttp://jira.someproject.org/url + /issueManagement + [...] +--+ - *prerequisites - would have an initial value of maven, list of descriptive name of dependencies. - - *inceptionYear - year the plugin was made + * inceptionYear - year the plugin was made - *mailingLists - list where the developers can be contacted for problems and modification requests + * mailingLists - list where the developers can be contacted for problems and modification requests +--+ - [...] -mailingLists -mailingList - nameProject issues/name - post[EMAIL PROTECTED]/post - subscribe[EMAIL PROTECTED]/subscribe - unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://noonecares.archive.org/archive -/mailingList -mailingList -[...] -mailingList -/mailingLists - [...] + [...] + mailingLists +mailingList + nameProject issues/name + post[EMAIL PROTECTED]/post + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + archivehttp://noonecares.archive.org/archive +/mailingList +mailingList + [...] +mailingList + /mailingLists + [...] +--+ - *license - plugin license + * license - plugin license - *scm - the source code management configuration. A plugin without this would raise suspicion, might not be OSS. + * scm - the source code management configuration. A plugin without this would raise suspicion, might not be OSS. +--+ - [...] -scm - connectionscm:svn:http://noonecares.com/some/plugin/project/trunk/connection - developerConnectionscm:svn:https://noonecares.com/some/plugin/project/trunk/developerConnection - urlhttp://noonecares.com/viewcvs.cgi/some/project/trunk//url -/scm - [...] + [...] + scm + connectionscm:svn:http://noonecares.com/some/plugin/project/trunk/connection + developerConnectionscm:svn:https://noonecares.com/some/plugin/project/trunk/developerConnection +urlhttp://noonecares.com/viewcvs.cgi/some/project/trunk//url + /scm + [...] +--+ - *organization - the organization maintaining the plugin, just in case we need someone to blame. + * organization - the organization maintaining the plugin, just in case we need someone to blame. +--+ - [...] + [...] organization nameNoone Care Software Foundation/name urlhttp://noonecare.org//url /organization - [...] + [...]
svn commit: r558696 - in /maven/doxia/site: ./ src/site/ src/site/apt/ src/site/apt/developers/ src/site/apt/macros/ src/site/apt/modules/ src/site/apt/references/ src/site/fml/ src/site/resources/ima
Author: vsiveton
Date: Mon Jul 23 05:18:28 2007
New Revision: 558696
URL: http://svn.apache.org/viewvc?view=revrev=558696
Log:
DOXIA-140: Review the Doxia site documentation
o structured the site and updated the site.xml
o added several pages and faq
o moved the apt format doc in references dir
o moved the swf macro doc in macros dir
Added:
maven/doxia/site/src/site/apt/developers/
maven/doxia/site/src/site/apt/developers/index.apt (with props)
maven/doxia/site/src/site/apt/macros/
maven/doxia/site/src/site/apt/macros/index.apt (with props)
maven/doxia/site/src/site/apt/macros/swf-macro.apt
- copied unchanged from r558690,
maven/doxia/site/src/site/apt/swf-macro.apt
maven/doxia/site/src/site/apt/modules/
maven/doxia/site/src/site/apt/modules/index.apt (with props)
maven/doxia/site/src/site/apt/overview.apt (with props)
maven/doxia/site/src/site/apt/references/
maven/doxia/site/src/site/apt/references/apt-format.apt
- copied unchanged from r558690, maven/doxia/site/src/site/apt/format.apt
maven/doxia/site/src/site/apt/references/index.apt (with props)
maven/doxia/site/src/site/apt/resources.apt (with props)
maven/doxia/site/src/site/fml/
maven/doxia/site/src/site/fml/faq.fml (with props)
maven/doxia/site/src/site/resources/images/
maven/doxia/site/src/site/resources/images/architecture.png (with props)
Removed:
maven/doxia/site/src/site/apt/format.apt
maven/doxia/site/src/site/apt/guide-doxia-macros.apt
maven/doxia/site/src/site/apt/swf-macro.apt
Modified:
maven/doxia/site/pom.xml
maven/doxia/site/src/site/apt/index.apt
maven/doxia/site/src/site/site.xml
Modified: maven/doxia/site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?view=diffrev=558696r1=558695r2=558696
==
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Mon Jul 23 05:18:28 2007
@@ -37,6 +37,8 @@
artifactIddoxia-site/artifactId
packagingpom/packaging
nameDoxia Site/name
+ descriptionSite of the Maven Doxia Framework/description
+ inceptionYear2005/inceptionYear
urlhttp://maven.apache.org/doxia/url
issueManagement
Added: maven/doxia/site/src/site/apt/developers/index.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/developers/index.apt?view=autorev=558696
==
--- maven/doxia/site/src/site/apt/developers/index.apt (added)
+++ maven/doxia/site/src/site/apt/developers/index.apt Mon Jul 23 05:18:28 2007
@@ -0,0 +1,187 @@
+ -
+ Doxia Developers Centre
+ -
+ Vincent Siveton
+ --
+ July 2007
+ --
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ License); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Doxia Developers Centre
+
+ This documentation centre is for those that are developing Doxia modules or
macro.
+
+*Create a New Doxia Module
+
+ First, you need to create a POM with doxia-modules as parent:
+
+-
+project
+ parent
+groupIdorg.apache.maven.doxia/groupId
+artifactIddoxia-modules/artifactId
+version1.0/version !-- Latest release --
+ /parent
+ modelVersion4.0.0/modelVersion
+ artifactIddoxia-module-my/artifactId
+ nameDoxia :: MY Module/name
+
+ ...
+/project
+-
+
+ Secondly, you should implement some Doxia classes:
+
+ * MyParser class
+
+-
+import org.apache.maven.doxia.parser.AbstractParser;
+
+/**
+ * @plexus.component role=org.apache.maven.doxia.parser.Parser role-hint=my
+ */
+public class MyParser
+extends AbstractParser
+{
+...
+}
+-
+
+ * MyParseException class
+
+-
+import org.apache.maven.doxia.parser.ParseException;
+
+public class MyParseException
+extends ParseException
+{
+...
+}
+-
+
+ * MySiteModule class
+
+-
+import org.apache.maven.doxia.site.module.AbstractSiteModule;
+
+/**
+ * @plexus.component role=org.apache.maven.doxia.site.module.SiteModule
role-hint=my
+ */
+public class MySiteModule
+extends AbstractSiteModule
+{
+...
+}
+-
+
+ * MySink class
+
+-
+import
svn commit: r558699 - /maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
Author: dennisl Date: Mon Jul 23 05:28:32 2007 New Revision: 558699 URL: http://svn.apache.org/viewvc?view=revrev=558699 Log: o Add info on the naming of a plugin. o Use the new way of referencing a menu in the site descriptor. o Fix a couple of typos. o Add some more formating. Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt?view=diffrev=558699r1=558698r2=558699 == --- maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt (original) +++ maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Mon Jul 23 05:28:32 2007 @@ -29,7 +29,7 @@ Documentation is generated by running +---+ - mvn site:site +mvn site:site +---+ It will generate a plugin site based on the information in the POM, src/site and other reporting @@ -59,16 +59,17 @@ **Optional Elements - This might be optional elements in a valid POM but they are important basic project information + These might be optional elements in a valid POM but they are important basic project information required by the users to effectively use the plugin. - * name - plugin's name + * name - plugin's name, Maven NNN Plugin for plugins hosted at the Maven project or + NNN Maven Plugin for all others * description - project description, an overview of what the plugin can do - * url - the site of the plugin, normally maven.apache.org or mojo.codehaus.org + * url - the site of the plugin, normally maven.apache.org or mojo.codehaus.org - * prerequisites - would have an initial value of maven, list of descriptive name of dependencies. + * prerequisites - the minimum version of Maven required to use this plugin * issueManagement - describes the system used for reporting problems and modification requests @@ -81,30 +82,30 @@ [...] +--+ - * inceptionYear - year the plugin was made + * inceptionYear - year the plugin was first created - * mailingLists - list where the developers can be contacted for problems and modification requests + * mailingLists - lists where other users or the developers can be contacted for help and discussions +--+ [...] mailingLists mailingList - nameProject issues/name + nameProject users/name post[EMAIL PROTECTED]/post - subscribe[EMAIL PROTECTED]/subscribe - unsubscribe[EMAIL PROTECTED]/unsubscribe + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe archivehttp://noonecares.archive.org/archive /mailingList mailingList [...] -mailingList +/mailingList /mailingLists [...] +--+ - * license - plugin license + * licenses - plugin license - * scm - the source code management configuration. A plugin without this would raise suspicion, might not be OSS. + * scm - the source code management configuration - a plugin without this would raise suspicion, might not be OSS +--+ [...] @@ -116,7 +117,7 @@ [...] +--+ - * organization - the organization maintaining the plugin, just in case we need someone to blame. + * organization - the organization maintaining the plugin, just in case we need someone to blame +--+ [...] @@ -133,12 +134,12 @@ names are extracted from the plugin source and rendered in the Plugin Info page. In order for the generated site to be useful here's some guidelines you can follow when documenting your plugin. - * all @parameter field should have a descriptive comment, informative enough that even a regular user can understand. + * all @parameter fields should have a descriptive comment, informative enough that even a regular user can understand +--+ [...] /** - * put something informative here that a regular user can understand + * Put something informative here that a regular user can understand. * * @parameter */ @@ -146,12 +147,12 @@ [...] +--+ - * class level comment should explain what the goal does. + * class level comment should explain what the goal does +--+ [...] /** - * Everything here will show up on the top of the generated plugin info page + * Everything here will show up on the top of the generated plugin info page. * * @goal somegoal * @phase compile @@ -165,7 +166,7 @@ [...] +--+ - * all @component and @readonly parameters are not required to have any comments but it's still a good practice to provide one. + * the @component and @readonly parameters are not required to have any comments but
svn commit: r558907 - /maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml
Author: brianf Date: Mon Jul 23 18:29:04 2007 New Revision: 558907 URL: http://svn.apache.org/viewvc?view=revrev=558907 Log: extend maven parent and deploy snapshot for archetype Modified: maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml Modified: maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml?view=diffrev=558907r1=558906r2=558907 == --- maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml Mon Jul 23 18:29:04 2007 @@ -1,5 +1,10 @@ project modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.maven/groupId +artifactIdmaven-parent/artifactId +version6-SNAPSHOT/version + /parent groupIdorg.apache.maven.its/groupId artifactIdmaven-integration-test-helper/artifactId version1.0-SNAPSHOT/version
svn commit: r558915 - in /maven/core-integration-testing/trunk/maven-integration-test: ./ src/test/java/org/apache/maven/integrationtests/ src/test/resources/it0111-pluginThatRequiresResourceFromAnExt
Author: brianf Date: Mon Jul 23 19:20:12 2007 New Revision: 558915 URL: http://svn.apache.org/viewvc?view=revrev=558915 Log: changes to sample to make it generic and self documenting Added: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java - copied, changed from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/ - copied from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/ maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/readme.txt Removed: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/ Modified: maven/core-integration-testing/trunk/maven-integration-test/ (props changed) maven/core-integration-testing/trunk/maven-integration-test/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/ (props changed) maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-test/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/pom.xml Propchange: maven/core-integration-testing/trunk/maven-integration-test/ -- --- svn:ignore (added) +++ svn:ignore Mon Jul 23 19:20:12 2007 @@ -0,0 +1 @@ +target Modified: maven/core-integration-testing/trunk/maven-integration-test/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test/pom.xml?view=diffrev=558915r1=558914r2=558915 == --- maven/core-integration-testing/trunk/maven-integration-test/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test/pom.xml Mon Jul 23 19:20:12 2007 @@ -11,10 +11,10 @@ version1.0/version /dependency dependency - groupIdorg.apache.maven.its/groupId - artifactIdmaven-integration-test-helper/artifactId - version1.0-SNAPSHOT/version -/dependency + groupIdorg.apache.maven.its/groupId + artifactIdmaven-integration-test-helper/artifactId + version1.0-SNAPSHOT/version + /dependency dependency groupIdjunit/groupId artifactIdjunit/artifactId @@ -22,4 +22,17 @@ scopetest/scope /dependency /dependencies + !-- TODO: remove when snapshots are released -- + repositories + repository + idapache.snapshots/id + urlhttp://people.apache.org/repo/m2-snapshot-repository/url + releases + enabledfalse/enabled + /releases + snapshots + enabledtrue/enabled + /snapshots + /repository + /repositories /project Copied: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java (from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java) URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java?view=diffrev=558915p1=maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.javar1=557106p2=maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.javar2=558915 == --- maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java (original) +++
