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/09/09 18:24:02 UTC
cvs commit: jakarta-turbine-fulcrum/testcontainer project.xml
epugh 2003/09/09 09:24:02
Modified: . maven.xml project.properties project.xml
testcontainer project.xml
Log:
Fixed up the builds so that each component copies over the .xml resouces and other files it needs.
Revision Changes Path
1.15 +1 -1 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 16 Aug 2003 02:57:01 -0000 1.14
+++ maven.xml 9 Sep 2003 16:24:02 -0000 1.15
@@ -1,5 +1,5 @@
<project
- default="build"
+ default="multiproject:artifact"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
1.14 +9 -26 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.properties 27 Aug 2003 09:41:00 -0000 1.13
+++ project.properties 9 Sep 2003 16:24:02 -0000 1.14
@@ -1,3 +1,11 @@
+#========================================================================
+# You can uncomment this if you're willing to use the unofficial
+# Turbine-specific jar repository at the Turbine site. This will
+# contain all the jars needed to build Fulcrum, even if a jar
+# is missing on ibiblio
+#========================================================================
+#maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
+
maven.checkstyle.format = turbine
maven.checkstyle.properties = ${basedir}/project.properties
maven.compile.deprecation = no
@@ -6,36 +14,11 @@
maven.xdoc.date = left
# -------------------------------------------------------------------
-#
-# T O R Q U E C O N F I G U R A T I O N
-#
-# used to generate the om/peer classes for the security db
-# implementation and scheduler
-#
-# -------------------------------------------------------------------
-
-torque.database = mysql
-torque.java.dir = target/src
-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
-scheduler.package = org.apache.fulcrum.schedule
-
-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
# -------------------------------------------------------------------
maven.junit.usefile=true
maven.junit.fork=true
+maven.test.failure.ignore=true
# -------------------------------------------------------------------
# M U L T I P R O J E C T S E T T I N G S
1.72 +10 -38 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- project.xml 27 Aug 2003 09:41:00 -0000 1.71
+++ project.xml 9 Sep 2003 16:24:02 -0000 1.72
@@ -70,7 +70,7 @@
<email>mpoeschl@marmot.at</email>
<organization>Tucana</organization>
</developer>
- <developer>
+ <developer>
<name>Eric Pugh</name>
<id>epugh</id>
<email>epugh@upstate.com</email>
@@ -180,7 +180,8 @@
<dependency>
<id>log4j</id>
- <version>1.2.6</version>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
@@ -293,7 +294,7 @@
</dependency>
<dependency>
<id>cglib</id>
- <jar>cglib.jar</jar>
+ <jar>cglib.jar</jar>
<url>http://cglib.sf.net/</url>
</dependency>
<dependency>
@@ -463,44 +464,15 @@
</dependency>
</dependencies>
-->
-
- <build>
+
+ <build>
<nagEmailAddress>turbine-dev@jakarta.apache.org</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java/OFF</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test/OFF</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsd</include>
- <include>**/*.vm</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <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>
-
+ <sourceDirectory>${basedir}/src/java/</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test/</unitTestSourceDirectory>
+
</build>
-
+
<reports>
<report>maven-jdepend-plugin</report>
1.2 +16 -0 jakarta-turbine-fulcrum/testcontainer/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/testcontainer/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 1 May 2003 17:29:37 -0000 1.1
+++ project.xml 9 Sep 2003 16:24:02 -0000 1.2
@@ -14,5 +14,21 @@
</dependencies>
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
+
</project>