You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2006/12/01 05:40:17 UTC
svn commit: r481148 [1/5] - in /geronimo/server/trunk: ./ applications/console/geronimo-console-core/ applications/console/geronimo-console-ear/ applications/console/geronimo-console-framework/ applications/console/geronimo-console-standard/ applicatio...

Author: kevan
Date: Thu Nov 30 20:40:10 2006
New Revision: 481148

URL: http://svn.apache.org/viewvc?view=rev&rev=481148
Log:
GERONIMO-2537 Merge from branches/1.2 onto trunk. I have not reviewed trunk license info. So, it's possible that there are already some deltas which should be reflected in license/notice files. This change updates the general LICENSE.txt and NOTICE.txt files. Note that I've expanded the notice/license files in the root of a source distribution. Also added required copyright to NOTICE.txt files. Note that minimal distributions have an overly broad license/notice files. Also, we have multiple copies of the same general license/notice files. Would be good to reduce these.

Added:
    geronimo/server/trunk/configs/persistence-jpa10-deployer/LICENSE.txt   (with props)
    geronimo/server/trunk/configs/persistence-jpa10-deployer/NOTICE.txt   (with props)
Modified:
    geronimo/server/trunk/LICENSE.txt
    geronimo/server/trunk/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt
    geronimo/server/trunk/applications/demo/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-ca-helper/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-dojo/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-ldap-demo/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-remote-deploy/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-uddi-db/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-uddi-server/NOTICE.txt
    geronimo/server/trunk/applications/geronimo-welcome/NOTICE.txt
    geronimo/server/trunk/applications/magicGball/magicGball-client/NOTICE.txt
    geronimo/server/trunk/applications/magicGball/magicGball-ear/NOTICE.txt
    geronimo/server/trunk/applications/magicGball/magicGball-ejb/NOTICE.txt
    geronimo/server/trunk/applications/magicGball/magicGball-web/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/NOTICE.txt
    geronimo/server/trunk/configs/activemq-broker/NOTICE.txt
    geronimo/server/trunk/configs/activemq/NOTICE.txt
    geronimo/server/trunk/configs/axis-deployer/NOTICE.txt
    geronimo/server/trunk/configs/axis/NOTICE.txt
    geronimo/server/trunk/configs/client-corba-yoko/NOTICE.txt
    geronimo/server/trunk/configs/client-deployer/NOTICE.txt
    geronimo/server/trunk/configs/client-security/NOTICE.txt
    geronimo/server/trunk/configs/client-system/NOTICE.txt
    geronimo/server/trunk/configs/client-transaction/NOTICE.txt
    geronimo/server/trunk/configs/client/NOTICE.txt
    geronimo/server/trunk/configs/clustering/NOTICE.txt
    geronimo/server/trunk/configs/connector-deployer/NOTICE.txt
    geronimo/server/trunk/configs/daytrader-jetty/NOTICE.txt
    geronimo/server/trunk/configs/daytrader-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/directory/NOTICE.txt
    geronimo/server/trunk/configs/dojo-jetty/NOTICE.txt
    geronimo/server/trunk/configs/dojo-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/geronimo-gbean-deployer/NOTICE.txt
    geronimo/server/trunk/configs/hot-deployer/NOTICE.txt
    geronimo/server/trunk/configs/j2ee-corba-yoko/NOTICE.txt
    geronimo/server/trunk/configs/j2ee-deployer/NOTICE.txt
    geronimo/server/trunk/configs/j2ee-security/NOTICE.txt
    geronimo/server/trunk/configs/j2ee-server/NOTICE.txt
    geronimo/server/trunk/configs/j2ee-system/NOTICE.txt
    geronimo/server/trunk/configs/javamail/NOTICE.txt
    geronimo/server/trunk/configs/jetty-clustering-builder-wadi/NOTICE.txt
    geronimo/server/trunk/configs/jetty-clustering-wadi/NOTICE.txt
    geronimo/server/trunk/configs/jetty-deployer/NOTICE.txt
    geronimo/server/trunk/configs/jetty/NOTICE.txt
    geronimo/server/trunk/configs/jsp-examples-jetty/NOTICE.txt
    geronimo/server/trunk/configs/jsp-examples-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/ldap-demo-jetty/NOTICE.txt
    geronimo/server/trunk/configs/ldap-demo-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/ldap-realm/NOTICE.txt
    geronimo/server/trunk/configs/online-deployer/NOTICE.txt
    geronimo/server/trunk/configs/openejb-corba-deployer/NOTICE.txt
    geronimo/server/trunk/configs/openejb-deployer/NOTICE.txt
    geronimo/server/trunk/configs/openejb/NOTICE.txt
    geronimo/server/trunk/configs/openjpa/NOTICE.txt
    geronimo/server/trunk/configs/remote-deploy-jetty/NOTICE.txt
    geronimo/server/trunk/configs/remote-deploy-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/rmi-naming/NOTICE.txt
    geronimo/server/trunk/configs/servlet-examples-jetty/NOTICE.txt
    geronimo/server/trunk/configs/servlet-examples-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/sharedlib/NOTICE.txt
    geronimo/server/trunk/configs/shutdown/NOTICE.txt
    geronimo/server/trunk/configs/system-database/NOTICE.txt
    geronimo/server/trunk/configs/tomcat-deployer/NOTICE.txt
    geronimo/server/trunk/configs/tomcat/NOTICE.txt
    geronimo/server/trunk/configs/transaction/NOTICE.txt
    geronimo/server/trunk/configs/transformer-agent/NOTICE.txt
    geronimo/server/trunk/configs/uddi-jetty/NOTICE.txt
    geronimo/server/trunk/configs/uddi-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/unavailable-client-deployer/NOTICE.txt
    geronimo/server/trunk/configs/unavailable-ejb-deployer/NOTICE.txt
    geronimo/server/trunk/configs/unavailable-webservices-deployer/NOTICE.txt
    geronimo/server/trunk/configs/upgrade-cli/NOTICE.txt
    geronimo/server/trunk/configs/upgrade/NOTICE.txt
    geronimo/server/trunk/configs/wadi-clustering/NOTICE.txt
    geronimo/server/trunk/configs/webconsole-jetty/NOTICE.txt
    geronimo/server/trunk/configs/webconsole-tomcat/NOTICE.txt
    geronimo/server/trunk/configs/welcome-jetty/NOTICE.txt
    geronimo/server/trunk/configs/welcome-tomcat/NOTICE.txt
    geronimo/server/trunk/modules/ge-activemq-rar/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-activation/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-activemq-gbean-management/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-activemq-gbean/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-axis-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-axis/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-client-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-client/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-common/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-connector-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-connector/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-converter/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-core/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-deploy-config/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-deploy-tool/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-deployment/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-derby/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-directory/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-hot-deploy/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-interceptor/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-j2ee-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-j2ee-schema/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-j2ee/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jmx-remoting/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-kernel/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-mail/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-management/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-naming-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-naming/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-security-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-security/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-service-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-system/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-test-ddbean/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-timer/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-tomcat-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-tomcat/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-transaction/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-upgrade/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-util/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-web-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-webservices-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-webservices/NOTICE.txt