Author: wsmoak
Date: Thu Jul 13 23:34:51 2006
New Revision: 421815
URL: http://svn.apache.org/viewvc?rev=421815&view=rev
Log:
First pass at Struts 2 distribution assemblies.
Docs from Confluence are not yet included.
WW-1378
Added:
struts/struts2/trunk/assembly/
struts/struts2/trunk/assembly/pom.xml (with props)
struts/struts2/trunk/assembly/src/
struts/struts2/trunk/assembly/src/main/
struts/struts2/trunk/assembly/src/main/assembly/
struts/struts2/trunk/assembly/src/main/assembly/all.xml (with props)
struts/struts2/trunk/assembly/src/main/assembly/apps.xml (with props)
struts/struts2/trunk/assembly/src/main/assembly/lib.xml (with props)
struts/struts2/trunk/assembly/src/main/assembly/src.xml (with props)
struts/struts2/trunk/assembly/src/main/resources/
struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt (with props)
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (with props)
Added: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (added)
+++ struts/struts2/trunk/assembly/pom.xml Thu Jul 13 23:34:51 2006
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005-2006 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$
+ */
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>Struts 2 Assembly</name>
+ <description>
+ Struts 2 Assembly
+ </description>
+
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-blank</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+
<artifactId>struts2-shopping-cart</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-showcase</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-starter</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/apps</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/all.xml</descriptor>
+ <descriptor>src/main/assembly/lib.xml</descriptor>
+ <descriptor>src/main/assembly/apps.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <finalName>struts-${version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-extras</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <!-- Include optional dependencies -->
+
+ <!-- Exclude transitive dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: struts/struts2/trunk/assembly/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Thu Jul 13 23:34:51
2006
@@ -0,0 +1,149 @@
+<!--
+/*
+ * $Id$
+ *
+ * Copyright 2006 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.
+ */
+-->
+
+<assembly>
+ <id>all</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/apps</directory>
+ <outputDirectory>apps</outputDirectory>
+ <includes>
+ <include>*.war</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the source code in the assembly -->
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../api</directory>
+ <outputDirectory>src/api</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps</directory>
+ <outputDirectory>src/apps</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/blank</directory>
+ <outputDirectory>src/apps/blank</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/portlet</directory>
+ <outputDirectory>src/apps/portlet</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/shopping-cart</directory>
+ <outputDirectory>src/apps/shopping-cart</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/showcase</directory>
+ <outputDirectory>src/apps/showcase</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/starter</directory>
+ <outputDirectory>src/apps/starter</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../assembly</directory>
+ <outputDirectory>src/assembly</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../core</directory>
+ <outputDirectory>src/core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>src/extras</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../uber</directory>
+ <outputDirectory>src/uber</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/all.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/all.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/assembly/apps.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/apps.xml?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/apps.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/apps.xml Thu Jul 13
23:34:51 2006
@@ -0,0 +1,43 @@
+<!--
+/*
+ * $Id$
+ *
+ * Copyright 2006 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.
+ */
+-->
+<assembly>
+ <id>apps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/apps</directory>
+ <outputDirectory>apps</outputDirectory>
+ <includes>
+ <include>*.war</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/apps.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/apps.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Thu Jul 13 23:34:51
2006
@@ -0,0 +1,43 @@
+<!--
+/*
+ * $Id$
+ *
+ * Copyright 2006 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.
+ */
+-->
+
+<assembly>
+ <id>lib</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/src.xml?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/src.xml (added)
+++ struts/struts2/trunk/assembly/src/main/assembly/src.xml Thu Jul 13 23:34:51
2006
@@ -0,0 +1,138 @@
+<!--
+/*
+ * $Id$
+ *
+ * Copyright 2006 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.
+ */
+-->
+
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include the source code in the assembly -->
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../api</directory>
+ <outputDirectory>src/api</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps</directory>
+ <outputDirectory>src/apps</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/blank</directory>
+ <outputDirectory>src/apps/blank</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/portlet</directory>
+ <outputDirectory>src/apps/portlet</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/shopping-cart</directory>
+ <outputDirectory>src/apps/shopping-cart</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/showcase</directory>
+ <outputDirectory>src/apps/showcase</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../apps/starter</directory>
+ <outputDirectory>src/apps/starter</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../assembly</directory>
+ <outputDirectory>src/assembly</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../core</directory>
+ <outputDirectory>src/core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>src/extras</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../uber</directory>
+ <outputDirectory>src/uber</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Propchange: struts/struts2/trunk/assembly/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt (added)
+++ struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt Thu Jul 13
23:34:51 2006
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Propchange: struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/resources/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt?rev=421815&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (added)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Thu Jul 13
23:34:51 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
