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 at...@apache.org on 2004/06/21 17:19:34 UTC
cvs commit: jakarta-jetspeed-2/cornerstone project.properties
ate 2004/06/21 08:19:34
Modified: content-server maven.xml
. build.properties.sample checkstyle.xml maven.xml
project.properties
components/security maven.xml
components/jetspeed maven.xml
applications/demo maven.xml project.properties
struts-portlet/spi project.xml
components/persistence maven.xml
maven-plugin plugin.properties project.xml
struts-portlet/demo project.properties project.xml
components/id-generator maven.xml
components/registry maven.xml
components/cm maven.xml
applications/pam project.properties maven.xml
components/locator maven.xml
components/prefs maven.xml
components/file-cache maven.xml
cornerstone-jmx project.properties
jetspeed-api maven.xml
components/rdbms maven.xml
portal project.properties maven.xml
applications/security project.properties maven.xml
site maven.xml
site/xdocs getting-started.xml
components/capability maven.xml
commons maven.xml
cornerstone-demo project.properties
struts-portlet/framework project.xml
cps project.properties maven.xml
components/page-manager maven.xml
portal/src/webapp/WEB-INF/conf jetspeed.properties
archives/ApachePortals project.properties
design-docs project.properties
cornerstone-jmx-demo project.properties
layout-portlets project.properties
cornerstone project.properties
Removed: content-server project.properties
components/security project.properties
components/jetspeed project.properties
struts-portlet/spi maven.xml project.properties
components/persistence project.properties
maven-plugin project.properties
struts-portlet/demo web-app_2_3.dtd maven.xml
struts-portlet checkstyle.license checkstyle.xml .encoding
.classpath project.xml LICENSE.TXT .project
maven.xml project.properties
components/id-generator project.properties
components/registry project.properties
components/cm project.properties
components/locator project.properties
components/prefs project.properties
components/file-cache project.properties
jetspeed-api project.properties
components/rdbms project.properties
site project.properties
components/capability project.properties
commons project.properties
struts-portlet/framework project.properties maven.xml
components/page-manager project.properties
applications project.properties
struts-portlet/demo/sql remove-entities.sql
create-entities.sql
Log:
- moved to maven-1.0-rc3 and cleaned up maven properties using project properties inheritance.
- normalized public J2 configuration properties and ensured all have now a reverse url prefix
- fixed a few Apache 2.0 license headers
- removed obsolete files
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +1 -1 jakarta-jetspeed-2/content-server/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/content-server/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 18 Mar 2004 14:39:06 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:31 -0000 1.3
@@ -23,7 +23,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.2 +9 -6 jakarta-jetspeed-2/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 29 Apr 2004 02:55:04 -0000 1.1
+++ build.properties.sample 21 Jun 2004 15:19:31 -0000 1.2
@@ -1,7 +1,10 @@
-catalina.home=/portal/tomcat/jetspeed
-catalina.shared.lib=/portal/tomcat/jetspeed/shared/lib
-deploy.war.dir=/portal/tomcat/jetspeed/webapps
-maven.repo.remote=http://www.bluesunrise.com/maven,http://www.ibiblio.org/maven
+# jetspeed required properties
+org.apache.jetspeed.server.home = /tomcat4
+org.apache.jetspeed.catalina.version.major = 4
+org.apache.jetspeed.server.shared = ${org.apache.jetspeed.server.home}/shared/lib
+org.apache.jetspeed.deploy.war.dir = ${org.apache.jetspeed.server.home}/webapps
+org.apache.jetspeed.services.autodeployment.user = j2deployer
+org.apache.jetspeed.services.autodeployment.password = j2deployer
# jetspeed db build properties
org.apache.jetspeed.test.database.url = jdbc:oracle:thin:@localhost:1521:orcl
@@ -10,7 +13,7 @@
org.apache.jetspeed.test.database.user = j2t
org.apache.jetspeed.test.database.password =j2t
-org.apache.jetspeed.test.jdbc.drivers.path=/portal/lib/p6spy/p6spy-1.3-patched.jar;/Portal/lib/oracle/ojdbc14.jar;/Portal/lib/oracle/nls_charset12.jar
+org.apache.jetspeed.test.jdbc.drivers.path=/portal/lib/p6spy/p6spy-1.3-patched.jar;/portal/lib/oracle/ojdbc14.jar;/portal/lib/oracle/nls_charset12.jar
org.apache.jetspeed.test.database.default.name=oracle
org.apache.jetspeed.test.database.ojb.platform=oracle9i
@@ -20,7 +23,7 @@
org.apache.jetspeed.production.database.user = j2p
org.apache.jetspeed.production.database.password =j2p
-org.apache.jetspeed.production.jdbc.drivers.path=c:/Portal/lib/p6spy/p6spy-1.3-patched.jar;/Portal/lib/oracle/ojdbc14.jar;/Portal/lib/oracle/nls_charset12.jar
+org.apache.jetspeed.production.jdbc.drivers.path=c:/portal/lib/p6spy/p6spy-1.3-patched.jar;/portal/lib/oracle/ojdbc14.jar;/portal/lib/oracle/nls_charset12.jar
org.apache.jetspeed.production.database.default.name=oracle
org.apache.jetspeed.production.database.ojb.platform=oracle9i
p6.home=/eclipse/workspace/jetspeed-2
1.3 +2 -0 jakarta-jetspeed-2/checkstyle.xml
Index: checkstyle.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/checkstyle.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checkstyle.xml 18 Mar 2004 15:46:54 -0000 1.2
+++ checkstyle.xml 21 Jun 2004 15:19:31 -0000 1.3
@@ -29,7 +29,9 @@
<module name="FileLength"/>
<module name="RegexpHeader">
<property name="headerFile" value="${checkstyle.header.file}"/>
+ <!-- invalid property
<property name="ignoreLines" value="4"/>
+ -->
</module>
<module name="LineLength">
<property name="ignorePattern" value="(@version|@see|^import)"/>
1.81 +89 -21 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- maven.xml 21 Jun 2004 13:08:10 -0000 1.80
+++ maven.xml 21 Jun 2004 15:19:31 -0000 1.81
@@ -18,6 +18,59 @@
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
+ <goal name="_findProjectFile">
+ <j:set var="_projectFileFound" value="false"/>
+ <j:set var="_projectFile" value=""/>
+ <j:set var="myPom" value="${pom}"/>
+ <j:while test="${myPom!=null}">
+ <j:set var="pomDir" value="${myPom.file.parent}"/>
+ <j:new var="file" className="java.io.File">
+ <j:arg value="${pomDir}/${_findProjectFile}"/>
+ </j:new>
+ <j:if test="${file.exists()}">
+ <j:set var="_projectFile" value="${file}"/>
+ <j:set var="_projectFileFound" value="true"/>
+ <j:break/>
+ </j:if>
+ <j:set var="myPom" value="${myPom.parent}"/>
+ </j:while>
+ </goal>
+
+ <goal name="set.checkstyle.properties">
+
+ <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.header.file}"/>
+ <attainGoal name="_findProjectFile"/>
+ <j:if test="${!_projectFileFound}">
+ <fail message="org.apache.jetspeed.checkstyle.header.file ${org.apache.jetspeed.checkstyle.header.file} not found in the project tree"/>
+ </j:if>
+ <j:set var="maven.checkstyle.header.file" value="${_projectFile.absolutePath}"/>
+ <echo message="using maven.checkstyle.header.file ${maven.checkstyle.header.file}"/>
+
+ <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.properties}"/>
+ <attainGoal name="_findProjectFile"/>
+ <j:if test="${!_projectFileFound}">
+ <fail message="org.apache.jetspeed.checkstyle.properties ${org.apache.jetspeed.checkstyle.properties} not found in the project tree"/>
+ </j:if>
+ <j:set var="maven.checkstyle.properties" value="${_projectFile.absolutePath}"/>
+ <echo message="using maven.checkstyle.properties ${maven.checkstyle.properties}"/>
+ </goal>
+
+ <goal name="set.license.properties">
+
+ <j:set var="_findProjectFile" value="${org.apache.jetspeed.license.licenseFile}"/>
+ <attainGoal name="_findProjectFile"/>
+ <j:if test="${!_projectFileFound}">
+ <fail message="org.apache.jetspeed.license.licenseFile ${org.apache.jetspeed.license.licenseFile} not found in the project tree"/>
+ </j:if>
+ <j:set var="maven.license.licenseFile" value="${_projectFile.absolutePath}"/>
+ <echo message="using maven.license.licenseFile ${maven.license.licenseFile}"/>
+
+ </goal>
+
+ <preGoal name="checkstyle:init">
+ <attainGoal name="set.checkstyle.properties"/>
+ <attainGoal name="set.license.properties"/>
+ </preGoal>
<goal name="allClean"
description="Clean the master project and all subprojects">
@@ -76,10 +129,17 @@
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
- basedir="${basedir}/struts-portlet"
+ basedir="${basedir}/struts-portlet/spi"
includes="project.xml"
- goals="install"
- banner="Build and Install the common jar"
+ goals="jar:install"
+ banner="Build and Install the Struts Portlet SPI jar"
+ postProcessing="false"
+ ignoreFailures="false"/>
+ <maven:reactor
+ basedir="${basedir}/struts-portlet/framework"
+ includes="project.xml"
+ goals="jar:install"
+ banner="Build and Install the Struts Portlet jar"
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
@@ -149,7 +209,7 @@
basedir="${basedir}/components/registry"
includes="project.xml"
goals="jar:install"
- banner="Build and Install the Regsitry Components jar"
+ banner="Build and Install the Registry Components jar"
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
@@ -535,19 +595,25 @@
<j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
<j:if test="${!pom.id.equals('jetspeed2:jetspeed')}">
- <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
- <filterset begintoken="@" endtoken="@">
- <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
- </filterset>
- </copy>
+ <available property="_found" file="src/test/repository_database.xml"/>
+ <j:if test="${_found}">
+ <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+ </filterset>
+ </copy>
+ </j:if>
</j:if>
<j:if test="${pom.id.equals('jetspeed2:jetspeed')}">
- <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
- <filterset begintoken="@" endtoken="@">
- <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
- </filterset>
- </copy>
+ <available property="_found" file="src/java/repository_database.xml"/>
+ <j:if test="${_found}">
+ <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+ </filterset>
+ </copy>
+ </j:if>
</j:if>
<path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
@@ -556,21 +622,23 @@
<goal name="check.required.properties"
description="Check if the required properties are defined">
- <fail message="Required property catalina.home undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="catalina.home"/>
- <fail message="Required property catalina.version.major undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="catalina.version.major"/>
- <fail message="Required property catalina.shared.lib undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="catalina.shared.lib"/>
- <fail message="Required property deploy.war.dir undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="deploy.war.dir"/>
+ <fail message="Required property org.apache.jetspeed.server.home undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.server.home"/>
+ <fail message="Required property org.apache.jetspeed.catalina.version.major undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.catalina.version.major"/>
+ <fail message="Required property org.apache.jetspeed.server.shared undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.server.shared"/>
+ <fail message="Required property org.apache.jetspeed.deploy.war.dir undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.deploy.war.dir"/>
+ <fail message="Required property org.apache.jetspeed.services.autodeployment.user undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.services.autodeployment.user"/>
+ <fail message="Required property org.apache.jetspeed.services.autodeployment.password undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.services.autodeployment.password"/>
</goal>
<goal name="check.patch.tomcat5.jaas.realm"
description="Check if the Tomcat5 JAASRealm patch is needed">
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:if test="${catalina_version_major == '5'}">
- <mkdir dir="${catalina.home}/server/classes"/>
- <javac srcdir="src/tomcat5-jaas-patch" destdir="${catalina.home}/server/classes">
+ <mkdir dir="${org.apache.jetspeed.server.home}/server/classes"/>
+ <javac srcdir="src/tomcat5-jaas-patch" destdir="${org.apache.jetspeed.server.home}/server/classes">
<classpath>
<path refid="maven.dependency.classpath"/>
- <fileset dir="${catalina.home}/server/lib">
+ <fileset dir="${org.apache.jetspeed.server.home}/server/lib">
<include name="**/*.jar"/>
</fileset>
</classpath>
1.17 +55 -24 jakarta-jetspeed-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.properties 29 Apr 2004 02:55:04 -0000 1.16
+++ project.properties 21 Jun 2004 15:19:32 -0000 1.17
@@ -12,24 +12,53 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+
# Display the date on the Maven web site
maven.xdoc.date = left
# Display the maven version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
-# The following MUST be defined in the user's build.properties
-# catalina.shared.lib = <tomcat_home>/shared/lib/
+maven.compile.deprecation=on
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.junit.fork=true
+maven.compile.fork=yes
-maven.checkstyle.header.file=${basedir}/checkstyle.license
-maven.checkstyle.properties=${basedir}/checkstyle.xml
+# Include private method and field in Javadoc.
+maven.javadoc.private=true
-maven.compile.deprecation=on
+# 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.license.licenseFile=${basedir}/LICENSE.TXT
-maven.junit.fork=true
+# ---------------------------------------------------------------------------
+# Torque settings
+torque.project = portal
+torque.schema.sql.includes = *-schema.xml
+torque.schema.sql.excludes =
+torque.schema.dir = ${maven.src.dir}/schema
+torque.idTableXMLFile =
+torque.template.sql = sql/base/Control.vm
+
+# ---------------------------------------------------------------------------
+# Multiproject settings
+maven.multiproject.includes=*/project.xml,components/*/project.xml,applications/*/project.xml,struts-portlet/*/project.xml
+maven.multiproject.excludes=project.xml,applications/project.xml,cornerstone*/project.xml,portlet-api/project.xml,design-docs/project.xml,site/project.xml
+
+#----------------------------------------------------------------------------
+# Jetspeed 2 internal build and deploy properties
+
+org.apache.jetspeed.portal.name=jetspeed
+
+# Jetspeed 2 checkstyle and license properties
+# These are use to dynamically set checkstyle and license properties also for subprojects
+# without needing them to be defined there as well (or through relative path references).
+# The files are looked up in the subproject or, when not found, upwards in the parent project(s).
+org.apache.jetspeed.checkstyle.header.file=checkstyle.license
+org.apache.jetspeed.checkstyle.properties=checkstyle.xml
+org.apache.jetspeed.license.licenseFile=LICENSE.TXT
# Sets up the system properties for the test JDBC datasource
maven.junit.sysproperties=org.apache.jetspeed.database.url \
@@ -37,6 +66,24 @@
org.apache.jetspeed.database.user \
org.apache.jetspeed.database.password
+#----------------------------------------------------------------------------
+# Jetspeed 2 build and deploy configuration properties
+#
+# The following MUST be defined in the build.properties
+# See:
+# http://portals.apache.org/jetspeed-2/getting-started.html
+
+#org.apache.jetspeed.server.home = /jakarta-tomcat-4.1.30
+#org.apache.jetspeed.catalina.version.major = 4
+#org.apache.jetspeed.server.shared = ${org.apache.jetspeed.server.home}/shared/lib
+#org.apache.jetspeed.deploy.war.dir = ${org.apache.jetspeed.server.home}/webapps
+#org.apache.jetspeed.services.autodeployment.user = <username>
+#org.apache.jetspeed.services.autodeployment.password = <password>
+
+# Override the database connection and driverproperties in your ${USER_HOME}/build.properties appropriately
+# See:
+# http://portals.apache.org/jetspeed-2/database.html
+
org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
org.apache.jetspeed.test.database.user = sa
@@ -54,19 +101,3 @@
org.apache.jetspeed.production.jdbc.drivers.path=
org.apache.jetspeed.production.database.default.name=hsql
org.apache.jetspeed.production.database.ojb.platform=Hsqldb
-
-# ---------------------------------------------------------------------------
-# Torque settings
-torque.project = portal
-torque.schema.sql.includes = *-schema.xml
-torque.schema.sql.excludes =
-torque.schema.dir = ${maven.src.dir}/schema
-torque.idTableXMLFile =
-torque.template.sql = sql/base/Control.vm
-
-# ---------------------------------------------------------------------------
-# Multiproject settings
-maven.multiproject.includes=*/project.xml,components/*/project.xml,applications/*/project.xml
-maven.multiproject.excludes=project.xml,applications/project.xml,cornerstone*/project.xml,plugin/project.xml,portlet-api/project.xml,design-docs/project.xml,site/project.xml
-
-
1.9 +1 -1 jakarta-jetspeed-2/components/security/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 23 May 2004 21:23:39 -0000 1.8
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.9
@@ -25,7 +25,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
1.6 +1 -1 jakarta-jetspeed-2/components/jetspeed/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 29 Apr 2004 02:11:18 -0000 1.5
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.6
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
<preGoal name="test:test">
1.2 +5 -5 jakarta-jetspeed-2/applications/demo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 7 Aug 2003 19:47:16 -0000 1.1
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.2
@@ -8,13 +8,13 @@
<!-- Hot Deploy for mundane everyday development under Catalina -->
<!-- ================================================================ -->
<goal name="hotdeploy">
- <echo message="Hot Deploying ${portlet.app.name} to ${deploy.war.dir}"/>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/WEB-INF/classes">
+ <echo message="Hot Deploying ${org.apache.jetspeed.portlet.app.name} to ${org.apache.jetspeed.deploy.war.dir}"/>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/WEB-INF/classes">
<fileset dir="${maven.build.dir}/classes">
</fileset>
- </copy>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/">
- <fileset dir="${webapp.dir}">
+ </copy>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/">
+ <fileset dir="${maven.war.src}">
</fileset>
</copy>
</goal>
1.5 +15 -27 jakarta-jetspeed-2/applications/demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 3 Apr 2004 04:04:12 -0000 1.4
+++ project.properties 21 Jun 2004 15:19:32 -0000 1.5
@@ -1,33 +1,21 @@
+# 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.
#
# $Id$
#
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../../checkstyle.license
-maven.checkstyle.properties=${basedir}/../../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
-
-maven.compile.fork=yes
-maven.junit.fork=yes
-
-# 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
-deploy.war.dir=/apache/tomcat5/webapps
-portlet.app.name=HW_App
-webapp.dir=${basedir}/src/webapp
+org.apache.jetspeed.portlet.app.name=HW_App
1.2 +1 -1 jakarta-jetspeed-2/struts-portlet/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Apr 2004 22:17:43 -0000 1.1
+++ project.xml 21 Jun 2004 15:19:32 -0000 1.2
@@ -15,7 +15,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<pomVersion>3</pomVersion>
<id>struts-portlet-spi</id>
<name>Apache Struts Portlet Framework SPI</name>
1.6 +1 -1 jakarta-jetspeed-2/components/persistence/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 23 May 2004 21:23:39 -0000 1.5
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.6
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.5 +3 -1 jakarta-jetspeed-2/maven-plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 10 Jun 2004 20:11:53 -0000 1.4
+++ plugin.properties 21 Jun 2004 15:19:32 -0000 1.5
@@ -1,9 +1,11 @@
# Required Properties for Build
-# org.apache.jetspeed.catalina.version
+# org.apache.jetspeed.catalina.version.major
# org.apache.jetspeed.server.home = ${tomcat.root}
# org.apache.jetspeed.server.shared = ${org.apache.jetspeed.server.home}/shared/lib
# org.apache.jetspeed.deploy.war.dir = ${org.apache.jetspeed.server.home}/webapps
+# org.apache.jetspeed.services.autodeployment.user = <username>
+# org.apache.jetspeed.services.autodeployment.password = <password>
# Optional
# org.apache.jetspeed.context.file.name = jetspeed.xml
1.8 +1 -0 jakarta-jetspeed-2/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Jun 2004 17:39:19 -0000 1.7
+++ project.xml 21 Jun 2004 15:19:32 -0000 1.8
@@ -15,6 +15,7 @@
limitations under the License.
-->
<project>
+ <extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-jetspeed2-plugin</id>
<groupId>jetspeed2</groupId>
1.3 +1 -26 jakarta-jetspeed-2/struts-portlet/demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 29 Apr 2004 02:54:14 -0000 1.2
+++ project.properties 21 Jun 2004 15:19:32 -0000 1.3
@@ -12,31 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-maven.checkstyle.header.file=${basedir}/checkstyle.license
-maven.checkstyle.properties=${basedir}/checkstyle.xml
-maven.license.licenseFile=${basedir}/LICENSE.TXT
-
-maven.compile.deprecation=on
-
-#deployement settings
-#
-# Modify below settings for your own environment
-#
-deploy.war.dir=/portal/tomcat/jetspeed/webapps/
-jetspeed.webapp=/portal/tomcat/jetspeed/webapps/jetspeed
-portlet.app.name = struts-demo
-portlet.war.name = struts-demo
-webapp.dir=${basedir}/src/webapp
-
-maven.war.src=${basedir}/src/webapp
-maven.war.src.excludes=META-INF/**,WEB-INF/classes/**
-# war plugin doesn't set this variable ???
-maven.war.webapp.dir=${maven.build.dir}/${pom.artifactId}
-maven.war.tld.dir=WEB-INF
+org.apache.jetspeed.portlet.app.name = struts-demo
maven.multiproject.type=war
1.3 +9 -0 jakarta-jetspeed-2/struts-portlet/demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Apr 2004 02:54:14 -0000 1.2
+++ project.xml 21 Jun 2004 15:19:32 -0000 1.3
@@ -15,6 +15,7 @@
limitations under the License.
-->
<project>
+ <extend>${basedir}/../../project.xml</extend>
<pomVersion>3</pomVersion>
<id>struts-demo</id>
<name>Struts Portlet Demo</name>
@@ -152,6 +153,14 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
</build>
</project>
1.2 +29 -29 jakarta-jetspeed-2/components/id-generator/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 19 May 2004 19:14:22 -0000 1.1
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.2
@@ -1,29 +1,29 @@
-<!--
-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 default="java:jar"
- xmlns:j="jelly:core"
- xmlns:define="jelly:define"
- xmlns:reactor="reactor">
-
- <!-- Target of maven test:single test -->
- <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/>
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
-</project>
+<!--
+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 default="java:jar"
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:reactor="reactor">
+
+ <!-- Target of maven test:single test -->
+ <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/>
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+</project>
1.19 +1 -1 jakarta-jetspeed-2/components/registry/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/maven.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maven.xml 23 May 2004 21:23:39 -0000 1.18
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.19
@@ -33,7 +33,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
1.3 +1 -1 jakarta-jetspeed-2/components/cm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 18 Mar 2004 14:38:09 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.3
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.5 +15 -27 jakarta-jetspeed-2/applications/pam/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 6 Jun 2004 01:44:54 -0000 1.4
+++ project.properties 21 Jun 2004 15:19:32 -0000 1.5
@@ -1,32 +1,20 @@
+# 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.
#
# $Id$
#
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../../checkstyle.license
-maven.checkstyle.properties=${basedir}/../../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
-
-maven.compile.fork=yes
-maven.junit.fork=yes
-
-# 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
-portlet.app.name=pam
-webapp.dir=${basedir}/src/webapp
-
+org.apache.jetspeed.portlet.app.name=pam
1.6 +8 -8 jakarta-jetspeed-2/applications/pam/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 6 Jun 2004 01:44:54 -0000 1.5
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.6
@@ -1,26 +1,26 @@
<project default="java:jar"
- xmlns:j="jelly:core"
+ xmlns:j="jelly:core"
xmlns:define="jelly:define"
xmlns:reactor="reactor">
-
+
<!-- ================================================================ -->
<!-- Hot Deploy for mundane everyday development under Catalina -->
<!-- ================================================================ -->
<goal name="hotdeploy">
- <echo message="Hot Deploying ${portlet.app.name} to ${deploy.war.dir}"/>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/WEB-INF/classes">
+ <echo message="Hot Deploying ${org.apache.jetspeed.portlet.app.name} to ${org.apache.jetspeed.deploy.war.dir}"/>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/WEB-INF/classes">
<fileset dir="${maven.build.dir}/classes">
</fileset>
- </copy>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/">
- <fileset dir="${webapp.dir}">
+ </copy>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/">
+ <fileset dir="${maven.war.src}">
</fileset>
</copy>
</goal>
<preGoal name="hotdeploy">
- <attainGoal name= "java:compile"/>
+ <attainGoal name= "java:compile"/>
</preGoal>
</project>
1.3 +1 -1 jakarta-jetspeed-2/components/locator/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 20 May 2004 16:06:37 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:32 -0000 1.3
@@ -21,7 +21,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.12 +1 -1 jakarta-jetspeed-2/components/prefs/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven.xml 23 May 2004 21:23:39 -0000 1.11
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.12
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.3 +1 -1 jakarta-jetspeed-2/components/file-cache/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 19 May 2004 20:19:50 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.3
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
<!--
1.3 +13 -24 jakarta-jetspeed-2/cornerstone-jmx/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-jmx/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 23 Mar 2004 02:44:24 -0000 1.2
+++ project.properties 21 Jun 2004 15:19:33 -0000 1.3
@@ -1,27 +1,16 @@
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-
-# 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
+# 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.
CORNERSTONE_HOME=${basedir}
CORNERSTONE_RUNTIME_HOME=${maven.build.dir}/runtime
1.2 +1 -1 jakarta-jetspeed-2/jetspeed-api/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 20 May 2004 15:58:58 -0000 1.1
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.2
@@ -21,7 +21,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.6 +1 -1 jakarta-jetspeed-2/components/rdbms/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 23 May 2004 21:23:39 -0000 1.5
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.6
@@ -27,7 +27,7 @@
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
1.12 +1 -70 jakarta-jetspeed-2/portal/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.properties 29 Apr 2004 02:53:44 -0000 1.11
+++ project.properties 21 Jun 2004 15:19:33 -0000 1.12
@@ -12,75 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Maven test-classes destination directory
-maven.test.dest=${maven.build.dir}/test-classes
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-maven.compile.fork=yes
-maven.junit.fork=yes
-
-# 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 \
-org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password \
-java.security.auth.login.config \
-applicationRoot \
-p6.home
-
-org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.test.database.user = sa
-org.apache.jetspeed.test.database.password =
-
-org.apache.jetspeed.test.jdbc.drivers.path=
-org.apache.jetspeed.test.database.default.name=hsql
-org.apache.jetspeed.test.database.ojb.platform=Hsqldb
-
-org.apache.jetspeed.production.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.production.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.production.database.user = sa
-org.apache.jetspeed.production.database.password =
-
-org.apache.jetspeed.production.jdbc.drivers.path=
-org.apache.jetspeed.production.database.default.name=hsql
-org.apache.jetspeed.production.database.ojb.platform=Hsqldb
-
-java.security.auth.login.config = ../services/security/src/webapp/WEB-INF/conf/jaas/login.conf
-applicationRoot = src/webapp
-
-deploy.war.dir=/apache/tomcat5/webapps
-webapp.name=jetspeed
-pam.deploy.dir=${deploy.war.dir}
-webapp.dir=${basedir}/src/webapp
-
-# Overrides the registry to point to the deployed web applications db file
-# This is only required for HSQL as it will override the value set for "services.HSQLDBServer.db.path"
-# in jetspeed.properties
-hsql.deployment.db.path=${pam.deploy.dir}/${webapp.name}/WEB-INF/db/hsql/Registry
-
+maven.war.src.excludes="WEB-INF/conf/jetspeed.properties"
1.87 +50 -77 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- maven.xml 10 Jun 2004 20:14:16 -0000 1.86
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.87
@@ -68,7 +68,7 @@
<echo>Using war ${pam.app.war}</echo>
</j:if>
- <echo>${deploy.war.dir}</echo>
+ <echo>${org.apache.jetspeed.deploy.war.dir}</echo>
<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
@@ -94,7 +94,7 @@
<arg value="${pam.app.war}"/>
<arg value="-webappDir"/>
- <arg value="${pam.deploy.dir}/"/>
+ <arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
<!--
<arg value="-ApplicationType"/>
@@ -125,7 +125,7 @@
<goal name="pam.template.register">
<echo>Performing action ${pam.action} with App ${pam.app.name}</echo>
- <echo>${deploy.war.dir}</echo>
+ <echo>${org.apache.jetspeed.deploy.war.dir}</echo>
<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
@@ -151,7 +151,7 @@
<arg value="${pam.app.war}"/>
<arg value="-webappDir"/>
- <arg value="${pam.deploy.dir}/"/>
+ <arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
<!--
<arg value="-ApplicationType"/>
@@ -185,7 +185,7 @@
<echo>Using war ${pam.app.war}</echo>
</j:if>
- <echo>${deploy.war.dir}</echo>
+ <echo>${org.apache.jetspeed.deploy.war.dir}</echo>
<java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
@@ -211,7 +211,7 @@
<arg value="${pam.app.type}"/>
<arg value="-webappDir"/>
- <arg value="${pam.deploy.dir}/"/>
+ <arg value="${org.apache.jetspeed.deploy.war.dir}/"/>
<!--
<arg value="-UserName"/>
@@ -354,20 +354,20 @@
<!-- ================================================================ -->
<goal name="deploy">
<echo message="Deploying ${pom.id}, ${pom.name}"/>
- <delete dir="${deploy.war.dir}/${webapp.name}"/>
- <copy file="./target/jetspeed.war" tofile="${deploy.war.dir}/${webapp.name}.war"/>
- <unwar src="${deploy.war.dir}/${webapp.name}.war" dest="${deploy.war.dir}/${webapp.name}"/>
-
- <copy file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/jetspeed.xml" overwrite="true">
- <filterset begintoken="@" endtoken="@">
- <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
- <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
- <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
- <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
- </filterset>
- </copy>
-<!-- uncomment for Tomcat5 -->
- <copy file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/../conf/Catalina/localhost/jetspeed.xml" overwrite="true">
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}"/>
+ <copy file="./target/jetspeed.war" tofile="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war"/>
+ <unwar src="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war" dest="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}"/>
+
+ <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}"/>
+ <j:choose>
+ <j:when test="${catalina_version_major == '5'}" >
+ <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
+ </j:otherwise>
+ </j:choose>
+ <copy file="./src/resources/jetspeed.xml" tofile="${context_dir}/jetspeed.xml" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
<filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
@@ -383,13 +383,13 @@
<!-- Hot Deploy for mundane everyday development under Catalina -->
<!-- ================================================================ -->
<goal name="hotdeploy">
- <echo message="Hot Deploying ${pom.id}, ${pom.name} ${webapp.dir}"/>
- <copy todir="${deploy.war.dir}/${webapp.name}/WEB-INF/classes">
+ <echo message="Hot Deploying ${pom.id}, ${pom.name} ${maven.war.src}"/>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}/WEB-INF/classes">
<fileset dir="${maven.build.dir}/classes">
</fileset>
</copy>
- <copy todir="${deploy.war.dir}/${webapp.name}/">
- <fileset dir="${webapp.dir}">
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}/">
+ <fileset dir="${maven.war.src}">
<exclude name="WEB-INF/db/**"/>
</fileset>
</copy>
@@ -417,65 +417,30 @@
<goal name="deployClasses">
<attainGoal name="java:compile"/>
<attainGoal name="java:jar-resources"/>
- <copy todir="${deploy.war.dir}/${webapp.name}/WEB-INF/classes">
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}/WEB-INF/classes">
<fileset dir="${basedir}/target/classes" />
</copy>
- <copy todir="${deploy.war.dir}/${webapp.name}">
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}">
<fileset dir="${basedir}/src/webapp" />
</copy>
</goal>
- <goal name="debugWebapp">
- <copy todir="${debug.webapp.dir}/jetspeed">
- <fileset dir="${basedir}/src/webapp" />
- </copy>
-
- <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
- <classpath>
-
- <path refid="maven.dependency.classpath"/>
- <pathelement path="${maven.build.dest}"/>
- <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
- </classpath>
- <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
- <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
- <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
- <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
- <sysproperty key="portal.use.internal.jndi" value="true"/>
- <arg value="-action" />
- <arg value="deploy" />
- <arg value="-PortletAppName" />
- <arg value="HW_App" />
- <arg value="-warfilename" />
- <arg value="../applications/demo/target/demo.war" />
- <arg value="-webappDir" />
- <arg value="${debug.webapp.dir}/" />
- <arg value="-PortalName" />
- <arg value="jetspeed" />
- <arg value="-DbAlias" />
- <arg value="${debug.webapp.dir}/jetspeed/WEB-INF/db/hsql/Registry" />
-
- </java>
-
- </goal>
-
<goal name="catalina:base-shared"
description="Copy all base jars necessary for common container">
- <echo>Copying from ${maven.repo.local} to ${catalina.shared.lib}...</echo>
- <!--<copy file="${maven.repo.local}/pluto-container/jars/pluto-1.0.jar" todir="${catalina.shared.lib}"/>-->
- <copy file="${maven.repo.local}/pluto/jars/pluto-1.0.1-SNAPSHOT.jar" todir="${catalina.shared.lib}"/>
- <copy file="${maven.repo.local}/commons-lang/jars/commons-lang-2.0.jar" todir="${catalina.shared.lib}"/>
- <copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar" todir="${catalina.shared.lib}"/>
- <copy file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar" todir="${catalina.shared.lib}"/>
- <copy file="${maven.repo.local}/log4j/jars/log4j-1.2.8.jar" todir="${catalina.shared.lib}"/>
- <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar" todir="${catalina.shared.lib}"/>
+ <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}...</echo>
+ <copy file="${maven.repo.local}/pluto/jars/pluto-1.0.1-SNAPSHOT.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/commons-lang/jars/commons-lang-2.0.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/log4j/jars/log4j-1.2.8.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar" todir="${org.apache.jetspeed.server.shared}"/>
</goal>
<goal name="catalina:shared"
description="Copy all jars necessary for common container">
- <copy file="../commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
- <copy file="../jetspeed-api/target/jetspeed-api-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
- <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${catalina.shared.lib}"/>
+ <copy file="../commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="../jetspeed-api/target/jetspeed-api-2.0-a1-dev.jar" todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${org.apache.jetspeed.server.shared}"/>
</goal>
<!-- ================================================================ -->
@@ -575,14 +540,22 @@
<attainGoal name="ojb.set.production.database.platform"/>
</preGoal>
+ <postGoal name="war:webapp">
+ <copy file="${maven.war.src}/WEB-INF/conf/jetspeed.properties" tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.properties" overwrite="true">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}"/>
+ <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}"/>
+ </filterset>
+ </copy>
+ </postGoal>
<goal name='remove.wars'>
- <delete dir="${deploy.war.dir}/${webapp.name}"/>
- <delete file="${deploy.war.dir}/${webapp.name}.war"/>
- <delete dir="${deploy.war.dir}/HW_App"/>
- <delete dir="${deploy.war.dir}/pam"/>
- <delete dir="${deploy.war.dir}/security"/>
- <delete dir="${deploy.war.dir}/struts-demo"/>
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}"/>
+ <delete file="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war"/>
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/HW_App"/>
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/pam"/>
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/security"/>
+ <delete dir="${org.apache.jetspeed.deploy.war.dir}/struts-demo"/>
</goal>
</project>
1.2 +15 -29 jakarta-jetspeed-2/applications/security/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 1 May 2004 17:01:26 -0000 1.1
+++ project.properties 21 Jun 2004 15:19:33 -0000 1.2
@@ -1,35 +1,21 @@
+# 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.
#
# $Id$
#
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../../checkstyle.license
-maven.checkstyle.properties=${basedir}/../../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
-
-maven.compile.fork=yes
-maven.junit.fork=yes
-
-# 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
-# Specify deploy.war.dir if not specified in ${USER_HOME}
-#deploy.war.dir=/apache/tomcat5/webapps
-
-portlet.app.name=security
-webapp.dir=${basedir}/src/webapp
+org.apache.jetspeed.portlet.app.name=security
1.2 +8 -8 jakarta-jetspeed-2/applications/security/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 May 2004 17:01:26 -0000 1.1
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.2
@@ -1,26 +1,26 @@
<project default="java:jar"
- xmlns:j="jelly:core"
+ xmlns:j="jelly:core"
xmlns:define="jelly:define"
xmlns:reactor="reactor">
-
+
<!-- ================================================================ -->
<!-- Hot Deploy for mundane everyday development under Catalina -->
<!-- ================================================================ -->
<goal name="hotdeploy">
- <echo message="Hot Deploying ${portlet.app.name} to ${deploy.war.dir}"/>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/WEB-INF/classes">
+ <echo message="Hot Deploying ${org.apache.jetspeed.portlet.app.name} to ${org.apache.jetspeed.deploy.war.dir}"/>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/WEB-INF/classes">
<fileset dir="${maven.build.dir}/classes">
</fileset>
- </copy>
- <copy todir="${deploy.war.dir}/${portlet.app.name}/">
- <fileset dir="${webapp.dir}">
+ </copy>
+ <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/">
+ <fileset dir="${maven.war.src}">
</fileset>
</copy>
</goal>
<preGoal name="hotdeploy">
- <attainGoal name= "java:compile"/>
+ <attainGoal name= "java:compile"/>
</preGoal>
</project>
1.4 +7 -7 jakarta-jetspeed-2/site/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/site/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 24 Mar 2004 02:09:12 -0000 1.3
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.4
@@ -23,13 +23,13 @@
<attainGoal name="subSite"/>
<attainGoal name="site"/>
</goal>
-
+
<goal name="subSite"
description="Build the site for all subprojects"
>
<maven:reactor
basedir="${basedir}/../"
- includes="*/project.xml,applications/*/project.xml"
+ includes="*/project.xml,applications/*/project.xml,struts-portlet/*/project.xml"
excludes="applications/project.xml,cornerstone-demo/project.xml,cornerstone-jmx-demo/project.xml,plugin/project.xml,site/project.xml"
goals="site"
banner="Building Site"
@@ -45,7 +45,7 @@
| generated in the top-level directory of the site. So for example
| if we have a template named 'mail.xml', a page named 'mail.html'
| will be generated in the top-level directory.
- |
+ |
-->
<fileScanner var="templates">
@@ -56,11 +56,11 @@
<j:set var="templatesX" value="${templates}X"/>
<j:if test="${!templatesX.equals('X')}">
<j:forEach var="template" items="${templates.iterator()}">
-
+
<j:set var="templateName" value="${template.name}"/>
- <echo>Processing ${templateName} template ...</echo>
-
- <velocity:merge
+ <echo>Processing ${templateName} template ...</echo>
+
+ <velocity:merge
name="${basedir}/xdocs/${templateName}"
basedir="${basedir}/xdocs-templates"
template="${templateName}"/>
1.3 +46 -10 jakarta-jetspeed-2/site/xdocs/getting-started.xml
Index: getting-started.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/site/xdocs/getting-started.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getting-started.xml 26 May 2004 17:24:18 -0000 1.2
+++ getting-started.xml 21 Jun 2004 15:19:33 -0000 1.3
@@ -20,6 +20,7 @@
<subtitle>Getting up and running quickly</subtitle>
<authors>
<person name="David Sean Taylor" email="taylor@apache.org"/>
+ <person name="Ate Douma" email="ate@apache.org"/>
</authors>
</properties>
<body>
@@ -30,7 +31,7 @@
</p>
<ul>
<li><a href="http://ant.apache.org/bindownload.cgi">Ant 1.5</a> or higher</li>
- <li><a href="http://maven.apache.org/start/download.html">Maven 1.0-beta-10</a> or higher</li>
+ <li><a href="http://maven.apache.org/start/download.html">Maven 1.0-rc3</a> or higher</li>
<li>Java 1.4 or higher</li>
<li>Servlet 2.3:<br/>
Tomcat 4.1.x<br/>
@@ -50,25 +51,37 @@
<th>what is it?</th>
</tr>
<tr>
- <td>catalina.home</td>
+ <td>org.apache.jetspeed.server.home</td>
<td>${CATALINA_HOME}/</td>
<td>The root of your Tomcat server installation.</td>
</tr>
<tr>
- <td>catalina.version.major</td>
+ <td>org.apache.jetspeed.catalina.version.major</td>
<td>4</td>
<td>Are you using Tomcat 4.1.x or 5.x?</td>
</tr>
<tr>
- <td>catalina.shared.lib</td>
- <td>${CATALINA_HOME}/shared/lib/</td>
- <td>The location of the jars in your Tomcat installation.</td>
+ <td>org.apache.jetspeed.server.shared</td>
+ <td>${org.apache.jetspeed.server.home}/shared/lib/</td>
+ <td>The location of the shared jars in your Tomcat installation.</td>
</tr>
<tr>
- <td>deploy.war.dir</td>
- <td>${CATALINA_BASE}/webapps/</td>
+ <td>org.apache.jetspeed.deploy.war.dir</td>
+ <td>${org.apache.jetspeed.server.home}/webapps/</td>
<td>The location to deploy web application in Tomcat.</td>
</tr>
+ <tr>
+ <td>org.apache.jetspeed.services.autodeployment.user</td>
+ <td>your-tomcat-manager-user</td>
+ <td>a Tomcat user with the manager role.
+ See the Tomcat Configuration section below.
+ </td>
+ </tr>
+ <tr>
+ <td>org.apache.jetspeed.services.autodeployment.password</td>
+ <td>your-tomcat-manager-user-password</td>
+ <td>The password of the Tomcat manager user.</td>
+ </tr>
</table>
<p>
<i>If you are using Tomcat 5.x, the allBuild goal described below will install a
@@ -83,7 +96,30 @@
<a href='database.html'>Database Configuration documentation</a>.
</p>
</section>
-<section name='3. Building Jetspeed 2'>
+<section name="3. Tomcat Configuration">
+<p>
+Jetspeed 2 now uses the Tomcat manager application for hotdeployment of portlet application war files.
+To be able to do so it needs a configured Tomcat user with the predefined 'manager' role in
+the ${CATALINA_HOME}/conf/tomcat-users.xml.
+</p>
+<p>
+A minimal example tomcat-users.xml could look like:
+ <pre>
+ <?xml version='1.0' encoding='utf-8'?>
+ <tomcat-users>
+ <role rolename="manager"/>
+ <user username="j2deployer" password="j2deployer" roles="manager"/>
+ </tomcat-users>
+ </pre>
+Make sure to use a more appropriate username and password. <br/>
+With the above example the required autodeployment properties should be set as:
+ <pre>
+ org.apache.jetpseed.services.autodeployment.user=j2deployer
+ org.apache.jetpseed.services.autodeployment.password=j2deployer
+ </pre>
+</p>
+</section>
+<section name='4. Building Jetspeed 2'>
<p>
If you are using the default Hypersonic database, this procedure requires two terminal sessions.
If you are using another database, skip the immediate section below on Terminal Session #1.
@@ -102,7 +138,7 @@
maven allClean allBuild
]]></source>
</section>
-<section name="4. Deploying Jetspeed into Tomcat">
+<section name="5. Deploying Jetspeed into Tomcat">
<p>
We only cover deploying to Tomcat 4 and Tomcat 5.
Step #1 below is optional if you are NOT using the default Hypersonic database.
1.3 +46 -46 jakarta-jetspeed-2/components/capability/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 28 May 2004 18:49:14 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.3
@@ -1,46 +1,46 @@
-<!--
-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 default="java:jar"
- xmlns:j="jelly:core"
- xmlns:define="jelly:define"
- xmlns:reactor="reactor">
-
-<!--
- <preGoal name="test:test">
- <attainGoal name="db.recreate"/>
- </preGoal>
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
-
--->
-<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
-
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
-
-
-</project>
+<!--
+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 default="java:jar"
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:reactor="reactor">
+
+<!--
+ <preGoal name="test:test">
+ <attainGoal name="db.recreate"/>
+ </preGoal>
+<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
+
+-->
+<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+
+
+</project>
1.4 +1 -1 jakarta-jetspeed-2/commons/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 18 Mar 2004 14:37:56 -0000 1.3
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.4
@@ -22,7 +22,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${catalina.shared.lib}"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.server.shared}"/>
</goal>
</project>
1.6 +0 -25 jakarta-jetspeed-2/cornerstone-demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-demo/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 23 Mar 2004 02:55:27 -0000 1.5
+++ project.properties 21 Jun 2004 15:19:33 -0000 1.6
@@ -12,31 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-
-# 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
-
jar.name=${maven.final.name}.jar
CORNERSTONE_HOME=../cornerstone
1.3 +1 -1 jakarta-jetspeed-2/struts-portlet/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/framework/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Apr 2004 02:54:25 -0000 1.2
+++ project.xml 21 Jun 2004 15:19:33 -0000 1.3
@@ -15,7 +15,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<pomVersion>3</pomVersion>
<id>struts-portlet</id>
<name>Apache Struts Portlet Framework</name>
1.7 +0 -26 jakarta-jetspeed-2/cps/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 31 Mar 2004 11:26:37 -0000 1.6
+++ project.properties 21 Jun 2004 15:19:33 -0000 1.7
@@ -12,30 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-maven.compile.deprecation=on
-
-# 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=jar
-
maven.pmd.cpd.enable=true
1.12 +1 -1 jakarta-jetspeed-2/cps/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven.xml 18 Mar 2004 14:39:50 -0000 1.11
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.12
@@ -24,7 +24,7 @@
<goal name="deployJar">
<attainGoal name="jar:install"/>
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
</project>
1.3 +51 -51 jakarta-jetspeed-2/components/page-manager/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 28 May 2004 22:05:08 -0000 1.2
+++ maven.xml 21 Jun 2004 15:19:33 -0000 1.3
@@ -1,51 +1,51 @@
-<!--
-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 default="java:jar"
- xmlns:j="jelly:core"
- xmlns:define="jelly:define"
- xmlns:reactor="reactor">
-
-<!--
- <preGoal name="test:test">
- <attainGoal name="db.recreate"/>
- </preGoal>
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
-
--->
-<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
- <preGoal name="test:test">
- <copy todir="target/testdata">
- <fileset dir="testdata">
- </fileset>
- </copy>
- </preGoal>
-
- <preGoal name="test:single">
- <copy todir="target/testdata">
- <fileset dir="testdata">
- </fileset>
- </copy>
- </preGoal>
-
-
-</project>
+<!--
+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 default="java:jar"
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:reactor="reactor">
+
+<!--
+ <preGoal name="test:test">
+ <attainGoal name="db.recreate"/>
+ </preGoal>
+<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
+
+-->
+<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+ <preGoal name="test:test">
+ <copy todir="target/testdata">
+ <fileset dir="testdata">
+ </fileset>
+ </copy>
+ </preGoal>
+
+ <preGoal name="test:single">
+ <copy todir="target/testdata">
+ <fileset dir="testdata">
+ </fileset>
+ </copy>
+ </preGoal>
+
+
+</project>
1.53 +3 -3 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jetspeed.properties 9 Jun 2004 23:15:17 -0000 1.52
+++ jetspeed.properties 21 Jun 2004 15:19:34 -0000 1.53
@@ -150,8 +150,8 @@
services.autodeployment.deployer = org.apache.jetspeed.tools.pamanager.CatalinaPAM
services.autodeployment.server=localhost
services.autodeployment.port=8080
-services.autodeployment.user=scott
-services.autodeployment.password=scott
+services.autodeployment.user=@AUTODEPLOYMENT_USER@
+services.autodeployment.password=@AUTODEPLOYMENT_PASSWORD@
services.autodeployment.staging.dir=WEB-INF/deploy
services.autodeployment.target.dir=../
services.autodeployment.delay=10000
1.2 +14 -0 jakarta-jetspeed-2/archives/ApachePortals/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/archives/ApachePortals/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 26 Mar 2004 00:18:16 -0000 1.1
+++ project.properties 21 Jun 2004 15:19:34 -0000 1.2
@@ -1,3 +1,17 @@
+# 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.
+
maven.xdoc.date=left
maven.xdoc.version=
maven.xdoc.includeProjectDocumentation=no
1.4 +0 -16 jakarta-jetspeed-2/design-docs/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/design-docs/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 23 Mar 2004 02:59:19 -0000 1.3
+++ project.properties 21 Jun 2004 15:19:34 -0000 1.4
@@ -12,20 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-
# -------------------------------------------------------------------
# Default Maven properties for the DOCBOOK plugin
# -------------------------------------------------------------------
@@ -37,5 +23,3 @@
maven.docbook.target.pdf = ${maven.build.dir}/docbook-pdf
maven.docbook.target.doc = ${maven.build.dir}/docs/docbook
-
-
1.4 +0 -24 jakarta-jetspeed-2/cornerstone-jmx-demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-jmx-demo/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 23 Mar 2004 02:47:25 -0000 1.3
+++ project.properties 21 Jun 2004 15:19:34 -0000 1.4
@@ -12,28 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-# 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
-
jar.name=${maven.final.name}.jar
1.2 +14 -28 jakarta-jetspeed-2/layout-portlets/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/layout-portlets/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 10 Jun 2004 20:12:45 -0000 1.1
+++ project.properties 21 Jun 2004 15:19:34 -0000 1.2
@@ -1,33 +1,19 @@
+# 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.
#
# $Id$
#
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../../checkstyle.license
-maven.checkstyle.properties=${basedir}/../../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
-
-maven.compile.fork=yes
-maven.junit.fork=yes
-
-# 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
-
maven.war.final.name=jetspeed-layouts.war
-
-
-
1.6 +0 -30 jakarta-jetspeed-2/cornerstone/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 23 Mar 2004 02:24:17 -0000 1.5
+++ project.properties 21 Jun 2004 15:19:34 -0000 1.6
@@ -12,39 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.checkstyle.header.file=${basedir}/../checkstyle.license
-maven.checkstyle.properties=${basedir}/../checkstyle.xml
-
-maven.compile.deprecation=on
-
-maven.license.licenseFile=${basedir}/../LICENSE.TXT
-
-
-# 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
-
-
CORNERSTONE_HOME=${basedir}
CORNERSTONE_RUNTIME_HOME=${maven.build.dir}/runtime
CORNERSTONE_RUNTIME_REGISTRY_DIR=${CORNERSTONE_RUNTIME_HOME}/registry
-
configDir=./config
registryDir=./registry
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org