Author: ptahchiev
Date: Tue Apr 1 03:48:27 2008
New Revision: 643356
URL: http://svn.apache.org/viewvc?rev=643356&view=rev
Log:
Added the pom.xml for the binary release. Also changed the NOTICE to include
notices of the other projects that we ship with Cactus. Also changed the readme.
Added:
jakarta/cactus/trunk/descriptors/pom.xml (with props)
Modified:
jakarta/cactus/trunk/NOTICE
jakarta/cactus/trunk/cactus-bin-assembly.xml
jakarta/cactus/trunk/cactus-src-assembly.xml
jakarta/cactus/trunk/descriptors/licenses/README.txt
Modified: jakarta/cactus/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/NOTICE?rev=643356&r1=643355&r2=643356&view=diff
==============================================================================
--- jakarta/cactus/trunk/NOTICE (original)
+++ jakarta/cactus/trunk/NOTICE Tue Apr 1 03:48:27 2008
@@ -1,5 +1,111 @@
Apache Cactus
-Copyright 1998-2008 The Apache Software Foundation
+Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+#########################################################################
+## APACHE CACTUS DEPENDENCIES ##
+#########################################################################
+
+A binary distribution of Apache Cactus includes a number of dependent
+packages with separate copyright notices and license terms. The following
+notices apply to these dependencies.
+
+=========================================================================
+== JUnit Notice ==
+=========================================================================
+
+This software comes bundled with the JUnit library package,
+which is open source software. The JUnit framework
+is an open-source project hosted on Sourceforge.net,
+and is not maintained by Object Mentor.
+
+=========================================================================
+== AspectJ Notice ==
+=========================================================================
+
+This software comes bundled with an AspectJ library package,
+which is open source software. The AspectJ software is an
+open-source project hosted here
+
+http://www.eclipse.org/aspectj/
+
+and is distributed under Eclipse Public License - v 1.0.
+
+
+
+=========================================================================
+== HttpUnit Notice ==
+=========================================================================
+This software comes bundled with HttpUnit library package,
+which is open source software. The HttpUnit framework
+is an open-source project hosted on Sourceforge.net,
+and is developed by Russell Gold.
+
+=========================================================================
+== Jetty Notice ==
+=========================================================================
+
+This software comes bundled with a Jetty library package,
+which is open source software. The Jetty software
+is an open-source project hosted here
+
+http://www.mortbay.org/
+
+and is distributed under Apache2 license.
+
+
+
+=========================================================================
+== Commons Logging Notice ==
+=========================================================================
+
+Copyright 2005-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+
+=========================================================================
+== Commons HttpClient Notice ==
+=========================================================================
+
+Copyright 2005-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+
+=========================================================================
+== Jasper Compiler Notice ==
+=========================================================================
+
+Copyright 2005-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+
+=========================================================================
+== Jasper Runtime Notice ==
+=========================================================================
+
+Copyright 2005-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+
+=========================================================================
+== NekoHtml Notice ==
+=========================================================================
+
+This software comes bundled with the NekoHtml library package,
+which is open source software. The NekoHtml software
+is an open-source project hosted on Sourceforge.net, and distributed
+under Apache2 license.
\ No newline at end of file
Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=643356&r1=643355&r2=643356&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
+++ jakarta/cactus/trunk/cactus-bin-assembly.xml Tue Apr 1 03:48:27 2008
@@ -100,6 +100,16 @@
</includes>
</fileSet>
<fileSet>
+ <directory>cactus-site/src/site/resources/</directory>
+ <outputDirectory>documentation</outputDirectory>
+ <includes>
+ <include>**/apidocs/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/xref/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
<directory>descriptors/licenses</directory>
<outputDirectory>licenses</outputDirectory>
<includes>
Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=643356&r1=643355&r2=643356&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
+++ jakarta/cactus/trunk/cactus-src-assembly.xml Tue Apr 1 03:48:27 2008
@@ -40,6 +40,8 @@
<exclude>bin/**</exclude>
<!-- svn directories. -->
<exclude>**/.svn/**</exclude>
+ <exclude>**/xref/**</exclude>
+ <exclude>**/apidocs/**</exclude>
<exclude>descriptors/**</exclude>
<exclude>scratchpad/**</exclude>
</excludes>
Modified: jakarta/cactus/trunk/descriptors/licenses/README.txt
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/descriptors/licenses/README.txt?rev=643356&r1=643355&r2=643356&view=diff
==============================================================================
--- jakarta/cactus/trunk/descriptors/licenses/README.txt (original)
+++ jakarta/cactus/trunk/descriptors/licenses/README.txt Tue Apr 1 03:48:27
2008
@@ -5,9 +5,9 @@
AspectJ - Mozilla 1.1
HttpUnit - HttpUnit specific license
Jetty - Apache 2.0
-Jakarta Cactus - Apache 2.0
-Jakarta Commons Logging - Apache 2.0
-Jakarta Commons HttpClient - Apache 2.0
+Apache Cactus - Apache 2.0
+Apache Commons Logging - Apache 2.0
+Apache Commons HttpClient - Apache 2.0
Jasper Compiler - Apache 2.0
Jasper Runtime - Apache 2.0
JUnit - Common Public License v1.0
Added: jakarta/cactus/trunk/descriptors/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/descriptors/pom.xml?rev=643356&view=auto
==============================================================================
--- jakarta/cactus/trunk/descriptors/pom.xml (added)
+++ jakarta/cactus/trunk/descriptors/pom.xml Tue Apr 1 03:48:27 2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.samples</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <name>Cactus Samples - Parent Project</name>
+ <description>Cactus Sample Projects</description>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-ejb</artifactId>
+ <version>2.1-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>4.2.25</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>with-samples</id>
+ <modules>
+ <module>servlet</module>
+ <module>ejb</module>
+ <module>jetty</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
+
+
+
+
Propchange: jakarta/cactus/trunk/descriptors/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
