You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/04/30 18:26:32 UTC
cvs commit: jakarta-turbine-fulcrum project.properties project.xml maven.xml
quintonm 2003/04/30 09:26:29
Modified: . project.properties project.xml maven.xml
Log:
The maven build process from Fulcrum no longer builda a single jar file for
Fulcrum. I have changed it to match the build process for plexus-components
which uses the reactor to build a jar for each component.
At the moment, xmlrpc is all that will build. The other parts of Fulcrum
will be converted in the near future.
Revision Changes Path
1.12 +6 -1 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.properties 22 Apr 2003 22:27:20 -0000 1.11
+++ project.properties 30 Apr 2003 16:26:26 -0000 1.12
@@ -1,5 +1,6 @@
maven.checkstyle.format = turbine
-maven.compile.deprecation = yes
+maven.checkstyle.properties = ${basedir}/project.properties
+maven.compile.deprecation = no
# display the date on the site
maven.xdoc.date = left
@@ -18,6 +19,9 @@
torque.schema.dir = target
torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
torque.contextProperties = project.properties
+torque.useClasspath = true
+torque.runOnlyOnSchemaChange = false
+torque.lib.dir = ${maven.repo.local}
torque.runOnlyOnSchemaChange = true
scheduler.database.name = default
@@ -25,6 +29,7 @@
security.database.name = default
security.package = org.apache.fulcrum.security.impl.db.entity
+
# -------------------------------------------------------------------
# J U N I T S E T T I N G S
1.67 +140 -42 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- project.xml 25 Apr 2003 02:20:36 -0000 1.66
+++ project.xml 30 Apr 2003 16:26:28 -0000 1.67
@@ -4,7 +4,7 @@
<pomVersion>3</pomVersion>
<name>jakarta-turbine-fulcrum</name>
<id>fulcrum</id>
- <currentVersion>3.0-b2-dev</currentVersion>
+ <currentVersion>1.0-alpha-3</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -15,8 +15,8 @@
<logo>/images/blue-logo.gif</logo>
<gumpRepositoryId>jakarta</gumpRepositoryId>
- <shortDescription>Services Framework</shortDescription>
- <description>Fulcrum is a services framework.</description>
+ <shortDescription>Component Repository</shortDescription>
+ <description>Fulcrum is a component repository for Turbine.</description>
<url>http://jakarta.apache.org/turbine/fulcrum/</url>
<issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
@@ -27,10 +27,6 @@
<url>http://cvs.apache.org/viewcvs/jakarta-turbine-fulcrum/</url>
</repository>
<releases>
- <release>
- <version>3.0-b1</version>
- <tag>FULCRUM_3_0_B1</tag>
- </release>
</releases>
<mailingLists>
<mailingList>
@@ -54,6 +50,15 @@
<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>
@@ -89,15 +94,116 @@
<organization>CollabNet, Inc.</organization>
</developer>
<developer>
- <name>Quinton McCombs</name>
- <id>quintonm</id>
- <email>quintonm@bellsouth.net</email>
- <organization>NEqualsOne</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
+ <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>
+
+
+ <dependencies>
+
+ <!--
+ |
+ | Common compile-time dependencies for all the components.
+ |
+ -->
+
+ <dependency>
+ <id>avalon-framework</id>
+ <version>4.0</version>
+ </dependency>
+
+ <!-- omit this one for now
+ <dependency>
+ <id>plexus</id>
+ <version>0.2</version>
+ </dependency>
+ -->
+
+ <!--
+ |
+ | Common test-time dependencies for all the components.
+ |
+ -->
+
+ <!-- PlexusConfigurationHelper -->
+ <dependency>
+ <id>commons-lang</id>
+ <version>20030203.000129</version>
+ </dependency>
+
+ <!-- PlexusConfiguration Helper -->
+ <dependency>
+ <id>commons-io</id>
+ <version>20030203.000550</version>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ </dependency>
+
+ <!--
+ |
+ | Required for the componentmanifest generation.
+ |
+ -->
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4-dev</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-velocity</artifactId>
+ <version>20030211.144921</version>
+ </dependency>
+
+ </dependencies>
+
+ <!-- old dependencies - please do not remove until conversion is complete!
<dependencies>
<dependency>
<id>avalon-framework</id>
@@ -289,7 +395,7 @@
<url>http://xml.apache.org/xalan-j/</url>
</dependency>
<dependency>
- <id>xerces:xercesImpl</id>
+ <id>xerces:xercesImpl</id>
<version>2.0.2</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
@@ -325,52 +431,44 @@
</properties>
</dependency>
</dependencies>
+ -->
+
<build>
<nagEmailAddress>turbine-dev@jakarta.apache.org</nagEmailAddress>
- <sourceDirectory>target/src</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectories/>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/*Test*.java</include>
+ <include>**/*Test.java</include>
</includes>
- <excludes>
- <exclude>**/XmlRpcTest.java</exclude>
- </excludes>
- <resources>
- <!-- Used by HibernateServiceTest -->
- <resource>
- <directory>src/test/org/apache/fulcrum/db/</directory>
- <targetPath>org/apache/fulcrum/db/</targetPath>
- <includes>
- <include>Labor.*</include>
- <include>*.xml</include>
- </includes>
- </resource>
- <!-- Used by HibernateServiceTest -->
+
+ <resources>
<resource>
- <directory>src/test</directory>
- <targetPath></targetPath>
+ <directory>${basedir}/src/test</directory>
<includes>
- <include>hibernate.cfg.xml</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsd</include>
+ <include>**/*.vm</include>
</includes>
</resource>
</resources>
-
</unitTest>
<resources>
- <includes>
- <include>**/avalon-roles.xml</include>
- </includes>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/avalon-roles.xml</include>
+ </includes>
<excludes>
<exclude>**/hibernate.cfg.xml</exclude>
</excludes>
+ </resource>
</resources>
+
-
- <jars/>
</build>
<reports>
<!--
1.13 +126 -74 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 20 Mar 2003 16:44:38 -0000 1.12
+++ maven.xml 30 Apr 2003 16:26:28 -0000 1.13
@@ -1,90 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- default="java:jar"
+<project
+ default="build"
xmlns:j="jelly:core"
- xmlns:m="jelly:maven">
-
- <preGoal name="java:compile">
- <!-- Make sure avalon-roles.xml gets in the distribution. -->
- <copy
- file="src/java/org/apache/fulcrum/avalon-roles.xml"
- tofile="target/classes/org/apache/fulcrum/avalon-roles.xml"/>
-
- <!-- Copy the Intake DTD file to the distribution -->
- <copy file="src/dtd/intake.dtd"
- tofile="${maven.build.dest}/org/apache/fulcrum/intake/transform/intake.dtd"/>
-
- <!-- Setup where Torque generates the files to. -->
- <copy todir="target/src">
- <fileset dir="src/java"/>
- </copy>
+ xmlns:maven="jelly:maven"
+ xmlns:deploy="deploy"
+ xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary">
+
+ <!--
+ |
+ | Build all the Fulcrum components.
+ |
+ -->
+
+ <goal name="build">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="axis/*,summit/*"
+ goals="clean,java:jar,jar:install"
+ banner="Building"
+ ignoreFailures="false"
+ />
- <attainGoal name="scheduler-om"/>
- <attainGoal name="db-security-om"/>
-
- <!-- Hack for Maven bug when compiling with a clean target. -->
- <j:if test="${sourcesPresent != 'true'}">
- <j:set var="sourcesPresent" value="true"/>
- <path id="maven.compile.src.set" location="target/src"/>
- </j:if>
-
- </preGoal>
+ </goal>
- <!-- ================================================== -->
- <!-- Prepare the OM Sources for Torque -->
- <!-- ================================================== -->
- <goal name="copy-om">
- <attainGoal name="copy-scheduler-om"/>
- <attainGoal name="copy-db-security-om"/>
+ <!--
+ |
+ | Build docs for all the Fulcrum components.
+ |
+ -->
+
+ <goal name="site-all">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ goals="site:generate"
+ banner="Building"
+ ignoreFailures="false"
+ />
+ </goal>
+ <!--
+ |
+ | Deploy docs for all the Fulcrum components.
+ |
+ -->
+
+ <goal name="site-deploy-all">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ goals="site:deploy"
+ banner="Building"
+ ignoreFailures="false"
+ />
+ </goal>
+
+ <!--
+ |
+ | Deploy all the Fulcrum components and their POMs
+ | to the central repository.
+ |
+ -->
+
+ <goal name="deploy-poms">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ goals="pom:deploy"
+ banner="Building"
+ ignoreFailures="false"
+ />
</goal>
- <goal name="copy-scheduler-om">
- <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
- <filter token="EXTRA_USER_COLUMNS" value="${scheduler.extra.user.columns}"/>
- <copy
- file="src/schema/scheduler-schema.xml"
- tofile="${torque.schema.dir}/scheduler-schema.xml"
- filtering="yes"/>
+ <goal name="install-poms">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ goals="pom:install"
+ banner="Building"
+ ignoreFailures="false"
+ />
</goal>
- <goal name="copy-db-security-om">
- <filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
- <filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
- <copy
- file="src/schema/turbine-schema.xml"
- tofile="${torque.schema.dir}/turbine-schema.xml"
- filtering="yes"/>
+ <goal name="deploy-components">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ goals="jar:deploy"
+ banner="Building"
+ ignoreFailures="false"
+ />
</goal>
- <!-- ================================================== -->
- <!-- Build Peers for the Scheduler -->
- <!-- ================================================== -->
- <goal name="scheduler-om">
-
- <attainGoal name="copy-scheduler-om"/>
-
- <j:set var="torque.project" value="scheduler"/>
- <j:set var="torque.schema.om.includes" value="scheduler-schema.xml"/>
- <j:set var="torque.targetPackage" value="${scheduler.package}"/>
- <attainGoal name="torque:om"/>
+ <!--
+ |
+ | Create the list of components available for the
+ | Plexus plugin to use when aiding users in creating runtimes.
+ |
+ -->
+
+ <goal name="component-manifest">
+
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="jcs/*"
+ banner="Building"
+ ignoreFailures="false"
+ postProcessing="true"
+ />
+
+ <velocity:merge
+ name="${plexus.component.manifest}"
+ basedir="${basedir}"
+ template="component-manifest.vm"
+ />
</goal>
- <!-- ================================================== -->
- <!-- Build Peers for Torque Security -->
- <!-- ================================================== -->
- <goal name="db-security-om">
-
- <attainGoal name="copy-db-security-om"/>
-
- <j:set var="torque.project" value="security"/>
- <j:set var="torque.schema.om.includes" value="turbine-schema.xml"/>
- <j:set var="torque.targetPackage" value="${security.package}"/>
- <attainGoal name="torque:om"/>
+ <goal name="deploy-component-manifest" prereqs="component-manifest">
+ <deploy:artifact
+ artifact="${plexus.component.manifest}"
+ assureDirectoryCommand="mkdir -p"
+ />
+
</goal>
-
-
+
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org