You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2004/09/26 01:02:02 UTC
cvs commit: jakarta-jetspeed-2/components/profiler locator.ent project.xml
dlestrat 2004/09/25 16:02:02
Modified: components/registry locator.ent project.xml
components/rdbms locator.ent project.xml
components/profiler locator.ent project.xml
Removed: components/profiler/src/test OJB.properties repository.xml
log4j.properties repository.dtd
repository_internal.xml repository_database.xml
components/rdbms/src/test log4j.properties
Log:
See http://issues.apache.org/jira/browse/JS2-126
!!!! Please upgrade your build.properties as specified in the issue. !!!!
Add jetspeed2.home variable to build.properties.
Revision Changes Path
1.2 +10 -1 jakarta-jetspeed-2/components/registry/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:33:19 -0000 1.1
+++ locator.ent 25 Sep 2004 23:02:02 -0000 1.2
@@ -1 +1,10 @@
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
\ No newline at end of file
+<!-- Project dependencies -->
+<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
+
+<!-- Project resources -->
+<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
+<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
+
+<!-- Project reports -->
+<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.29 +17 -39 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 16 Aug 2004 18:28:29 -0000 1.28
+++ project.xml 25 Sep 2004 23:02:02 -0000 1.29
@@ -36,7 +36,11 @@
<shortDescription>Registry Components</shortDescription>
<dependencies>
+
&pico-nano-groovy;
+
+ &db-ojb-deps;
+
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -142,26 +146,7 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc6-PATCHED</version>
- </dependency>
- <!--
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc5-PATCHED</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>ojb</id>
- <version>1.0.rc4</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>-->
<dependency>
<id>commons-pool</id>
<version>1.2</version>
@@ -292,11 +277,16 @@
</excludes>
</resource>
<resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+
+ &db-ojb-resources;
+
+ &log4j-resources;
+
</resources>
</unitTest>
@@ -311,20 +301,8 @@
</build>
<reports>
- <report>maven-jdepend-plugin</report>
-<!--
- <report>maven-checkstyle-plugin</report>
--->
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jcoverage-plugin</report>
- <report>maven-linkcheck-plugin</report>
- <report>maven-tasklist-plugin</report>
+
+ &j2-reports;
+
</reports>
</project>
1.2 +5 -1 jakarta-jetspeed-2/components/rdbms/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:33:19 -0000 1.1
+++ locator.ent 25 Sep 2004 23:02:02 -0000 1.2
@@ -1 +1,5 @@
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
\ No newline at end of file
+<!-- Project dependencies -->
+<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
+
+<!-- Project reports -->
+<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.10 +3 -15 jakarta-jetspeed-2/components/rdbms/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 11 Jul 2004 03:24:48 -0000 1.9
+++ project.xml 25 Sep 2004 23:02:02 -0000 1.10
@@ -145,20 +145,8 @@
</build>
<reports>
- <report>maven-jdepend-plugin</report>
-<!--
- <report>maven-checkstyle-plugin</report>
--->
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jcoverage-plugin</report>
- <report>maven-linkcheck-plugin</report>
- <report>maven-tasklist-plugin</report>
+
+ &j2-reports;
+
</reports>
</project>
1.2 +10 -1 jakarta-jetspeed-2/components/profiler/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 17 Sep 2004 20:03:23 -0000 1.1
+++ locator.ent 25 Sep 2004 23:02:02 -0000 1.2
@@ -1 +1,10 @@
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
\ No newline at end of file
+<!-- Project dependencies -->
+<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
+
+<!-- Project resources -->
+<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
+<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
+
+<!-- Project reports -->
+<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.3 +20 -26 jakarta-jetspeed-2/components/profiler/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 17 Sep 2004 20:03:23 -0000 1.2
+++ project.xml 25 Sep 2004 23:02:02 -0000 1.3
@@ -35,8 +35,12 @@
</repository>
<shortDescription>Profiler</shortDescription>
- <dependencies>
+ <dependencies>
+
&pico-nano-groovy;
+
+ &db-ojb-deps;
+
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
@@ -114,10 +118,7 @@
<id>jta</id>
<jar>jta1.0.1.jar</jar>
</dependency>
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc6-PATCHED</version>
- </dependency>
+
<dependency>
<id>commons-pool</id>
<version>1.2</version>
@@ -193,12 +194,17 @@
</excludes>
</resource>
<resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>**/META-INF/**</exclude>
- </excludes>
- </resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/META-INF/**</exclude>
+ </excludes>
+ </resource>
+
+ &db-ojb-resources;
+
+ &log4j-resources;
+
</resources>
</unitTest>
@@ -213,20 +219,8 @@
</build>
<reports>
- <report>maven-jdepend-plugin</report>
-<!--
- <report>maven-checkstyle-plugin</report>
--->
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jcoverage-plugin</report>
- <report>maven-linkcheck-plugin</report>
- <report>maven-tasklist-plugin</report>
+
+ &j2-reports;
+
</reports>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org