morciuch 2003/03/18 12:06:27
Modified: . project.xml
build build.xml
docs/site changes.html
xdocs changes.xml
Log:
1. Fixed 'war_release' target to exclude .class files from the .war file (see
Bugzilla issue# 18121).
2. Updated dependencies for the maven build. Tested jar and war goals - OK.
Revision Changes Path
1.11 +373 -280 jakarta-jetspeed/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 3 Dec 2002 19:36:25 -0000 1.10
+++ project.xml 18 Mar 2003 20:06:25 -0000 1.11
@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<project>
-
- <pomVersion>3</pomVersion>
- <name>jakarta-jetspeed</name>
- <id>jetspeed</id>
- <currentVersion>1.4b2-dev</currentVersion>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <inceptionYear>2000</inceptionYear>
- <package>org.apache.turbine</package>
-
- <!-- Gump integration. -->
- <gumpRepositoryId>jakarta</gumpRepositoryId>
-
- <shortDescription>
+ <pomVersion>3</pomVersion>
+ <name>jakarta-jetspeed</name>
+ <id>jetspeed</id>
+ <currentVersion>1.4b4-dev</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <inceptionYear>2000</inceptionYear>
+ <package>org.apache.turbine</package>
+ <!-- Gump integration. -->
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+ <shortDescription>
A portal framework.
</shortDescription>
-
- <description>
+ <description>
Jetspeed is an Open Source implementation of an Enterprise Information Portal,
using Java and XML.
A portal makes network resources (applications, databases and so forth) available
to end-users. The
user can access the portal via a web browser, WAP-phone, pager or any other
device. Jetspeed acts as the central hub where information from multiple sources are
made available in an easy to use manner.
@@ -34,266 +30,363 @@
the base for the portal. With Jetspeed you can quickly build an XML
portal and also syndicate your own content.
</description>
-
- <url>http://jakarta.apache.org/jetspeed/</url>
- <issueTrackingUrl>http://nagoya.apache.org/bugzilla/index.html</issueTrackingUrl>
- <siteAddress>jakarta.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/jetspeed/</siteDirectory>
-
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic/jakarta-jetspeed</connection>
- <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>Jetspeed User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org:8080/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- <mailingList>
- <name>Jetspeed Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org:8080/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
-
- <developer>
- <name>Dave Blackett (Jetspeed logos)</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Jeffrey D. Brekke</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Santiago Gala</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Rapha�l Luta</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Neeme Praks</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Jeff Prickett</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Ingo Schuster</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Paul Spencer</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>David S. Taylor</name>
- <id></id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Kevin A. Burton</name>
- <id>burton</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Chris Kimpton</name>
- <id>kimptoc</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
-
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Zenplex</organization>
- </developer>
-
- </developers>
-
- <!-- Need to mark these as compile-time/run-time -->
-
- <dependencies>
-
- <dependency>
- <id>castor</id>
- <version>0.9.3</version>
- </dependency>
-
- <dependency>
- <id>commons-collections</id>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
- </dependency>
-
- <dependency>
- <id>ecs</id>
- <version>1.4.1</version>
- </dependency>
-
- <dependency>
- <id>javamail</id>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <id>jaf</id>
- <version>1.0.1</version>
- <jar>activation-1.0.1.jar</jar>
- </dependency>
-
- <dependency>
- <id>jdbc</id>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.1.3</version>
- </dependency>
-
- <dependency>
- <id>servletapi</id>
- <version>2.2</version>
- </dependency>
-
- <dependency>
- <id>turbine</id>
- <version>2.2-b2-dev</version>
- </dependency>
-
- <dependency>
- <id>fulcrum</id>
- <version>3.0-b2-dev</version>
- </dependency>
-
- <dependency>
- <id>stratum</id>
- <version>1.0-b2-dev</version>
- </dependency>
-
- <dependency>
- <id>torque</id>
- <version>3.0-b2-dev</version>
- </dependency>
-
- <dependency>
- <id>velocity</id>
- <version>1.3-dev</version>
- </dependency>
-
- <dependency>
- <id>obj</id>
- <version>0.7.343</version>
- </dependency>
-
- <dependency>
- <id>village</id>
- <version>1.5.3-dev.jar</version>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>1.4.4</version>
- </dependency>
-
- <dependency>
- <id>xalan</id>
- <version>2.1.0</version>
- <jar>xalan-2.1.0.jar</jar>
- </dependency>
-
- <!-- ********************************** -->
- <!-- THESE DEPENDENCIES ARE FOR TESTING -->
- <!-- ********************************** -->
-
- <dependency>
- <id>commons-httpclient</id>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <id>cactus</id>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <id>cactus-ant</id>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <id>junit</id>
- <version>3.7</version>
- </dependency>
-
- </dependencies>
-
- <build>
-
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/java</testSourceDirectory>
- <aspectSourceDirectory/>
-
- <!-- Unit test classes -->
- <unitTestClassEntries>
- <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/*ServletTest.class</unitTestClassEntry>
- </unitTestClassEntries>
-
- <!-- Integration unit test classes -->
- <integrationUnitTestClassEntries>
- <integrationUnitTestClassEntry>include =
**/*ServletTest.class</integrationUnitTestClassEntry>
- </integrationUnitTestClassEntries>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
-
- <jarResources>
- </jarResources>
-
- <jars>
- </jars>
- </build>
+ <url>http://jakarta.apache.org/jetspeed/</url>
+
<issueTrackingUrl>http://nagoya.apache.org/bugzilla/index.html</issueTrackingUrl>
+ <siteAddress>jakarta.apache.org</siteAddress>
+ <siteDirectory>/www/jakarta.apache.org/jetspeed/</siteDirectory>
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed/</url>
+ </repository>
+ <mailingLists>
+ <mailingList>
+ <name>Jetspeed User List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://nagoya.apache.org:8080/eyebrowse/[EMAIL
PROTECTED]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Jetspeed Developer List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://nagoya.apache.org:8080/eyebrowse/[EMAIL
PROTECTED]</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <name>Dave Blackett (Jetspeed logos)</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Jeffrey D. Brekke</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Santiago Gala</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Rapha�l Luta</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Neeme Praks</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Jeff Prickett</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Ingo Schuster</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Paul Spencer</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>David S. Taylor</name>
+ <id/>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Kevin A. Burton</name>
+ <id>burton</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Chris Kimpton</name>
+ <id>kimptoc</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ </developer>
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Zenplex</organization>
+ </developer>
+ <developer>
+ <name>Mark Orciuch</name>
+ <id>morciuch</id>
+ <email>[EMAIL PROTECTED]</email>
+ </developer>
+ </developers>
+ <!-- Need to mark these as compile-time/run-time -->
+ <dependencies>
+ <dependency>
+ <id>activation</id>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <id>ant</id>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <id>castor</id>
+ <version>0.9.3</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>1.4.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>2.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-configuration</id>
+ <version>1.0-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-dbcp</id>
+ <version>1.0-dev-20020806</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>1.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-pool</id>
+ <version>1.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>ecs</id>
+ <version>1.4.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>fulcrum</id>
+ <version>3.0-b2-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jakarta-oro</id>
+ <version>2.0.6</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jakarta-regexp</id>
+ <version>1.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>javamail</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jaxp</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jcs</id>
+ <version>1.0-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jdbc</id>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <id>jndi</id>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>ojb</id>
+ <version>0.7.343</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>servletapi</id>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <id>soap</id>
+ <version>2.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>stratum</id>
+ <version>1.0-b4-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>torque</id>
+ <version>3.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>turbine</id>
+ <version>2.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>uddi4j</id>
+ <version>1.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>village</id>
+ <version>1.5.3</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xalan</id>
+ <version>2.3.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xerces</id>
+ <version>2.0.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xerces</id>
+ <version>2.0.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ <jar>xercesImpl-2.0.2.jar</jar>
+ </dependency>
+ <dependency>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <!-- ********************************** -->
+ <!-- THESE DEPENDENCIES ARE FOR TESTING -->
+ <!-- ********************************** -->
+ <dependency>
+ <id>commons-httpclient</id>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <id>cactus</id>
+ <version>22-1.2</version>
+ </dependency>
+ <dependency>
+ <id>cactus-ant</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>junit</id>
+ <version>3.7</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/java</testSourceDirectory>
+ <aspectSourceDirectory/>
+ <!-- Unit test classes -->
+ <unitTestClassEntries>
+ <unitTestClassEntry>include =
**/*Test.class</unitTestClassEntry>
+ <unitTestClassEntry>exclude =
**/*ServletTest.class</unitTestClassEntry>
+ </unitTestClassEntries>
+ <!-- Integration unit test classes -->
+ <integrationUnitTestClassEntries>
+ <integrationUnitTestClassEntry>include =
**/*ServletTest.class</integrationUnitTestClassEntry>
+ </integrationUnitTestClassEntries>
+ <!-- J A R R E S O U R C E S -->
+ <!-- Resources that are packaged up inside the JAR file -->
+ <jarResources/>
+ <jars/>
+ </build>
</project>
1.186 +0 -9 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- build.xml 12 Feb 2003 05:56:49 -0000 1.185
+++ build.xml 18 Mar 2003 20:06:25 -0000 1.186
@@ -731,15 +731,6 @@
<war warfile="${build.dir}/${project.name}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
- <classes dir="${build.dest.dir}">
- <!-- Do not include test files in the runtime jar -->
- <exclude name="**/Test*.*"/>
- <exclude name="**/test*.*"/>
-
- <!-- Also exclude the test cactus.properties file -->
- <exclude name="cactus.properties"/>
- </classes>
-
<lib dir="${lib.dir}">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
1.117 +6 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- changes.html 13 Mar 2003 01:08:10 -0000 1.116
+++ changes.html 18 Mar 2003 20:06:26 -0000 1.117
@@ -133,6 +133,12 @@
</li>
-->
<li>
+ Fixed - Bug # 18121 - 2003/03/18 - Fixed 'war_release' target to exclude .class
files from the .war file (MO)
+</li>
+<li>
+ Update - 2003/03/18 - Updated dependencies for the maven build (MO)
+</li>
+<li>
Add - Bug # 17632 - 2003/03/12 - Added new feature to log portlet load time,
contributed by Todd Kuebler (MO)
</li>
<li>
1.133 +7 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- changes.xml 13 Mar 2003 01:08:11 -0000 1.132
+++ changes.xml 18 Mar 2003 20:06:26 -0000 1.133
@@ -23,6 +23,12 @@
</li>
-->
<li>
+ Fixed - Bug # 18121 - 2003/03/18 - Fixed 'war_release' target to exclude .class
files from the .war file (MO)
+</li>
+<li>
+ Update - 2003/03/18 - Updated dependencies for the maven build (MO)
+</li>
+<li>
Add - Bug # 17632 - 2003/03/12 - Added new feature to log portlet load time,
contributed by Todd Kuebler (MO)
</li>
<li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
