Author: akarasulu
Date: Mon Dec 27 20:39:49 2004
New Revision: 123470
URL: http://svn.apache.org/viewcvs?view=rev&rev=123470
Log:
Changes ...
o all subprojects minus eve did not have the incubator disclaimer and notice
so I added these and made sure their are local copies present; Brett
recommended keeping local copies of the NOTICE.txt, LICENSE.txt, and the
INCUBATOR-DISCLAIMER.txt to prevent breakage when tagging and branching
which makes a lot of sense
o janus and naming had the wrong groupId; they all need to be incubator- and
for now we'll put everything under on groupId since this is an incubator
release and we want that incubator-
o janus was building the top level jar with nothing in it so I made it exclude
the parent project in multiproject
Added:
incubator/directory/janus/trunk/INCUBATOR-DISCLAIMER.txt
- copied unchanged from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt
incubator/directory/janus/trunk/LICENSE.txt
- copied unchanged from r123441, incubator/directory/LICENSE.txt
incubator/directory/janus/trunk/NOTICE.txt
- copied unchanged from r123441, incubator/directory/NOTICE.txt
incubator/directory/kerberos/trunk/INCUBATOR-DISCLAIMER.txt
- copied unchanged from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt
incubator/directory/kerberos/trunk/LICENSE.txt
- copied unchanged from r123441, incubator/directory/LICENSE.txt
incubator/directory/kerberos/trunk/NOTICE.txt
- copied unchanged from r123441, incubator/directory/NOTICE.txt
incubator/directory/ldap/trunk/INCUBATOR-DISCLAIMER.txt
- copied unchanged from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt
incubator/directory/ldap/trunk/LICENSE.txt
- copied unchanged from r123441, incubator/directory/LICENSE.txt
incubator/directory/ldap/trunk/NOTICE.txt
- copied unchanged from r123441, incubator/directory/NOTICE.txt
incubator/directory/naming/trunk/INCUBATOR-DISCLAIMER.txt
incubator/directory/naming/trunk/NOTICE.txt
incubator/directory/seda/trunk/INCUBATOR-DISCLAIMER.txt
- copied unchanged from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt
incubator/directory/seda/trunk/LICENSE.txt
- copied unchanged from r123441, incubator/directory/LICENSE.txt
incubator/directory/seda/trunk/NOTICE.txt
- copied unchanged from r123441, incubator/directory/NOTICE.txt
incubator/directory/snickers/trunk/INCUBATOR-DISCLAIMER.txt
- copied unchanged from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt
incubator/directory/snickers/trunk/LICENSE.txt
- copied unchanged from r123441, incubator/directory/LICENSE.txt
incubator/directory/snickers/trunk/NOTICE.txt
- copied unchanged from r123441, incubator/directory/NOTICE.txt
Modified:
incubator/directory/janus/trunk/core/api/project.xml
incubator/directory/janus/trunk/core/impl/project.xml
incubator/directory/janus/trunk/example/ (props changed)
incubator/directory/janus/trunk/project.properties
incubator/directory/janus/trunk/project.xml
incubator/directory/kerberos/trunk/client/project.properties
incubator/directory/kerberos/trunk/project.properties
incubator/directory/kerberos/trunk/project.xml
incubator/directory/naming/trunk/config/ (props changed)
incubator/directory/naming/trunk/project.xml
incubator/directory/seda/trunk/project.xml
incubator/directory/snickers/trunk/project.xml
Copied: incubator/directory/janus/trunk/INCUBATOR-DISCLAIMER.txt (from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/INCUBATOR-DISCLAIMER.txt?view=diff&rev=123470&p1=incubator/directory/INCUBATOR-DISCLAIMER.txt&r1=123441&p2=incubator/directory/janus/trunk/INCUBATOR-DISCLAIMER.txt&r2=123470
==============================================================================
Copied: incubator/directory/janus/trunk/LICENSE.txt (from r123441,
incubator/directory/LICENSE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/LICENSE.txt?view=diff&rev=123470&p1=incubator/directory/LICENSE.txt&r1=123441&p2=incubator/directory/janus/trunk/LICENSE.txt&r2=123470
==============================================================================
Copied: incubator/directory/janus/trunk/NOTICE.txt (from r123441,
incubator/directory/NOTICE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/NOTICE.txt?view=diff&rev=123470&p1=incubator/directory/NOTICE.txt&r1=123441&p2=incubator/directory/janus/trunk/NOTICE.txt&r2=123470
==============================================================================
Modified: incubator/directory/janus/trunk/core/api/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/api/project.xml?view=diff&rev=123470&p1=incubator/directory/janus/trunk/core/api/project.xml&r1=123469&p2=incubator/directory/janus/trunk/core/api/project.xml&r2=123470
==============================================================================
--- incubator/directory/janus/trunk/core/api/project.xml (original)
+++ incubator/directory/janus/trunk/core/api/project.xml Mon Dec 27
20:39:49 2004
@@ -12,4 +12,17 @@
Janus Security Framework APIs
</description>
-</project>
\ No newline at end of file
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+</project>
Modified: incubator/directory/janus/trunk/core/impl/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/core/impl/project.xml?view=diff&rev=123470&p1=incubator/directory/janus/trunk/core/impl/project.xml&r1=123469&p2=incubator/directory/janus/trunk/core/impl/project.xml&r2=123470
==============================================================================
--- incubator/directory/janus/trunk/core/impl/project.xml (original)
+++ incubator/directory/janus/trunk/core/impl/project.xml Mon Dec 27
20:39:49 2004
@@ -25,4 +25,19 @@
<version>3.1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: incubator/directory/janus/trunk/project.properties
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/project.properties?view=diff&rev=123470&p1=incubator/directory/janus/trunk/project.properties&r1=123469&p2=incubator/directory/janus/trunk/project.properties&r2=123470
==============================================================================
--- incubator/directory/janus/trunk/project.properties (original)
+++ incubator/directory/janus/trunk/project.properties Mon Dec 27 20:39:49 2004
@@ -10,7 +10,8 @@
maven.xdoc.includeProjectDocumentation=no
maven.xdoc.poweredby.image=
-maven.multiproject.includes = **/project.xml
+maven.multiproject.includes=**/project.xml
+maven.multiproject.excludes=project.xml
maven.repo.list=apachecvs
maven.repo.apachecvs=scp://cvs.apache.org
Modified: incubator/directory/janus/trunk/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/project.xml?view=diff&rev=123470&p1=incubator/directory/janus/trunk/project.xml&r1=123469&p2=incubator/directory/janus/trunk/project.xml&r2=123470
==============================================================================
--- incubator/directory/janus/trunk/project.xml (original)
+++ incubator/directory/janus/trunk/project.xml Mon Dec 27 20:39:49 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
- <groupId>directory</groupId>
+ <groupId>incubator-directory</groupId>
<artifactId>janus</artifactId>
<currentVersion>0.1-SNAPSHOT</currentVersion>
<name>Janus</name>
@@ -78,6 +78,18 @@
<integrationUnitTestPatterns/>
<resources>
+
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
+ </includes>
+ </resource>
+
+
<resource>
<directory>${basedir}/src/java</directory>
<excludes>
Copied: incubator/directory/kerberos/trunk/INCUBATOR-DISCLAIMER.txt (from
r123441, incubator/directory/INCUBATOR-DISCLAIMER.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/INCUBATOR-DISCLAIMER.txt?view=diff&rev=123470&p1=incubator/directory/INCUBATOR-DISCLAIMER.txt&r1=123441&p2=incubator/directory/kerberos/trunk/INCUBATOR-DISCLAIMER.txt&r2=123470
==============================================================================
Copied: incubator/directory/kerberos/trunk/LICENSE.txt (from r123441,
incubator/directory/LICENSE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/LICENSE.txt?view=diff&rev=123470&p1=incubator/directory/LICENSE.txt&r1=123441&p2=incubator/directory/kerberos/trunk/LICENSE.txt&r2=123470
==============================================================================
Copied: incubator/directory/kerberos/trunk/NOTICE.txt (from r123441,
incubator/directory/NOTICE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/NOTICE.txt?view=diff&rev=123470&p1=incubator/directory/NOTICE.txt&r1=123441&p2=incubator/directory/kerberos/trunk/NOTICE.txt&r2=123470
==============================================================================
Modified: incubator/directory/kerberos/trunk/client/project.properties
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/client/project.properties?view=diff&rev=123470&p1=incubator/directory/kerberos/trunk/client/project.properties&r1=123469&p2=incubator/directory/kerberos/trunk/client/project.properties&r2=123470
==============================================================================
--- incubator/directory/kerberos/trunk/client/project.properties
(original)
+++ incubator/directory/kerberos/trunk/client/project.properties Mon Dec
27 20:39:49 2004
@@ -1,2 +1,2 @@
maven.xdoc.includeProjectDocumentation=yes
-maven.license.licenseFile=${basedir}/../../../LICENSE.txt
+maven.license.licenseFile=${basedir}/../LICENSE.txt
Modified: incubator/directory/kerberos/trunk/project.properties
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/project.properties?view=diff&rev=123470&p1=incubator/directory/kerberos/trunk/project.properties&r1=123469&p2=incubator/directory/kerberos/trunk/project.properties&r2=123470
==============================================================================
--- incubator/directory/kerberos/trunk/project.properties (original)
+++ incubator/directory/kerberos/trunk/project.properties Mon Dec 27
20:39:49 2004
@@ -1,5 +1,5 @@
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=../../LICENSE.txt
+maven.license.licenseFile=../LICENSE.txt
maven.xdoc.date=left
maven.xdoc.includeProjectDocumentation=no
maven.xdoc.poweredby.image=
Modified: incubator/directory/kerberos/trunk/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/project.xml?view=diff&rev=123470&p1=incubator/directory/kerberos/trunk/project.xml&r1=123469&p2=incubator/directory/kerberos/trunk/project.xml&r2=123470
==============================================================================
--- incubator/directory/kerberos/trunk/project.xml (original)
+++ incubator/directory/kerberos/trunk/project.xml Mon Dec 27 20:39:49 2004
@@ -136,6 +136,16 @@
<include>**/*.x*</include>
</includes>
</resource>
+
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
+ </includes>
+ </resource>
<resource>
<directory>${basedir}/etc</directory>
Copied: incubator/directory/ldap/trunk/INCUBATOR-DISCLAIMER.txt (from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/INCUBATOR-DISCLAIMER.txt?view=diff&rev=123470&p1=incubator/directory/INCUBATOR-DISCLAIMER.txt&r1=123441&p2=incubator/directory/ldap/trunk/INCUBATOR-DISCLAIMER.txt&r2=123470
==============================================================================
Copied: incubator/directory/ldap/trunk/LICENSE.txt (from r123441,
incubator/directory/LICENSE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/LICENSE.txt?view=diff&rev=123470&p1=incubator/directory/LICENSE.txt&r1=123441&p2=incubator/directory/ldap/trunk/LICENSE.txt&r2=123470
==============================================================================
Copied: incubator/directory/ldap/trunk/NOTICE.txt (from r123441,
incubator/directory/NOTICE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/NOTICE.txt?view=diff&rev=123470&p1=incubator/directory/NOTICE.txt&r1=123441&p2=incubator/directory/ldap/trunk/NOTICE.txt&r2=123470
==============================================================================
Added: incubator/directory/naming/trunk/INCUBATOR-DISCLAIMER.txt
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/INCUBATOR-DISCLAIMER.txt?view=auto&rev=123470
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/INCUBATOR-DISCLAIMER.txt Mon Dec 27
20:39:49 2004
@@ -0,0 +1,17 @@
+ Incubator Disclaimer
+ ====================
+
+The Directory project is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by Noel Bergman. Incubation is required of all
+newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in
+a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the
+ASF.
+
+For more information about the incubation status of the Directory project you
+can go to the following page:
+
+http://incubator.apache.org/projects/directory.html
+
Added: incubator/directory/naming/trunk/NOTICE.txt
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/NOTICE.txt?view=auto&rev=123470
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/NOTICE.txt Mon Dec 27 20:39:49 2004
@@ -0,0 +1,4 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
Modified: incubator/directory/naming/trunk/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/project.xml?view=diff&rev=123470&p1=incubator/directory/naming/trunk/project.xml&r1=123469&p2=incubator/directory/naming/trunk/project.xml&r2=123470
==============================================================================
--- incubator/directory/naming/trunk/project.xml (original)
+++ incubator/directory/naming/trunk/project.xml Mon Dec 27 20:39:49 2004
@@ -4,7 +4,7 @@
<version>3</version>
<name>directory-naming</name>
<id>directory-naming</id>
- <groupId>directory-naming</groupId>
+ <groupId>incubator-directory</groupId>
<currentVersion>0.8</currentVersion>
<organization>
@@ -122,6 +122,18 @@
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
<resources>
+
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
+ </includes>
+ </resource>
+
+
<resource>
<directory>${basedir}/src/java</directory>
<includes>
Copied: incubator/directory/seda/trunk/INCUBATOR-DISCLAIMER.txt (from r123441,
incubator/directory/INCUBATOR-DISCLAIMER.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/trunk/INCUBATOR-DISCLAIMER.txt?view=diff&rev=123470&p1=incubator/directory/INCUBATOR-DISCLAIMER.txt&r1=123441&p2=incubator/directory/seda/trunk/INCUBATOR-DISCLAIMER.txt&r2=123470
==============================================================================
Copied: incubator/directory/seda/trunk/LICENSE.txt (from r123441,
incubator/directory/LICENSE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/trunk/LICENSE.txt?view=diff&rev=123470&p1=incubator/directory/LICENSE.txt&r1=123441&p2=incubator/directory/seda/trunk/LICENSE.txt&r2=123470
==============================================================================
Copied: incubator/directory/seda/trunk/NOTICE.txt (from r123441,
incubator/directory/NOTICE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/trunk/NOTICE.txt?view=diff&rev=123470&p1=incubator/directory/NOTICE.txt&r1=123441&p2=incubator/directory/seda/trunk/NOTICE.txt&r2=123470
==============================================================================
Modified: incubator/directory/seda/trunk/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/trunk/project.xml?view=diff&rev=123470&p1=incubator/directory/seda/trunk/project.xml&r1=123469&p2=incubator/directory/seda/trunk/project.xml&r2=123470
==============================================================================
--- incubator/directory/seda/trunk/project.xml (original)
+++ incubator/directory/seda/trunk/project.xml Mon Dec 27 20:39:49 2004
@@ -194,12 +194,15 @@
</resource>
<resource>
- <directory>${basedir}/conf</directory>
- <targetPath>BLOCK-INF</targetPath>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
<includes>
- <include>block.xml</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
</includes>
</resource>
+
</resources>
</build>
Copied: incubator/directory/snickers/trunk/INCUBATOR-DISCLAIMER.txt (from
r123441, incubator/directory/INCUBATOR-DISCLAIMER.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/snickers/trunk/INCUBATOR-DISCLAIMER.txt?view=diff&rev=123470&p1=incubator/directory/INCUBATOR-DISCLAIMER.txt&r1=123441&p2=incubator/directory/snickers/trunk/INCUBATOR-DISCLAIMER.txt&r2=123470
==============================================================================
Copied: incubator/directory/snickers/trunk/LICENSE.txt (from r123441,
incubator/directory/LICENSE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/snickers/trunk/LICENSE.txt?view=diff&rev=123470&p1=incubator/directory/LICENSE.txt&r1=123441&p2=incubator/directory/snickers/trunk/LICENSE.txt&r2=123470
==============================================================================
Copied: incubator/directory/snickers/trunk/NOTICE.txt (from r123441,
incubator/directory/NOTICE.txt)
Url:
http://svn.apache.org/viewcvs/incubator/directory/snickers/trunk/NOTICE.txt?view=diff&rev=123470&p1=incubator/directory/NOTICE.txt&r1=123441&p2=incubator/directory/snickers/trunk/NOTICE.txt&r2=123470
==============================================================================
Modified: incubator/directory/snickers/trunk/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/snickers/trunk/project.xml?view=diff&rev=123470&p1=incubator/directory/snickers/trunk/project.xml&r1=123469&p2=incubator/directory/snickers/trunk/project.xml&r2=123470
==============================================================================
--- incubator/directory/snickers/trunk/project.xml (original)
+++ incubator/directory/snickers/trunk/project.xml Mon Dec 27 20:39:49 2004
@@ -192,6 +192,7 @@
</unitTest>
<resources>
+
<resource>
<directory>${basedir}/src/java</directory>
<includes>
@@ -200,14 +201,17 @@
<include>**/*.x*</include>
</includes>
</resource>
-
+
<resource>
- <directory>${basedir}/conf</directory>
- <targetPath>BLOCK-INF</targetPath>
+ <directory>${basedir}/../</directory>
+ <targetPath>META-INF</targetPath>
<includes>
- <include>block.xml</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>INCUBATOR-DISCLAIMER.txt</include>
</includes>
</resource>
+
</resources>
<jars></jars>
</build>
