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 2007/03/11 23:01:16 UTC
svn commit: r517027 - in /portals/jetspeed-2/trunk: ./ ant-tasks/
applications/demo/ applications/gems/ applications/j2-admin/
applications/rss/ commons/ components/capability/ components/cm/
components/deploy-tool/ components/file-cache/ components/he...
Author: ate
Date: Sun Mar 11 15:01:13 2007
New Revision: 517027
URL: http://svn.apache.org/viewvc?view=rev&rev=517027
Log:
JIRA issue JS2-659: Compliance with http://www.apache.org/legal/src-headers.html
- adding appropriate NOTICE.txt files to all produced artifacts
AFAIK, this completes the requirements as described on http://www.apache.org/legal/src-headers.html
Still todo: make bridges compliant to the same requirements (PB-57).
Once bridges is compliant too a new Jetspeed-2 tag 2.1.1 could be set
Added:
portals/jetspeed-2/trunk/NOTICE.txt (with props)
portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt (with props)
portals/jetspeed-2/trunk/components/portal/NOTICE.txt (with props)
portals/jetspeed-2/trunk/installer/etc/NOTICE.txt (with props)
portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt (with props)
portals/jetspeed-2/trunk/src/webapp/META-INF/
portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt (with props)
Modified:
portals/jetspeed-2/trunk/ant-tasks/project.xml
portals/jetspeed-2/trunk/applications/demo/project.xml
portals/jetspeed-2/trunk/applications/gems/project.xml
portals/jetspeed-2/trunk/applications/j2-admin/project.xml
portals/jetspeed-2/trunk/applications/rss/project.xml
portals/jetspeed-2/trunk/commons/project.xml
portals/jetspeed-2/trunk/components/capability/project.xml
portals/jetspeed-2/trunk/components/cm/project.xml
portals/jetspeed-2/trunk/components/deploy-tool/project.xml
portals/jetspeed-2/trunk/components/file-cache/project.xml
portals/jetspeed-2/trunk/components/header-resource/project.xml
portals/jetspeed-2/trunk/components/id-generator/project.xml
portals/jetspeed-2/trunk/components/jetspeed/project.xml
portals/jetspeed-2/trunk/components/locator/project.xml
portals/jetspeed-2/trunk/components/page-manager/project.xml
portals/jetspeed-2/trunk/components/portal-site/project.xml
portals/jetspeed-2/trunk/components/portal/project.xml
portals/jetspeed-2/trunk/components/portlet-factory/project.xml
portals/jetspeed-2/trunk/components/prefs/project.xml
portals/jetspeed-2/trunk/components/profiler/project.xml
portals/jetspeed-2/trunk/components/rdbms/project.xml
portals/jetspeed-2/trunk/components/registry/project.xml
portals/jetspeed-2/trunk/components/rewriter/project.xml
portals/jetspeed-2/trunk/components/search/project.xml
portals/jetspeed-2/trunk/components/security-schema/project.xml
portals/jetspeed-2/trunk/components/security/project.xml
portals/jetspeed-2/trunk/components/serializer/project.xml
portals/jetspeed-2/trunk/components/sso/project.xml
portals/jetspeed-2/trunk/components/statistics/project.xml
portals/jetspeed-2/trunk/components/web-content/project.xml
portals/jetspeed-2/trunk/components/webapp-logging/project.xml
portals/jetspeed-2/trunk/installer/maven.xml
portals/jetspeed-2/trunk/jetspeed-api/project.xml
portals/jetspeed-2/trunk/layout-portlets/project.xml
portals/jetspeed-2/trunk/maven-plugin/project.xml
portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml
Added: portals/jetspeed-2/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,6 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
\ No newline at end of file
Propchange: portals/jetspeed-2/trunk/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/ant-tasks/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/project.xml (original)
+++ portals/jetspeed-2/trunk/ant-tasks/project.xml Sun Mar 11 15:01:13 2007
@@ -1,45 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
-
- $Id: project.xml 355198 2005-12-08 20:44:03Z rogerrut $
--->
-<project>
- <extend>${basedir}/../core-build.xml</extend>
- <pomVersion>3</pomVersion>
- <artifactId>ant-tasks</artifactId>
- <name>Jetspeed-2 Ant Tasks</name>
-
- <package>org.apache.jetspeed</package>
- <description>Ant Tasks Required for the Jetspeed-2 Product Build.</description>
- <shortDescription>Ant Tasks Required for the Jetspeed-2 Product Build.</shortDescription>
-
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks
- </developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/ant-tasks/</url>
- </repository>
- <dependency>
- <id>ant</id>
- <version>1.6.5</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
-</project>
+ 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.xml 355198 2005-12-08 20:44:03Z rogerrut $
+-->
+<project>
+ <extend>${basedir}/../core-build.xml</extend>
+ <pomVersion>3</pomVersion>
+ <artifactId>ant-tasks</artifactId>
+ <name>Jetspeed-2 Ant Tasks</name>
+
+ <package>org.apache.jetspeed</package>
+ <description>Ant Tasks Required for the Jetspeed-2 Product Build.</description>
+ <shortDescription>Ant Tasks Required for the Jetspeed-2 Product Build.</shortDescription>
+
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks</connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks
+ </developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/ant-tasks/</url>
+ </repository>
+ <dependency>
+ <id>ant</id>
+ <version>1.6.5</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Sun Mar 11 15:01:13 2007
@@ -314,6 +314,7 @@
<targetPath>../${pom.artifactId}/META-INF</targetPath>
<includes>
<include>LICENSE.TXT</include>
+ <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Modified: portals/jetspeed-2/trunk/applications/gems/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/project.xml Sun Mar 11 15:01:13 2007
@@ -167,4 +167,24 @@
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/project.xml Sun Mar 11 15:01:13 2007
@@ -428,6 +428,7 @@
<targetPath>../${pom.artifactId}/META-INF</targetPath>
<includes>
<include>LICENSE.TXT</include>
+ <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Modified: portals/jetspeed-2/trunk/applications/rss/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.xml Sun Mar 11 15:01:13 2007
@@ -186,6 +186,7 @@
<targetPath>../${pom.artifactId}/META-INF</targetPath>
<includes>
<include>LICENSE.TXT</include>
+ <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Modified: portals/jetspeed-2/trunk/commons/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/commons/project.xml (original)
+++ portals/jetspeed-2/trunk/commons/project.xml Sun Mar 11 15:01:13 2007
@@ -59,4 +59,23 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/capability/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/project.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/project.xml Sun Mar 11 15:01:13 2007
@@ -104,6 +104,13 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: portals/jetspeed-2/trunk/components/cm/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/project.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/project.xml Sun Mar 11 15:01:13 2007
@@ -64,7 +64,22 @@
</resources>
</unitTest>
-
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
</build>
</project>
Added: portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,10 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This software includes Sun's web-app_2_3.dtd file
+ (see http://java.sun.com/dtd/).
+
+
Propchange: portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/deploy-tool/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.xml Sun Mar 11 15:01:13 2007
@@ -31,4 +31,23 @@
<version>${jetspeed.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/file-cache/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.xml Sun Mar 11 15:01:13 2007
@@ -56,7 +56,14 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
- </resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
Modified: portals/jetspeed-2/trunk/components/header-resource/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/project.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/project.xml Sun Mar 11 15:01:13 2007
@@ -55,4 +55,23 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/id-generator/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/project.xml Sun Mar 11 15:01:13 2007
@@ -48,4 +48,23 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/project.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/project.xml Sun Mar 11 15:01:13 2007
@@ -46,4 +46,23 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/locator/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/project.xml Sun Mar 11 15:01:13 2007
@@ -44,4 +44,24 @@
<version>${jetspeed.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/page-manager/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/project.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/project.xml Sun Mar 11 15:01:13 2007
@@ -124,6 +124,13 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: portals/jetspeed-2/trunk/components/portal-site/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/project.xml Sun Mar 11 15:01:13 2007
@@ -103,6 +103,22 @@
</resource>
</resources>
</unitTest>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Added: portals/jetspeed-2/trunk/components/portal/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/components/portal/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,10 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This software includes Sun's web-app_2_2.dtd and web-app_2_3.dtd files
+ (see http://java.sun.com/dtd/).
+
+
Propchange: portals/jetspeed-2/trunk/components/portal/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/portal/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Sun Mar 11 15:01:13 2007
@@ -93,6 +93,13 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: portals/jetspeed-2/trunk/components/portlet-factory/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portlet-factory/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/project.xml Sun Mar 11 15:01:13 2007
@@ -47,4 +47,24 @@
<version>${jetspeed.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/prefs/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/prefs/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/project.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/project.xml Sun Mar 11 15:01:13 2007
@@ -97,5 +97,23 @@
</resource>
</resources>
</unitTest>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/profiler/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/project.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/project.xml Sun Mar 11 15:01:13 2007
@@ -99,6 +99,24 @@
</resource>
</resources>
</unitTest>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/rdbms/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/project.xml Sun Mar 11 15:01:13 2007
@@ -45,4 +45,24 @@
</properties>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/registry/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/project.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/project.xml Sun Mar 11 15:01:13 2007
@@ -134,6 +134,21 @@
</resources>
</unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/rewriter/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/project.xml Sun Mar 11 15:01:13 2007
@@ -43,6 +43,21 @@
<include>**/Test*.java</include>
</includes>
</unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/search/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/search/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/search/project.xml (original)
+++ portals/jetspeed-2/trunk/components/search/project.xml Sun Mar 11 15:01:13 2007
@@ -51,5 +51,24 @@
</dependency>
</dependencies>
-
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/security-schema/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security-schema/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/project.xml Sun Mar 11 15:01:13 2007
@@ -1,58 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
-
- $Id: project.xml 230879 2005-08-08 20:37:06Z ate $
--->
-<project>
- <extend>${basedir}/../../core-build.xml</extend>
- <pomVersion>3</pomVersion>
- <id>jetspeed-security-schema</id>
- <name>Jetspeed-2 Security LDAP Schema Components</name>
-
- <package>org.apache.jetspeed</package>
- <description>Security Components</description>
- <shortDescription>Security Components</shortDescription>
-
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
- </repository>
-
- <dependencies>
- <dependency>
- <groupId>directory</groupId>
- <artifactId>maven-directory-plugin</artifactId>
- <version>0.9.3</version>
- <type>plugin</type>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>${basedir}/target/schema</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
+ 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.xml 230879 2005-08-08 20:37:06Z ate $
+-->
+<project>
+ <extend>${basedir}/../../core-build.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed-security-schema</id>
+ <name>Jetspeed-2 Security LDAP Schema Components</name>
+
+ <package>org.apache.jetspeed</package>
+ <description>Security Components</description>
+ <shortDescription>Security Components</shortDescription>
+
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
+ </repository>
+
+ <dependencies>
+ <dependency>
+ <groupId>directory</groupId>
+ <artifactId>maven-directory-plugin</artifactId>
+ <version>0.9.3</version>
+ <type>plugin</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${basedir}/target/schema</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: portals/jetspeed-2/trunk/components/security/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/security/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security/project.xml Sun Mar 11 15:01:13 2007
@@ -114,6 +114,21 @@
</resource>
</resources>
</unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/serializer/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/project.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/project.xml Sun Mar 11 15:01:13 2007
@@ -141,5 +141,23 @@
</dependencies>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: portals/jetspeed-2/trunk/components/sso/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/project.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/project.xml Sun Mar 11 15:01:13 2007
@@ -145,6 +145,22 @@
</resource>
</resources>
</unitTest>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: portals/jetspeed-2/trunk/components/statistics/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/project.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/project.xml Sun Mar 11 15:01:13 2007
@@ -1,132 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
-
- $Id: project.xml 230879 2005-08-08 20:37:06Z ate $
--->
-<project>
- <extend>${basedir}/../../core-build.xml</extend>
- <pomVersion>3</pomVersion>
- <id>jetspeed-statistics</id>
- <name>Jetspeed-2 Portal Statistics Components</name>
-
- <package>org.apache.jetspeed.statistics</package>
- <description>Portal Statistics Components</description>
- <shortDescription>Single Sign On statistics Components</shortDescription>
-
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/statistics</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/statistics</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/statistics/</url>
- </repository>
-
- <dependencies>
-
- <dependency>
- <id>jetspeed-api</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>${jetspeed.version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>derby</id>
- <groupId>org.apache.derby</groupId>
- <version>10.1.1.0</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>jetspeed-registry</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>${jetspeed.version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>jetspeed-rdbms</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>${jetspeed.version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>jetspeed-security</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>${jetspeed.version}</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <!-- test only -->
- <dependency>
- <id>jetspeed-cm</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>${jetspeed.version}</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <!-- Apache OJB persistence framework -->
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.3</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- </dependencies>
-
- <build>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/log4j</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/db-ojb</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
- </resource>
- </resources>
- </unitTest>
- </build>
-
-</project>
+ 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.xml 230879 2005-08-08 20:37:06Z ate $
+-->
+<project>
+ <extend>${basedir}/../../core-build.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed-statistics</id>
+ <name>Jetspeed-2 Portal Statistics Components</name>
+
+ <package>org.apache.jetspeed.statistics</package>
+ <description>Portal Statistics Components</description>
+ <shortDescription>Single Sign On statistics Components</shortDescription>
+
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/statistics</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/statistics</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/statistics/</url>
+ </repository>
+
+ <dependencies>
+
+ <dependency>
+ <id>jetspeed-api</id>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>derby</id>
+ <groupId>org.apache.derby</groupId>
+ <version>10.1.1.0</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>jetspeed-registry</id>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>jetspeed-rdbms</id>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>jetspeed-security</id>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <!-- test only -->
+ <dependency>
+ <id>jetspeed-cm</id>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+
+ <!-- Apache OJB persistence framework -->
+ <dependency>
+ <id>ojb:db-ojb</id>
+ <version>1.0.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
+ </resource>
+ </resources>
+ </unitTest>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: portals/jetspeed-2/trunk/components/web-content/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/project.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/project.xml Sun Mar 11 15:01:13 2007
@@ -96,4 +96,22 @@
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/webapp-logging/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/project.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/project.xml Sun Mar 11 15:01:13 2007
@@ -64,6 +64,13 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
Added: portals/jetspeed-2/trunk/installer/etc/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/installer/etc/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,12 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software from AntInstaller (http://antinstaller.sf.net)
+ Copyright 2001-2004 The Apache Software Foundation
+
+ This product includes software from Karsten Lentzsch
+ Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All rights reserved.
+
\ No newline at end of file
Propchange: portals/jetspeed-2/trunk/installer/etc/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/installer/etc/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/installer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/maven.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/installer/maven.xml (original)
+++ portals/jetspeed-2/trunk/installer/maven.xml Sun Mar 11 15:01:13 2007
@@ -182,6 +182,7 @@
<include name="build.xml" />
</fileset>
<fileset file="${maven.build.dir}/antinstall-config.xml"/>
+ <fileset file="${basedir}/etc/NOTICE.txt"/>
<fileset dir="${basedir}/..">
<include name="LICENSE.TXT" />
</fileset>
Modified: portals/jetspeed-2/trunk/jetspeed-api/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/project.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/project.xml Sun Mar 11 15:01:13 2007
@@ -52,4 +52,22 @@
<version>${servlet.api.version}</version>
</dependency>
</dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/layout-portlets/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/project.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/project.xml Sun Mar 11 15:01:13 2007
@@ -174,6 +174,7 @@
<targetPath>../${pom.artifactId}/META-INF</targetPath>
<includes>
<include>LICENSE.TXT</include>
+ <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Added: portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,14 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software developed at The Dojo Foundation (http://dojotoolkit.org)
+ Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+ This product includes images provided under the Creative Commons Attribution-ShareAlike 2.5
+
+ This product includes the JSCookMenu v.1.4 javascript library developed by Heng Yuan
+ JSCookMenu v1.4. (c) Copyright 2002-2005 by Heng Yuan
+
\ No newline at end of file
Propchange: portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/maven-plugin/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Sun Mar 11 15:01:13 2007
@@ -126,6 +126,13 @@
<include>LICENSE.TXT</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
</project>
Added: portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt?view=auto&rev=517027
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt (added)
+++ portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt Sun Mar 11 15:01:13 2007
@@ -0,0 +1,14 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software developed at The Dojo Foundation (http://dojotoolkit.org)
+ Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+ This product includes images provided under the Creative Commons Attribution-ShareAlike 2.5
+
+ This product includes the JSCookMenu v.1.4 javascript library developed by Heng Yuan
+ JSCookMenu v1.4. (c) Copyright 2002-2005 by Heng Yuan
+
\ No newline at end of file
Propchange: portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/src/webapp/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml?view=diff&rev=517027&r1=517026&r2=517027
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml Sun Mar 11 15:01:13 2007
@@ -85,4 +85,24 @@
</properties>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}/../..</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org