paulsp 2004/04/02 19:49:47
Modified: portal project.properties project.xml
portal/xdocs navigation.xml
Log:
Support for multiproject build
Revision Changes Path
1.10 +7 -5 jakarta-jetspeed-2/portal/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.properties 23 Mar 2004 03:08:13 -0000 1.9
+++ project.properties 3 Apr 2004 03:49:46 -0000 1.10
@@ -34,6 +34,13 @@
# Include private method and field in Javadoc.
maven.javadoc.private=true
+# Removed the rule ${plugin.resources}/rulesets/naming.xml from the default
+# maven.pmd.rulesetfiles. This is because the LongVariableName rule is to
+# restrictive. We need to increase the limit from 12 to 20
+maven.pmd.rulesetfiles=${plugin.resources}/rulesets/strings.xml,${plugin.resources}/rulesets/junit.xml,${plugin.resources}/rulesets/braces.xml,${plugin.resources}/rulesets/basic.xml,${plugin.resources}/rulesets/unusedcode.xml,${plugin.resources}/rulesets/design.xml,${plugin.resources}/rulesets/imports.xml,${plugin.resources}/rulesets/codesize.xml
+
+maven.multiproject.type=war
+
# Sets up the system properties for the test JDBC datasource
maven.junit.sysproperties=org.apache.jetspeed.database.url \
org.apache.jetspeed.database.driver \
@@ -52,11 +59,6 @@
database.default.name=hsql
-
-# Removed the rule ${plugin.resources}/rulesets/naming.xml from the default
-# maven.pmd.rulesetfiles. This is because the LongVariableName rule is to
-# restrictive. We need to increase the limit from 12 to 20
-maven.pmd.rulesetfiles=${plugin.resources}/rulesets/strings.xml,${plugin.resources}/rulesets/junit.xml,${plugin.resources}/rulesets/braces.xml,${plugin.resources}/rulesets/basic.xml,${plugin.resources}/rulesets/unusedcode.xml,${plugin.resources}/rulesets/design.xml,${plugin.resources}/rulesets/imports.xml,${plugin.resources}/rulesets/codesize.xml
deploy.war.dir=/apache/tomcat5/webapps
webapp.name=jetspeed
1.55 +17 -12 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- project.xml 30 Mar 2004 22:06:59 -0000 1.54
+++ project.xml 3 Apr 2004 03:49:46 -0000 1.55
@@ -15,17 +15,20 @@
limitations under the License.
-->
<project>
-<!-- <extend>${basedir}/../project.xml</extend> -->
+ <extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<id>jetspeed</id>
- <groupId>jetspeed2</groupId>
<name>Jetspeed-2 Portal Engine</name>
- <currentVersion>2.0-a1-dev</currentVersion>
- <package>org.apache.jetspeed</package>
<description>
Portlet content is aggregated into one page by this engine.
</description>
<shortDescription>Portal Aggregation Engine</shortDescription>
+
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/portal</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/</url>
+ </repository>
+
<dependencies>
<dependency>
<id>jetspeed-cps</id>
@@ -412,13 +415,13 @@
</properties>
</dependency>
<dependency>
- <id>velocity-tools:velocity-tools-view</id>
- <version>1.1-beta1</version>
- <url>http://jakarta.apache.org/velocity</url>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+ <id>velocity-tools:velocity-tools-view</id>
+ <version>1.1-beta1</version>
+ <url>http://jakarta.apache.org/velocity</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
<dependency>
<id>mockrunner</id>
<version>0.2.7</version>
@@ -471,7 +474,9 @@
</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>
@@ -482,6 +487,6 @@
<report>maven-junit-report-plugin</report>
<report>maven-linkcheck-plugin</report>
<report>maven-tasklist-plugin</report>
- </reports>
+ </reports>
</project>
1.3 +1 -1 jakarta-jetspeed-2/portal/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 18 Mar 2004 15:47:43 -0000 1.2
+++ navigation.xml 3 Apr 2004 03:49:46 -0000 1.3
@@ -17,7 +17,7 @@
<project>
<body>
<links>
- <item name="Jetspeed 2 Home" href="../../../site/target/docs/index.html"/>
+ <item name="Jetspeed 2" href="../../index.html"/>
</links>
<menu name="Misc.">
<item name="Tasks" href="tasks.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
