You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/11/14 17:27:35 UTC
cvs commit: jakarta-turbine-fulcrum merlin-project.xml
epugh 2003/11/14 08:27:35
Modified: localization/api project.xml
mimetype/impl project.xml
mimetype/api project.xml
configuration/impl project.xml
localization/impl project.xml
Added: mimetype/impl project.properties
localization/impl project.properties
. merlin-project.xml
Log:
Update to use merlin-project to prevent fighting over versions of Avalon code.
Also tweak to move the .xinfo file into the correct place to run jcoverage.
Revision Changes Path
1.2 +1 -1 jakarta-turbine-fulcrum/localization/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/localization/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Nov 2003 13:40:48 -0000 1.1
+++ project.xml 14 Nov 2003 16:27:35 -0000 1.2
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../merlin-project.xml</extend>
<id>fulcrum-localization-api</id>
<name>Fulcrum Localization API</name>
<currentVersion>1.0-alpha-4</currentVersion>
1.2 +2 -2 jakarta-turbine-fulcrum/mimetype/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 13 Nov 2003 20:28:29 -0000 1.1
+++ project.xml 14 Nov 2003 16:27:35 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<project>
- <extend>${basedir}/../../project-merlin.xml</extend>
+ <extend>${basedir}/../../merlin-project.xml</extend>
<id>fulcrum-mimetype-impl</id>
- <name>Fulcrum Mimtype Component</name>
+ <name>Fulcrum Mimetype Component</name>
<currentVersion>1.0-alpha-4</currentVersion>
<dependencies>
1.1 jakarta-turbine-fulcrum/mimetype/impl/project.properties
Index: project.properties
===================================================================
maven.jcoverage.junit.fork
1.2 +1 -1 jakarta-turbine-fulcrum/mimetype/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 13 Nov 2003 20:28:29 -0000 1.1
+++ project.xml 14 Nov 2003 16:27:35 -0000 1.2
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../merlin-project.xml</extend>
<id>fulcrum-mimetype-api</id>
<name>Fulcrum Mimetype API</name>
<currentVersion>1.0-alpha-4</currentVersion>
1.2 +1 -1 jakarta-turbine-fulcrum/configuration/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 12 Nov 2003 11:27:07 -0000 1.1
+++ project.xml 14 Nov 2003 16:27:35 -0000 1.2
@@ -3,7 +3,7 @@
<project>
<id>fulcrum-configuration-impl</id>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../merlin-project.xml</extend>
<name>Fulcrum Configuration Impl</name>
<currentVersion>1.0-alpha-2</currentVersion>
<package>org.apache.fulcrum.configuration</package>
1.2 +1 -1 jakarta-turbine-fulcrum/localization/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/localization/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Nov 2003 13:46:13 -0000 1.1
+++ project.xml 14 Nov 2003 16:27:35 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../merlin-project.xml</extend>
<id>fulcrum-localization-impl</id>
<name>Fulcrum Localization Component</name>
<currentVersion>1.0-alpha-4</currentVersion>
1.1 jakarta-turbine-fulcrum/localization/impl/project.properties
Index: project.properties
===================================================================
maven.jcoverage.junit.fork=true
1.1 jakarta-turbine-fulcrum/merlin-project.xml
Index: merlin-project.xml
===================================================================
<?xml version="1.0"?>
<project>
<pomVersion>3</pomVersion>
<groupId>fulcrum</groupId>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
<logo>/images/jakarta-logo-blue.gif</logo>
</organization>
<inceptionYear>2000</inceptionYear>
<package>org.apache.fulcrum</package>
<gumpRepositoryId>jakarta</gumpRepositoryId>
<shortDescription>Component Repository</shortDescription>
<description>Fulcrum is a component repository for Turbine.</description>
<url>http://jakarta.apache.org/turbine/fulcrum/${pom.artifactId}/</url>
<issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/fulcrum/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-fulcrum/</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-fulcrum</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-turbine-fulcrum/</url>
</repository>
<mailingLists>
<mailingList>
<name>Turbine User List</name>
<subscribe>turbine-user-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>turbine-user-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=turbine-user@jakarta.apache.org</archive>
</mailingList>
<mailingList>
<name>Turbine Developer List</name>
<subscribe>turbine-dev-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>turbine-dev-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://archives.apache.org/eyebrowse/SummarizeList?listName=turbine-dev@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<name>Geir Magnusson Jr.</name>
<id>geirm</id>
<email>geirm@optonline.net</email>
<organization>Independent (DVSL Maven)</organization>
</developer>
<developer>
<name>Quinton McCombs</name>
<id>quintonm</id>
<email>quintonm@bellsouth.net</email>
<organization>NequalsOne</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>John McNally</name>
<id>jmcnally</id>
<email>jmcnally@collab.net</email>
<organization>CollabNet</organization>
</developer>
<developer>
<name>Martin Poeschl</name>
<id>mpoeschl</id>
<email>mpoeschl@marmot.at</email>
<organization>Tucana</organization>
</developer>
<developer>
<name>Eric Pugh</name>
<id>epugh</id>
<email>epugh@upstate.com</email>
</developer>
<developer>
<name>Daniel Rall</name>
<id>dlr</id>
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
</developer>
<developer>
<name>Henning P. Schmiedehausen</name>
<id>henning</id>
<email>hps@intermeta.de</email>
<organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
</developer>
<developer>
<name>Jon Scott Stevens</name>
<id>jon</id>
<email>jon@latchkey.com</email>
<organization>CollabNet, Inc.</organization>
</developer>
<developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>jason@zenplex.com</email>
<organization>Zenplex</organization>
</developer>
</developers>
<contributors>
<contributor>
<name>Dan Diephouse</name>
<id>dandiep</id>
<email>dan@envoisolutions.com</email>
<organization>Envoi solutions</organization>
<roles>
<role>Developer</role>
</roles>
</contributor>
<contributor>
<name>Pete Kazmier</name>
<id>kaz</id>
<email></email>
<organization></organization>
<roles>
<role>Developer</role>
</roles>
</contributor>
<contributor>
<name>Kasper Nielsen</name>
<id>kasper</id>
<email>apache@kav.dk</email>
<organization></organization>
<roles>
<role>Developer</role>
</roles>
</contributor>
<contributor>
<name>James Taylor</name>
<id>jtaylor</id>
<email>james@jamestaylor.org</email>
<organization></organization>
<roles>
<role>Developer</role>
</roles>
</contributor>
</contributors>
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<unitTestSourceDirectory>${basedir}/src/test/</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.*</include>
<include>**/*TestCase.*</include>
</includes>
<excludes>
<include>**/Abstract*.*</include>
</excludes>
<resources>
<resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.x*</include>
</includes>
</resource>
<resource>
<directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
<include>block.xml</include>
</includes>
</resource>
<resource>
<directory>${basedir}/target/classes</directory>
<includes>
<include>**/*.xinfo</include>
</includes>
</resource>
</resources>
</unitTest>
<integrationUnitTestPatterns></integrationUnitTestPatterns>
<resources>
<resource>
<directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
<includes>
<include>block.xml</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.x*</include>
</includes>
</resource>
</resources>
<jars></jars>
</build>
<reports>
<report>maven-jdepend-plugin</report>
<report>maven-changelog-plugin</report>
<report>maven-changes-plugin</report>
<report>maven-developer-activity-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-javadoc-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-jcoverage-plugin</report>
<report>maven-simian-plugin</report>
<report>maven-multiproject-plugin</report>
<report>maven-faq-plugin</report>
</reports>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org