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:01:20 UTC
cvs commit: jakarta-jetspeed-2/components/file-cache locator.ent project.xml
dlestrat 2004/09/25 16:01:20
Modified: components/portlet-factory project.xml
components/capability project.xml locator.ent
components/prefs locator.ent project.xml
components/id-generator project.xml locator.ent
components/locator project.xml locator.ent
components/page-manager project.xml locator.ent
components/cm locator.ent project.xml
components/persistence project.xml locator.ent
components/jetspeed project.xml locator.ent
components/file-cache locator.ent project.xml
Added: components/portlet-factory locator.ent
Removed: components/capability/src/test repository_database.xml
repository.xml repository.dtd log4j.properties
OJB.properties repository_internal.xml
components/persistence/src/test repository.xml
repository.dtd log4j.properties
repository_internal.xml OJB.properties
repository_database.xml
components/page-manager/src/test repository_internal.xml
log4j.properties OJB.properties
repository_database.xml repository.xml
repository.dtd
components/prefs/src/test repository.dtd repository.xml
OJB.properties repository_database.xml
log4j.properties repository_internal.xml
components/cm/src/test Log4j.properties
components/file-cache/src/test log4j.properties
components/id-generator/src/test log4j.properties
components/locator/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 +8 -15 jakarta-jetspeed-2/components/portlet-factory/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/portlet-factory/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 16 Aug 2004 18:27:19 -0000 1.1
+++ project.xml 25 Sep 2004 23:01:19 -0000 1.2
@@ -1,3 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
+
<!--
Copyright 2004 The Apache Software Foundation
@@ -114,20 +119,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.1 jakarta-jetspeed-2/components/portlet-factory/locator.ent
Index: locator.ent
===================================================================
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.8 +24 -29 jakarta-jetspeed-2/components/capability/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Jul 2004 03:21:19 -0000 1.7
+++ project.xml 25 Sep 2004 23:01:19 -0000 1.8
@@ -37,8 +37,12 @@
</repository>
<shortDescription>Capability Components</shortDescription>
- <dependencies>
+ <dependencies>
+
&pico-nano-groovy;
+
+ &db-ojb-deps;
+
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
@@ -108,10 +112,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>
@@ -147,10 +148,11 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
-
-
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
<unitTest>
+ <excludes>
+ <exclude>**/TestCapability.java </exclude >
+ </excludes>
<resources>
<resource>
<directory>${basedir}/src/test</directory>
@@ -159,12 +161,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>
@@ -179,20 +186,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/capability/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:28:40 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:19 -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">
1.2 +10 -1 jakarta-jetspeed-2/components/prefs/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/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:01:19 -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.19 +18 -27 jakarta-jetspeed-2/components/prefs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 11 Jul 2004 03:24:29 -0000 1.18
+++ project.xml 25 Sep 2004 23:01:19 -0000 1.19
@@ -35,7 +35,11 @@
</repository>
<dependencies>
+
&pico-nano-groovy;
+
+ &db-ojb-deps;
+
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -126,13 +130,7 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc6-PATCHED</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
+
<dependency>
<id>commons-pool</id>
<version>1.2</version>
@@ -224,11 +222,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>
@@ -243,20 +246,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.6 +95 -104 jakarta-jetspeed-2/components/id-generator/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 11 Jul 2004 03:22:43 -0000 1.5
+++ project.xml 25 Sep 2004 23:01:19 -0000 1.6
@@ -1,107 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<project>
-<extend>${basedir}/../../project.xml</extend>
- <pomVersion>3</pomVersion>
- <id>jetspeed-id-generator</id>
- <groupId>jetspeed2</groupId>
- <name>Jetspeed-2 ID Generator</name>
- <currentVersion>2.0-a1-dev</currentVersion>
- <package>org.apache.jetspeed</package>
- <description>
- Jetspeed ID Generator
- </description>
- <shortDescription>ID Generator</shortDescription>
-
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
- <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
- </repository>
-
- <dependencies>
- &pico-nano-groovy;
- <dependency>
- <id>jetspeed2:jetspeed-commons</id>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>jetspeed2:jetspeed-api</id>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>y>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </unitTest>
-
- </build>
-
- <reports>
- <report>maven-jdepend-plugin</report>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
<!--
- <report>maven-checkstyle-plugin</report>
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
-->
- <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>
+<project>
+<extend>${basedir}/../../project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed-id-generator</id>
+ <groupId>jetspeed2</groupId>
+ <name>Jetspeed-2 ID Generator</name>
+ <currentVersion>2.0-a1-dev</currentVersion>
+ <package>org.apache.jetspeed</package>
+ <description>
+ Jetspeed ID Generator
+ </description>
+ <shortDescription>ID Generator</shortDescription>
+
+ <repository>
+ <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
+ </repository>
+
+ <dependencies>
+ &pico-nano-groovy;
+ <dependency>
+ <id>jetspeed2:jetspeed-commons</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed2:jetspeed-api</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>y>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+
+ &log4j-resources;
+
+ </resources>
+ </unitTest>
+
+ </build>
+
+ <reports>
+
+ &j2-reports;
+
</reports>
-</project>
+</project>
1.2 +8 -1 jakarta-jetspeed-2/components/id-generator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:31:58 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:19 -0000 1.2
@@ -1 +1,8 @@
-<!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 resources -->
+<!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.6 +96 -105 jakarta-jetspeed-2/components/locator/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 11 Jul 2004 03:23:22 -0000 1.5
+++ project.xml 25 Sep 2004 23:01:19 -0000 1.6
@@ -1,108 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<project>
-<extend>${basedir}/../../project.xml</extend>
- <pomVersion>3</pomVersion>
- <id>jetspeed-locator</id>
- <groupId>jetspeed2</groupId>
- <name>Jetspeed-2 Template Locator</name>
- <currentVersion>2.0-a1-dev</currentVersion>
- <package>org.apache.jetspeed</package>
- <description>
- Jetspeed Locator provides a transparent mechanism to locate resources
- on the file system.
- </description>
- <shortDescription>Helps locate resources on the file system.</shortDescription>
-
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
- <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
- </repository>
-
- <dependencies>
- &pico-nano-groovy;
- <dependency>
- <id>jetspeed2:jetspeed-commons</id>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>jetspeed2:jetspeed-api</id>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </unitTest>
-
- </build>
-
- <reports>
- <report>maven-jdepend-plugin</report>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
<!--
- <report>maven-checkstyle-plugin</report>
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
-->
- <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>
+<project>
+<extend>${basedir}/../../project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed-locator</id>
+ <groupId>jetspeed2</groupId>
+ <name>Jetspeed-2 Template Locator</name>
+ <currentVersion>2.0-a1-dev</currentVersion>
+ <package>org.apache.jetspeed</package>
+ <description>
+ Jetspeed Locator provides a transparent mechanism to locate resources
+ on the file system.
+ </description>
+ <shortDescription>Helps locate resources on the file system.</shortDescription>
+
+ <repository>
+ <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
+ </repository>
+
+ <dependencies>
+ &pico-nano-groovy;
+ <dependency>
+ <id>jetspeed2:jetspeed-commons</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed2:jetspeed-api</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <excludes>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+
+ &log4j-resources;
+
+ </resources>
+ </unitTest>
+
+ </build>
+
+ <reports>
+
+ &j2-reports;
+
</reports>
-</project>
+</project>
1.2 +8 -1 jakarta-jetspeed-2/components/locator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:32:37 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:19 -0000 1.2
@@ -1 +1,8 @@
-<!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 resources -->
+<!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.10 +20 -26 jakarta-jetspeed-2/components/page-manager/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 17 Sep 2004 20:01:04 -0000 1.9
+++ project.xml 25 Sep 2004 23:01:20 -0000 1.10
@@ -35,8 +35,12 @@
</repository>
<shortDescription>Page Manager</shortDescription>
- <dependencies>
+ <dependencies>
+
&pico-nano-groovy;
+
+ &db-ojb-deps;
+
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
@@ -126,10 +130,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>
@@ -205,12 +206,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>
@@ -225,20 +231,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/page-manager/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/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:01:20 -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">
1.2 +8 -1 jakarta-jetspeed-2/components/cm/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:28:52 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:20 -0000 1.2
@@ -1 +1,8 @@
-<!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 resources -->
+<!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.13 +6 -15 jakarta-jetspeed-2/components/cm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 1 Aug 2004 15:38:50 -0000 1.12
+++ project.xml 25 Sep 2004 23:01:20 -0000 1.13
@@ -93,6 +93,9 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+
+ &log4j-resources;
+
</resources>
</unitTest>
@@ -108,20 +111,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.25 +14 -22 jakarta-jetspeed-2/components/persistence/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 11 Jul 2004 03:24:10 -0000 1.24
+++ project.xml 25 Sep 2004 23:01:20 -0000 1.25
@@ -35,8 +35,12 @@
</repository>
<dependencies>
+
&pico-nano-groovy;
- <dependency>
+
+ &db-ojb-deps;
+
+ <dependency>
<id>jetspeed-commons</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
@@ -86,11 +90,8 @@
<id>commons-io</id>
<version>0.1</version>
</dependency>
+
<dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc6-PATCHED</version>
- </dependency>
- <dependency>
<id>commons-pool</id>
<version>1.2</version>
</dependency>
@@ -126,7 +127,6 @@
<jar>jta1.0.1.jar</jar>
</dependency>
<dependency>
- <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
<version>1.0</version>
</dependency>
@@ -165,9 +165,13 @@
<directory>${basedir}/src/test</directory>
<excludes>
<exclude>**/*.java</exclude>
- <exclude>repository_database.xml</exclude>
</excludes>
</resource>
+
+ &db-ojb-resources;
+
+ &log4j-resources;
+
</resources>
</unitTest>
@@ -182,20 +186,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/persistence/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/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:01:20 -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.11 +3 -15 jakarta-jetspeed-2/components/jetspeed/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 11 Jul 2004 03:23:02 -0000 1.10
+++ project.xml 25 Sep 2004 23:01:20 -0000 1.11
@@ -118,20 +118,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/jetspeed/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:32:11 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:20 -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.2 +8 -1 jakarta-jetspeed-2/components/file-cache/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 23 Jun 2004 18:31:43 -0000 1.1
+++ locator.ent 25 Sep 2004 23:01:20 -0000 1.2
@@ -1 +1,8 @@
-<!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 resources -->
+<!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.8 +7 -16 jakarta-jetspeed-2/components/file-cache/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Jul 2004 03:22:23 -0000 1.7
+++ project.xml 25 Sep 2004 23:01:20 -0000 1.8
@@ -79,7 +79,7 @@
</resources>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
- <includes>
+ <includes>
<include>**/Test*.java</include>
</includes>
<excludes>
@@ -91,26 +91,17 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+
+ &log4j-resources;
+
</resources>
</unitTest>
</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