cvs commit: incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/network/protocol - New directory
adc 2004/02/24 17:14:16 incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/network/protocol - New directory
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean GBeanInfoFactory.java
dain2004/02/24 23:49:10
Modified:modules/kernel/src/java/org/apache/geronimo/gbean
GBeanInfoFactory.java
Log:
Changed operations to be keyed by a method signature instead of just
method name
Revision ChangesPath
1.14 +48 -22
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoFactory.java
Index: GBeanInfoFactory.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GBeanInfoFactory.java 24 Feb 2004 22:36:01 - 1.13
+++ GBeanInfoFactory.java 25 Feb 2004 07:49:10 - 1.14
@@ -65,6 +65,8 @@
import java.util.Map;
import java.util.Set;
+import org.apache.geronimo.kernel.jmx.MBeanOperationSignature;
+
/**
* @version $Revision$ $Date$
*/
@@ -91,7 +93,7 @@
}
public GBeanInfoFactory(Class clazz) {
-this(((Class) checkNotNull(clazz)).getName(), clazz.getName(), null);
+this(checkNotNull(clazz).getName(), clazz.getName(), null);
}
public GBeanInfoFactory(String name, String className) {
@@ -103,7 +105,7 @@
}
public GBeanInfoFactory(Class clazz, GBeanInfo source) {
-this(((Class) checkNotNull(clazz)).getName(), clazz.getName(),
source);
+this(checkNotNull(clazz).getName(), clazz.getName(), source);
}
public GBeanInfoFactory(String name, String className, GBeanInfo source)
{
@@ -113,19 +115,21 @@
this.name = name;
this.className = className;
if (source != null) {
-Set sourceAttrs = source.getAttributes();
-if (sourceAttrs != null !sourceAttrs.isEmpty()) {
-for (Iterator it = sourceAttrs.iterator(); it.hasNext();) {
-GAttributeInfo gattrInfo = (GAttributeInfo) it.next();
-attributes.put(gattrInfo.getName(), gattrInfo);
+Set sourceAttributes = source.getAttributes();
+if (sourceAttributes != null !sourceAttributes.isEmpty()) {
+for (Iterator it = sourceAttributes.iterator();
it.hasNext();) {
+GAttributeInfo attributeInfo = (GAttributeInfo)
it.next();
+attributes.put(attributeInfo.getName(), attributeInfo);
}
}
-Set sourceOps = source.getOperations();
-if (sourceOps != null !sourceOps.isEmpty()) {
-for (Iterator it = sourceOps.iterator(); it.hasNext();) {
-GOperationInfo gopInfo = (GOperationInfo) it.next();
-operations.put(gopInfo.getName(), gopInfo);
+Set sourceOperations = source.getOperations();
+if (sourceOperations != null !sourceOperations.isEmpty()) {
+for (Iterator it = sourceOperations.iterator();
it.hasNext();) {
+GOperationInfo operationInfo = (GOperationInfo)
it.next();
+operations.put(
+new
MBeanOperationSignature(operationInfo.getName(),
operationInfo.getParameterList()),
+operationInfo);
}
}
references.addAll(source.getReferences());
@@ -138,15 +142,29 @@
/**
* Checks whether or not the input argument is null; otherwise it throws
* [EMAIL PROTECTED] IllegalArgumentException}.
- *
- * @param obj
- *the input argument to validate
+ *
+ * @param clazz the input argument to validate
+ * @throws IllegalArgumentException if input is null
+ */
+private static Class checkNotNull(final Class clazz) {
+if (clazz == null) {
+throw new IllegalArgumentException(null argument supplied);
+}
+return clazz;
+}
+
+/**
+ * Checks whether or not the input argument is null; otherwise it throws
+ * [EMAIL PROTECTED] IllegalArgumentException}.
+ *
+ * @param string the input argument to validate
+ * @throws IllegalArgumentException if input is null
*/
-private static final Object checkNotNull(final Object obj) {
-if (obj == null) {
+private static String checkNotNull(final String string) {
+if (string == null) {
throw new IllegalArgumentException(null argument supplied);
}
-return obj;
+return string;
}
public void addInterface(Class intf) {
@@ -207,8 +225,10 @@
constructor = new GConstructorInfo(names, types);
}
-public void addOperation(GOperationInfo info) {
-operations.put(info.getName(),
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx ProxyMethodInterceptor.java
dain2004/02/24 23:50:25
Modified:modules/kernel/src/java/org/apache/geronimo/gbean/jmx
ProxyMethodInterceptor.java
Log:
Added more info the exception message
Revision ChangesPath
1.7 +3 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/ProxyMethodInterceptor.java
Index: ProxyMethodInterceptor.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/ProxyMethodInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProxyMethodInterceptor.java 24 Feb 2004 06:05:37 - 1.6
+++ ProxyMethodInterceptor.java 25 Feb 2004 07:50:25 - 1.7
@@ -157,7 +157,8 @@
}
InvokeMBean invoker = methodTable[proxy.getSuperIndex()];
if (invoker == null) {
-throw new NoSuchOperationError(No implementation method for +
method);
+throw new NoSuchOperationError(No implementation method: +
+ objectName= + objectName + , method= + method);
}
return invoker.invoke(server, objectName, args);
}
cvs commit: incubator-geronimo .cvsignore
dain2004/02/24 23:56:07 Modified:..cvsignore Log: Added velocity.log Revision ChangesPath 1.4 +1 -0 incubator-geronimo/.cvsignore Index: .cvsignore === RCS file: /home/cvs/incubator-geronimo/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore28 Jan 2004 21:18:17 - 1.3 +++ .cvsignore25 Feb 2004 07:56:06 - 1.4 @@ -3,3 +3,4 @@ maven.log junit*.properties target +velocity.log \ No newline at end of file
cvs commit: incubator-geronimo/modules/common/src/conf log4j.properties
dain2004/02/24 23:58:25 Removed: modules/kernel/src/conf log4j.properties modules/core/src/etc/logging log4j.xml modules/common/src/conf log4j.properties Log: Removed unused log4j property files
cvs commit: incubator-geronimo/modules/assembly/src/plan deployer-system-plan.xml
dain2004/02/25 00:00:22
Added: modules/assembly/src/plan deployer-system-plan.xml
Log:
Plan for the base deployer system. The base deployer system is not
described by this plan, instead of being hard coded in to Bootstrap
Revision ChangesPath
1.1
incubator-geronimo/modules/assembly/src/plan/deployer-system-plan.xml
Index: deployer-system-plan.xml
===
?xml version=1.0 encoding=UTF-8?
!--
Configuration for the system layer of the Geronimo deployer
--
configuration
xmlns=http://geronimo.apache.org/xml/ns/deployment;
configId=org/apache/geronimo/DeployerSystem
!-- ServerInfo service --
gbean name=geronimo.deployment:role=ServerInfo
class=org.apache.geronimo.system.serverinfo.ServerInfo
/gbean
!-- Configuration Store service --
gbean name=geronimo.deployment:role=ConfigurationStore,type=Local
class=org.apache.geronimo.system.configuration.LocalConfigStore
attribute name=root type=java.net.URIconfig-store//attribute
reference
name=ServerInfogeronimo.deployment:role=ServerInfo/reference
/gbean
!-- Repository --
gbean name=geronimo.deployment:role=Repository
class=org.apache.geronimo.system.repository.ReadOnlyRepository
attribute name=Root type=java.net.URIrepository//attribute
reference
name=ServerInfogeronimo.deployment:role=ServerInfo/reference
/gbean
!-- Logging service --
gbean name=geronimo.deployment:role=Logger
class=org.apache.geronimo.system.logging.log4j.Log4jService
attribute name=RefreshPeriod type=int60/attribute
attribute name=ConfigurationURL
type=java.net.URLlog4j.xml/attribute
reference
name=ServerInfogeronimo.deployment:role=ServerInfo/reference
/gbean
gbean name=geronimo.deployments:role=LogAppender,type=ConsoleAppender
class=org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService
attribute name=Threshold type=java.lang.StringERROR/attribute
attribute name=LayoutPattern type=java.lang.String%d{ABSOLUTE}
%-5p [%c{1}] %m%n/attribute
attribute name=Target
type=java.lang.StringSystem.out/attribute
/gbean
gbean
name=geronimo.deployment:role=LogAppender,type=DailyRollingFileAppender
class=org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService
attribute name=Threshold type=java.lang.StringDEBUG/attribute
attribute name=LayoutPattern type=java.lang.String%d{ABSOLUTE}
%-5p [%c{1}] %m%n/attribute
attribute name=Append type=booleantrue/attribute
attribute name=File
type=java.lang.Stringvar/log/deployer.log/attribute
attribute name=BufferedIO type=booleanfalse/attribute
attribute name=BufferedSize type=int8192/attribute
attribute name=MaxBackupIndex type=int1/attribute
attribute name=MaxFileSize type=java.lang.String10MB/attribute
reference
name=ServerInfogeronimo.deployment:role=ServerInfo/reference
/gbean
/configuration
cvs commit: incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/repository ReadOnlyRepository.java
dain2004/02/25 00:03:53
Modified:modules/deployment/src/java/org/apache/geronimo/deployment
Bootstrap.java DeploymentContext.java
ModuleDeployer.java
modules/deployment/src/java/org/apache/geronimo/deployment/service
ServiceConfigBuilder.java
modules/kernel/src/java/org/apache/geronimo/kernel/config
Configuration.java
modules/system/src/java/org/apache/geronimo/system/repository
ReadOnlyRepository.java
Log:
Simplified Bootstrap construction of the deployer
The deployer.jar is built from the deployer-system-plan.xml file and the
j2ee deployer is built from the j2ee-deployer-plan.xml. This eliminates
all of the hard coded plans from Bootstrap.
Revision ChangesPath
1.10 +61 -167
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Bootstrap.java24 Feb 2004 07:36:20 - 1.9
+++ Bootstrap.java25 Feb 2004 08:03:53 - 1.10
@@ -58,34 +58,20 @@
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
-import javax.management.ObjectName;
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
+import org.apache.geronimo.deployment.xbeans.ConfigurationType;
import org.apache.geronimo.system.configuration.LocalConfigStore;
import org.apache.geronimo.system.main.CommandLine;
import org.apache.geronimo.system.repository.ReadOnlyRepository;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Helper class to bootstrap the Geronimo deployer.
@@ -93,212 +79,120 @@
* @version $Revision$ $Date$
*/
public class Bootstrap {
-public static final URI CONFIG_ID =
URI.create(org/apache/geronimo/DeployerSystem);
-private static final ObjectName REPOSITORY_NAME =
JMXUtil.getObjectName(geronimo.deployer:role=Repository,root=repository);
-private static final ObjectName SERVICE_BUILDER_NAME =
JMXUtil.getObjectName(geronimo.deployer:role=Builder,type=Service,id= +
CONFIG_ID.toString());
+private String deployerJar;
+private String storeDir;
+private String repositoryDir;
+private String deployerSystemPlan;
+private String j2eeDeployerPlan;
+private String deployerClassPath;
+private String deployerGBean;
-private String outputFile;
-private String baseDir;
-private String store;
-private String deploymentPlan;
-private String classPath;
-private String mainGBean;
-private String mainMethod;
-private String configurations;
-
-public String getOutputFile() {
-return outputFile;
-}
-
-public void setOutputFile(String outputFile) {
-this.outputFile = outputFile;
+public String getDeployerJar() {
+return deployerJar;
}
-public String getBaseDir() {
-return baseDir;
+public void setDeployerJar(String deployerJar) {
+this.deployerJar = deployerJar;
}
-public void setBaseDir(String baseDir) {
-this.baseDir = baseDir;
+public String getStoreDir() {
+return storeDir;
}
-public String getStore() {
-return store;
+public void setStoreDir(String storeDir) {
+this.storeDir = storeDir;
}
-public void setStore(String store) {
-this.store = store;
+public String getRepositoryDir() {
+return repositoryDir;
}
-public String getDeploymentPlan() {
-return deploymentPlan;
+public void setRepositoryDir(String repositoryDir)
[Apache Geronimo Wiki] Updated: BuildingAndRunning
Date: 2004-02-25T00:35:07
Editor: 208.42.65.236
Wiki: Apache Geronimo Wiki
Page: BuildingAndRunning
URL: http://wiki.apache.org/geronimo/BuildingAndRunning
no comment
Change Log:
--
@@ -18,7 +18,12 @@
$ cd incubator-geronimo
$ cvs -qz3 update -dP
$ maven
-$ maven run:server
+$ java -jar target/bin/server.jar org/apache/geronimo/Server
+}}}
+
+To run server with the debug console web application
+{{{
+$ java -jar target/bin/server.jar org/apache/geronimo/DebugConsole
}}}
You should check back here occasionally as things may well change.
@@ -42,8 +47,6 @@
= General Advice =
-On Jan 21, 2004, we tagged the fairly stable current version and commenced
rewriting the deployment structure. Until this process is complete, you may
wish to experiment with the tagged version by checking out the
last_geronimombean branch. You may wish to check on the IRC channel and
mailing list to see how far the rewrite has proceeded.
-
If having problems building Geronimo, make sure it isn't simply because your
Maven repository has become 'corrupted' or out of sync:
Delete (or temporarily rename) the .maven directory in your home directory and
try building Geronimo again.
@@ -81,21 +84,27 @@
= Running The Server =
== For HEAD revision: ==
-(Feb 12, 2004) Deployment is still changing but hopefully is a little less
fraught than it has been for the last couple of weeks. There is a now a
standalone deployer (bin/deploy.jar) that is a front-end to a GBean based
deployment system. Currently there is a GBean deployer but work is going on to
move the WAR and RAR deployers over.
Configurations are pre-built for the Geronimo server.
-||Config ID||Purpose||
-||org/apache/geronimo/System||Critical services for all server configurations||
-||org/apache/geronimo/Server||Normal server configuration||
+||Config ID||Purpose||Parent Configuration
+||org/apache/geronimo/System||Critical services for all server
configurations||none||
+||org/apache/geronimo/Server||Normal server
configuration||org/apache/geronimo/System||
+||org/apache/geronimo/DebugConsole||Debug console web
application||org/apache/geronimo/Server||
To run use the `server.jar` command:
{{{
$ cd target
-$ java -jar bin/server.jar config-store org/apache/geronimo/System
org/apache/geronimo/Server
+$ java -jar bin/server.jar org/apache/geronimo/Server
+}}}
+
+The `server.jar` command starts the specified configuration and all parent
configurations, so the following command will start System, Server, and
DebugConsole:
+{{{
+$ cd target
+$ java -jar bin/server.jar org/apache/geronimo/DebugConsole
}}}
-To stop the server use ctrl-C or an equivilent; a proper shutdown command will
be made available when the deployment includes the remoting framework.
+To stop the server use ctrl-C or an equivalent; a proper shutdown command will
be made available when the deployment includes the remoting framework.
You can also start the server using maven run:server or maven
debug:server, but startup using maven disables the ctrl-C proper shutdown.
@@ -106,22 +115,18 @@
You can find the schema files in ${geronimo.base.dir}/schema
-To deploy a new configuation use the `deploy.jar` command:
+To deploy a new configuration use the `deploy.jar` command:
{{{
$ cd target
-$ java -jar bin/deploy.jar --install --plan your-plan.xml --store
config-store --deployer org/apache/geronimo/ServiceDeployer
+$ java -jar bin/deploy.jar --install --plan your-plan.xml
}}}
-The need to define the store and deployer will be removed soon when the WAR
and RAR deployers have been converted. You should also only run this with the
server stopped - online deployment will be available soon when default
deployment includes the remoting layer.
-
-== For the legacy last_geronimombean tagged copy: ==
-Once you've downloaded the source code, installed Maven and built the server,
type `maven run:main` to run the server.
-As of December, 2003, there is no way to stop the server other than killing
it, control-C or other such means.
-
+You should only run this with the server stopped - online deployment will be
available soon when default deployment includes the remoting layer.
-= Accessing The Geronimo-Web-Console =
+= Accessing The Debug Console =
-Enter http://localhost:8080/geronimo-web-console to access the JMX Debug
Application.
+The debug console is only available when running the
org/apache/geronimo/DebugConsole configuration.
+Enter http://localhost:8080/debug-console in to you browser to access the JMX
Debug Application.
= Cleaning your workspace =
[Apache Geronimo Wiki] Updated: BuildingAndRunning
Date: 2004-02-25T00:39:02 Editor: 208.42.65.236 Wiki: Apache Geronimo Wiki Page: BuildingAndRunning URL: http://wiki.apache.org/geronimo/BuildingAndRunning no comment Change Log: -- @@ -87,8 +87,8 @@ Configurations are pre-built for the Geronimo server. -||Config ID||Purpose||Parent Configuration -||org/apache/geronimo/System||Critical services for all server configurations||none|| +||Config ID||Purpose||Parent Configuration|| +||org/apache/geronimo/System||Critical services for all server configurations||-none-|| ||org/apache/geronimo/Server||Normal server configuration||org/apache/geronimo/System|| ||org/apache/geronimo/DebugConsole||Debug console web application||org/apache/geronimo/Server||
cvs commit: incubator-geronimo/modules/assembly LICENSE.txt
gdamour 2004/02/25 01:56:52 Modified:modules/assembly LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/assembly/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/assembly/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 18 Feb 2004 22:07:32 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:56:52 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/clustering LICENSE.txt
gdamour 2004/02/25 01:56:53 Modified:modules/clustering LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/clustering/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/clustering/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Dec 2003 16:10:19 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:56:53 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/web HttpSessionManager.java WebTier.java
gdamour 2004/02/25 01:56:55 Modified:modules/clustering/src/java/org/apache/geronimo/clustering Cluster.java Data.java DataDelta.java DataDeltaListener.java DataListener.java LocalCluster.java MBeanImpl.java MetaDataListener.java NamedMBeanImpl.java Node.java Tier.java modules/clustering/src/java/org/apache/geronimo/clustering/ejb EJBTier.java modules/clustering/src/java/org/apache/geronimo/clustering/jndi JNDITier.java modules/clustering/src/java/org/apache/geronimo/clustering/web HttpSessionManager.java WebTier.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.11 +15 -53 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Cluster.java Index: Cluster.java === RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Cluster.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Cluster.java 22 Jan 2004 09:13:16 - 1.10 +++ Cluster.java 25 Feb 2004 09:56:55 - 1.11 @@ -1,58 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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. */ + package org.apache.geronimo.clustering; import
cvs commit: incubator-geronimo/modules/common LICENSE.txt
gdamour 2004/02/25 01:56:56 Modified:modules/common LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/common/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/common/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 13 Aug 2003 07:23:36 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:56:56 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/common/src/test/org/apache/geronimo/common/task MockURLMonitorTaskListener.java URLMonitorTaskTest.java
gdamour 2004/02/25 01:57:05 Modified:modules/common/src/java/org/apache/geronimo/common Classes.java CloneableObject.java CoercionException.java Counter.java DataConversionException.java Duration.java InvalidArgumentException.java LongCounter.java NotCoercibleException.java NullArgumentException.java ParameterizedException.java ParameterizedRuntimeException.java Primitives.java StopWatch.java StringValueParser.java ThrowableHandler.java ThrowableListener.java modules/common/src/java/org/apache/geronimo/common/jmx JMXExceptionDecoder.java MBeanProxyContext.java MBeanProxyException.java MBeanProxyHandler.java modules/common/src/java/org/apache/geronimo/common/mutable MuBoolean.java MuByte.java MuCharacter.java MuDouble.java MuFloat.java MuInteger.java MuLong.java MuNumber.java MuShort.java Mutable.java modules/common/src/java/org/apache/geronimo/common/net URLFactory.java modules/common/src/java/org/apache/geronimo/common/net/protocol DelegatingURLConnection.java Protocols.java URLStreamHandlerFactory.java modules/common/src/java/org/apache/geronimo/common/net/protocol/file FileURLConnection.java Handler.java modules/common/src/java/org/apache/geronimo/common/net/protocol/resource Handler.java ResourceURLConnection.java modules/common/src/java/org/apache/geronimo/common/propertyeditor ArrayListEditor.java ArrayPropertyEditorAdapter.java BigDecimalEditor.java ClassEditor.java CollectionEditor.java DateEditor.java FileEditor.java HashSetEditor.java IteratorEditor.java LinkedListEditor.java ListEditor.java ListIteratorEditor.java ObjectNameEditor.java PropertiesEditor.java PropertyEditorException.java PropertyEditors.java SetEditor.java StackEditor.java TextPropertyEditorSupport.java TreeSetEditor.java URIEditor.java URLEditor.java VectorEditor.java modules/common/src/java/org/apache/geronimo/common/task URLMonitorTask.java modules/common/src/test/org/apache/geronimo/common ClassesTest.java CloneableObjectTest.java CounterTest.java DurationTest.java LongCounterTest.java MockThrowableListener.java NotCoercibleExceptionTest.java NullArgumentExceptionTest.java ParameterizedExceptionTest.java ParameterizedRuntimeExceptionTest.java PrimitivesTest.java StopWatchTest.java StringValueParserTest.java ThrowableHandlerTest.java modules/common/src/test/org/apache/geronimo/common/jmx JMXExceptionDecoderTest.java MBeanProxyExceptionTest.java MBeanProxyFactoryTest.java MBeanProxyHandlerTest.java MockObject.java modules/common/src/test/org/apache/geronimo/common/mutable MuBooleanTest.java MuByteTest.java MuCharacterTest.java MuDoubleTest.java MuFloatTest.java MuIntegerTest.java MuLongTest.java MuShortTest.java modules/common/src/test/org/apache/geronimo/common/net/protocol ProtocolsTest.java modules/common/src/test/org/apache/geronimo/common/net/protocol/file FileProtocolTest.java modules/common/src/test/org/apache/geronimo/common/net/protocol/resource ResourceProtocolTest.java modules/common/src/test/org/apache/geronimo/common/propertyeditor ArrayPropertyEditorAdapterTest.java PropertyEditorsTest.java modules/common/src/test/org/apache/geronimo/common/task MockURLMonitorTaskListener.java URLMonitorTaskTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.10 +14 -53 incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/Classes.java
cvs commit: incubator-geronimo/modules/connector LICENSE.txt
gdamour 2004/02/25 01:57:06 Modified:modules/connector LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/connector/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/connector/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:06 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/console-web LICENSE.txt
gdamour 2004/02/25 01:57:14 Modified:modules/console-web LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/console-web/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/console-web/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:14 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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 +
cvs commit: incubator-geronimo/modules/console-web/src/java/org/apache/geronimo/console/web/util MBeanAttributesComparator.java MBeanComparator.java ObjectInstanceComparator.java
gdamour 2004/02/25 01:57:16 Modified: modules/console-web/src/java/org/apache/geronimo/console/web/taglib ClearFilterTag.java MBeanAttributesTag.java MBeanServerContentsTag.java MBeanServerContextSupport.java MBeanServerContextTag.java MBeanServerContextValueTag.java modules/console-web/src/java/org/apache/geronimo/console/web/util MBeanAttributesComparator.java MBeanComparator.java ObjectInstanceComparator.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.4 +12 -50 incubator-geronimo/modules/console-web/src/java/org/apache/geronimo/console/web/taglib/ClearFilterTag.java Index: ClearFilterTag.java === RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/java/org/apache/geronimo/console/web/taglib/ClearFilterTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ClearFilterTag.java 22 Oct 2003 18:06:23 - 1.3 +++ ClearFilterTag.java 25 Feb 2004 09:57:16 - 1.4 @@ -1,58 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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. */ + package org.apache.geronimo.console.web.taglib; import java.io.IOException; 1.6 +12 -50
cvs commit: incubator-geronimo/modules/core LICENSE.txt
gdamour 2004/02/25 01:57:18 Modified:modules/core LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.4 +203 -55 incubator-geronimo/modules/core/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/core/LICENSE.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LICENSE.txt 12 Aug 2003 14:45:45 - 1.3 +++ LICENSE.txt 25 Feb 2004 09:57:18 - 1.4 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/test/util ServerUtil.java
gdamour 2004/02/25 01:57:30 Modified:modules/core/src/java/org/apache/geronimo/cache InstanceCache.java InstanceFactory.java InstancePool.java LRUInstanceCache.java LRURunner.java SimpleInstanceCache.java SimpleInstancePool.java modules/core/src/java/org/apache/geronimo/console/cli DConfigBeanConfigurator.java Deployer.java DeploymentContext.java ModuleInfo.java TextController.java modules/core/src/java/org/apache/geronimo/console/cli/controller AddServer.java ControlDeployments.java DeploymentOptions.java EditServerSpecificDD.java InitializeEJBJAR.java InitializeWAR.java ListDeployments.java LoadServerSpecificDD.java ProgressMonitor.java SaveServerSpecificDD.java SelectDistributedModules.java SelectModule.java SelectServer.java TopLevel.java WorkWithEJBJAR.java WorkWithWAR.java modules/core/src/java/org/apache/geronimo/console/cli/module EJBJARInfo.java WARInfo.java modules/core/src/java/org/apache/geronimo/core/service Component.java Container.java Interceptor.java Invocation.java InvocationKey.java InvocationResult.java InvocationType.java ManagedComponent.java ManagedContainer.java RPCContainer.java SimpleInvocation.java SimpleInvocationResult.java StackThreadLocal.java StringInvocationKey.java modules/core/src/java/org/apache/geronimo/ejb/metadata TransactionDemarcation.java modules/core/src/java/org/apache/geronimo/enterprise/deploy/tool AbstractDeployableObject.java DDBeanImpl.java DDBeanRootImpl.java EjbDeployableObject.java WebDeployableObject.java modules/core/src/java/org/apache/geronimo/lock ConcurrentInstanceLock.java InstanceLock.java LockContext.java LockDomain.java LockReentranceException.java NoTxLockContext.java TxLockContext.java WriterPreferredInstanceLock.java WriterPreferredInstanceLock2.java WriterPreferredInstanceLock3.java modules/core/src/java/org/apache/geronimo/proxy MarshalledMethod.java ProxyContainer.java ProxyInvocation.java ReflexiveInterceptor.java SimpleComponent.java SimpleContainer.java SimpleRPCContainer.java modules/core/src/java/org/apache/geronimo/rmi RMIClassLoaderSpiImpl.java modules/core/src/java/org/apache/geronimo/validator AbstractValidator.java ValidationContext.java ValidationException.java ValidationResult.java ValidationTest.java Validator.java modules/core/src/java/org/apache/geronimo/validator/ejb BaseEjbJarTest.java EjbValidator.java SessionBeanTests.java modules/core/src/test/org/apache/geronimo/cache AbstractInstanceCacheTest.java LRUInstanceCacheTest.java MockLRURunner.java SimpleInstanceCacheTest.java SimpleInstancePoolTest.java modules/core/src/test/org/apache/geronimo/common InvocationTypeTest.java SimpleInvocationTest.java StackThreadLocalTest.java modules/core/src/test/org/apache/geronimo/management NotificationTypeTest.java StateTest.java modules/core/src/test/org/apache/geronimo/rmi RMIClassLoaderSpiImplTest.java modules/core/src/test/org/apache/geronimo/test/protocol/mockproto Handler.java MockInputStream.java MockURLConnection.java modules/core/src/test/org/apache/geronimo/test/util ServerUtil.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.3 +15 -53 incubator-geronimo/modules/core/src/java/org/apache/geronimo/cache/InstanceCache.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/cache/InstanceCache.java.diff?r1=1.2r2=1.3 1.4 +15 -53
cvs commit: incubator-geronimo/modules/deployment LICENSE.txt
gdamour 2004/02/25 01:57:31 Modified:modules/deployment LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/deployment/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/deployment/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:31 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/tools ClientDeployableTest.java DDBeanRootTest.java WebDeployableTest.java
gdamour 2004/02/25 01:57:39 Modified:modules/deployment/src/java/org/apache/geronimo/deployment Bootstrap.java ConfigurationBuilder.java ConfigurationCallback.java Deployer.java DeploymentContext.java DeploymentException.java DeploymentModule.java ModuleConfigurer.java ModuleDeployer.java ModuleFactory.java NoDeployerException.java URLDeployer.java modules/deployment/src/java/org/apache/geronimo/deployment/plugin DConfigBeanRootSupport.java DConfigBeanSupport.java DeploymentConfigurationImpl.java DeploymentConfigurationSupport.java DeploymentManagerImpl.java DeploymentServer.java DisconnectedServer.java FailedProgressObject.java TargetImpl.java TargetModuleIDImpl.java XmlBeanSupport.java modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application EARConfigBean.java EARConfiguration.java EARConfigurationFactory.java EARConfigurer.java modules/deployment/src/java/org/apache/geronimo/deployment/plugin/client ClientConfigBean.java ClientConfigurationFactory.java modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories DeploymentConfigurationFactory.java DeploymentFactoryImpl.java modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local CommandSupport.java DistributeCommand.java LocalServer.java StartCommand.java StopCommand.java modules/deployment/src/java/org/apache/geronimo/deployment/service GBeanBuilder.java GBeanDefault.java ServiceConfigBuilder.java ServiceDeployer.java ServiceModule.java modules/deployment/src/java/org/apache/geronimo/deployment/tools DDBeanImpl.java DDBeanRootImpl.java modules/deployment/src/java/org/apache/geronimo/deployment/tools/loader AbstractDeployable.java ApplicationDeployable.java ClientDeployable.java DeployableFactory.java WebDeployable.java modules/deployment/src/java/org/apache/geronimo/deployment/util DeploymentHelper.java FileUtil.java URLInfo.java URLType.java UnclosableInputStream.java XMLUtil.java modules/deployment/src/java/org/apache/geronimo/deployment/xml LocalEntityResolver.java ParserFactory.java ParserFactoryImpl.java modules/deployment/src/test/org/apache/geronimo/deployment MockEndpoint.java MockGBean.java modules/deployment/src/test/org/apache/geronimo/deployment/plugin Application.java ApplicationRoot.java DeploymentConfigurationTest.java modules/deployment/src/test/org/apache/geronimo/deployment/service ConfigPlanTest.java modules/deployment/src/test/org/apache/geronimo/deployment/tools ClientDeployableTest.java DDBeanRootTest.java WebDeployableTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.11 +15 -53 incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java.diff?r1=1.10r2=1.11 1.5 +15 -53 incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java.diff?r1=1.4r2=1.5 1.2 +15 -53 incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationCallback.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationCallback.java.diff?r1=1.1r2=1.2 1.12 +15 -53 incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java.diff?r1=1.11r2=1.12 1.6 +15 -53 incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
cvs commit: incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management Abstract77Test.java DomainTest.java JVMTest.java ServerTest.java
gdamour 2004/02/25 01:57:41 Modified:modules/j2ee/src/java/org/apache/geronimo/j2ee/application EARModule.java modules/j2ee/src/java/org/apache/geronimo/j2ee/management J2EEApplication.java J2EEDeployedObject.java J2EEDomain.java J2EEManagedObject.java J2EEResource.java J2EEServer.java JVM.java modules/j2ee/src/java/org/apache/geronimo/j2ee/management/geronimo JVM.java modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl DeployedObjectImpl.java DomainImpl.java JVMImpl.java ServerImpl.java Util.java modules/j2ee/src/test/org/apache/geronimo/j2ee/management Abstract77Test.java DomainTest.java JVMTest.java ServerTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -53 incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/application/EARModule.java Index: EARModule.java === RCS file: /home/cvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/application/EARModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EARModule.java22 Feb 2004 05:19:10 - 1.1 +++ EARModule.java25 Feb 2004 09:57:41 - 1.2 @@ -1,58 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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
cvs commit: incubator-geronimo/modules/kernel LICENSE.txt
gdamour 2004/02/25 01:57:45 Modified:modules/kernel LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/kernel/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/kernel/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 30 Aug 2003 15:18:13 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:45 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment WebAppDConfigTest.java
gdamour 2004/02/25 01:57:45 Modified:modules/jetty/src/java/org/apache/geronimo/jetty JettyContainer.java JettyContainerImpl.java JettyWebApplicationContext.java modules/jetty/src/java/org/apache/geronimo/jetty/connector AJP13Connector.java HTTPConnector.java HTTPSConnector.java JettyConnector.java modules/jetty/src/java/org/apache/geronimo/jetty/deployment WARConfigBuilder.java WARConfiguration.java WARConfigurer.java WebAppDConfigBean.java WebAppDConfigRoot.java modules/jetty/src/test/org/apache/geronimo/jetty ApplicationTest.java ContainerTest.java modules/jetty/src/test/org/apache/geronimo/jetty/deployment WebAppDConfigTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -53 incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java Index: JettyContainer.java === RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JettyContainer.java 21 Jan 2004 20:01:52 - 1.1 +++ JettyContainer.java 25 Feb 2004 09:57:44 - 1.2 @@ -1,58 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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
cvs commit: incubator-geronimo/modules/maven-plugin LICENSE.txt
gdamour 2004/02/25 01:57:51 Modified:modules/maven-plugin LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/maven-plugin/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:51 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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 +
cvs commit: incubator-geronimo/modules/maven-xmlbeans-plugin LICENSE.txt
gdamour 2004/02/25 01:57:53 Modified:modules/maven-xmlbeans-plugin LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/maven-xmlbeans-plugin/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 18 Feb 2004 22:07:32 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:52 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/naming LICENSE.txt
gdamour 2004/02/25 01:57:55 Modified:modules/naming LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/naming/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/naming/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 18 Feb 2004 22:07:32 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:55 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/remoting LICENSE.txt
gdamour 2004/02/25 01:57:58 Modified:modules/remoting LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/remoting/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/remoting/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:57:58 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/security LICENSE.txt
gdamour 2004/02/25 01:58:05 Modified:modules/security LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/security/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/security/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 23 Jan 2004 06:47:06 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:05 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/remoting/src/test-data/mock-app/org/apache/geronimo/remoting IPerson.java Person.java TransientValue.java
gdamour 2004/02/25 01:58:05 Modified:modules/remoting/src/java/org/apache/geronimo/remoting DeMarshalingInterceptor.java InterVMRoutingInterceptor.java InterceptorRegistry.java IntraVMRoutingInterceptor.java InvocationSupport.java InvocationType.java MarshalingInterceptor.java MarshalledObject.java TransportContext.java TransportInterceptor.java modules/remoting/src/java/org/apache/geronimo/remoting/jmx MBeanServerStub.java NotificationRemoterInterceptor.java RemoteMBeanServerFactory.java modules/remoting/src/java/org/apache/geronimo/remoting/router AbstractInterceptorRouter.java AbstractRouterRouter.java InterceptorRegistryRouter.java JMXRouter.java JMXTarget.java Router.java RouterTarget.java SubsystemRouter.java modules/remoting/src/java/org/apache/geronimo/remoting/transport BytesMarshalledObject.java BytesMsg.java ConnectionFailedException.java Msg.java NullTransportInterceptor.java RemoteTransportInterceptor.java StreamCorruptedException.java TransportClient.java TransportException.java TransportFactory.java TransportLoader.java TransportServer.java URISupport.java modules/remoting/src/java/org/apache/geronimo/remoting/transport/async AbstractServer.java AsyncClient.java AsyncMsg.java BackChannelServer.java Channel.java ChannelListner.java ChannelPool.java Compression.java Correlator.java IdentityInterceptor.java Registry.java RemoteRef.java TransportFactory.java modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio BlockingChannel.java BlockingServer.java modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/nio NonBlockingChannel.java NonBlockingServer.java SelectionEventListner.java SelectorManager.java modules/remoting/src/test/org/apache/geronimo/remoting JMXRemotingTest.java JMXRemotingTestMain.java MarshalingInterceptorsTest.java RemotingInterceptorsTest.java StartupTest.java modules/remoting/src/test/org/apache/geronimo/remoting/transport AsyncTransportStress.java AsyncTransportTest.java modules/remoting/src/test-data/mock-app/org/apache/geronimo/remoting IPerson.java Person.java TransientValue.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.7 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java.diff?r1=1.6r2=1.7 1.3 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InterVMRoutingInterceptor.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InterVMRoutingInterceptor.java.diff?r1=1.2r2=1.3 1.4 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InterceptorRegistry.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InterceptorRegistry.java.diff?r1=1.3r2=1.4 1.4 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/IntraVMRoutingInterceptor.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/IntraVMRoutingInterceptor.java.diff?r1=1.3r2=1.4 1.2 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InvocationSupport.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InvocationSupport.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InvocationType.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/InvocationType.java.diff?r1=1.1r2=1.2 1.6 +15 -53
cvs commit: incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/remoting/jmx RemoteLoginTest.java
gdamour 2004/02/25 01:58:11 Modified:modules/security/src/java/org/apache/geronimo/security ContextManager.java GeronimoSecurityException.java GeronimoSecurityPermission.java IdentificationPrincipal.java PrimaryRealmPrincipal.java RealmPrincipal.java SecurityService.java SecurityServiceMBean.java SubjectId.java modules/security/src/java/org/apache/geronimo/security/bridge AbstractPrincipalMappingUserPasswordRealmBridge.java AbstractRealmBridge.java CallerIdentityUserPasswordRealmBridge.java ConfiguredIdentityUserPasswordRealmBridge.java PropertiesFilePrincipalMappingUserPasswordRealmBridge.java RealmBridge.java modules/security/src/java/org/apache/geronimo/security/jaas ConfigurationEntry.java ConfigurationEntryLocal.java ConfigurationEntryRealmLocal.java ConfigurationEntryRealmRemote.java ExpiredLoginModuleException.java GeronimoLoginConfiguration.java LocalLoginModule.java LoginModuleCacheObject.java LoginModuleConstants.java LoginModuleId.java LoginService.java LoginServiceMBean.java RemoteLoginModule.java RemoteLoginModuleLocalWrapper.java RemoteLoginModuleRemoteWrapper.java SerializableACE.java modules/security/src/java/org/apache/geronimo/security/jacc AbstractModuleConfiguration.java EJBModuleConfiguration.java GeronimoPolicy.java GeronimoPolicyConfiguration.java GeronimoPolicyConfigurationFactory.java ModuleConfiguration.java PolicyConfigurationEJB.java PolicyConfigurationGeneric.java PolicyConfigurationWeb.java PolicyContextHandlerContainerSubject.java PolicyContextHandlerHttpServletRequest.java PolicyContextHandlerSOAPMessage.java RoleMappingConfiguration.java WebModuleConfiguration.java modules/security/src/java/org/apache/geronimo/security/realm SecurityRealm.java modules/security/src/java/org/apache/geronimo/security/realm/providers AbstractSecurityRealm.java GeronimoPasswordCredential.java GeronimoPasswordCredentialLoginModule.java KerberosSecurityRealm.java PropertiesFileGroupPrincipal.java PropertiesFileLoginModule.java PropertiesFileSecurityRealm.java PropertiesFileUserPrincipal.java SQLGroupPrincipal.java SQLLoginModule.java SQLSecurityRealm.java SQLSecurityRealmPasswordDigested.java SQLUserPrincipal.java modules/security/src/java/org/apache/geronimo/security/remoting RemoteLoginServiceFactory.java modules/security/src/java/org/apache/geronimo/security/remoting/jmx LoginServiceStub.java RemoteLoginServiceFactory.java modules/security/src/java/org/apache/geronimo/security/util ConfigurationUtil.java URLPattern.java URLPatternCheck.java modules/security/src/test/org/apache/geronimo/security AbstractLoaderUtilTest.java AbstractTest.java EjbModuleConfigurationTest.java SecurityServiceTest.java WebModuleConfigurationTest.java modules/security/src/test/org/apache/geronimo/security/bridge AbstractBridgeTest.java AbstractUserPasswordBridgeTest.java CallerIdentityUserPasswordBridgeTest.java ConfiguredIdentityUserPasswordBridgeTest.java MappingUserPasswordBridgeTest.java TestLoginModule.java TestPrincipal.java TestRealm.java modules/security/src/test/org/apache/geronimo/security/jaas ConfigurationEntryTest.java LoginKerberosNonGeronimoTest.java LoginKerberosTest.java
cvs commit: incubator-geronimo/modules/system LICENSE.txt
gdamour 2004/02/25 01:58:12 Modified:modules/system LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/system/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/system/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 18 Feb 2004 22:07:32 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:12 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/modules/system/src/test/org/apache/geronimo/system/configuration LocalConfigStoreTest.java
gdamour 2004/02/25 01:58:15 Modified:modules/system/src/java/org/apache/geronimo/system ClockPool.java ThreadPool.java modules/system/src/java/org/apache/geronimo/system/configuration LocalConfigStore.java modules/system/src/java/org/apache/geronimo/system/logging/log4j CachingLog4jLog.java Log4jService.java NamedNDC.java NamedNDCConverter.java NamedNDCFilter.java PatternLayout.java PatternParser.java URLConfigurator.java XLevel.java modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender AbstractAppenderService.java ConsoleAppenderService.java DailyRollingFileAppenderService.java FileAppenderService.java RollingFileAppenderService.java modules/system/src/java/org/apache/geronimo/system/main CommandLine.java Daemon.java modules/system/src/java/org/apache/geronimo/system/repository ReadOnlyRepository.java modules/system/src/java/org/apache/geronimo/system/serverinfo ServerConstants.java ServerInfo.java modules/system/src/test/org/apache/geronimo/system/configuration LocalConfigStoreTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -54 incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java Index: ClockPool.java === RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ClockPool.java24 Feb 2004 04:38:26 - 1.1 +++ ClockPool.java25 Feb 2004 09:58:14 - 1.2 @@ -1,59 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * + * Copyright 2004 The Apache Software Foundation * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Xalan and Apache Software Foundation must - *not be used to endorse or promote products derived from this - *software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *nor may Apache appear in their name, without prior written - *permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software
cvs commit: incubator-geronimo/modules/transaction LICENSE.txt
gdamour 2004/02/25 01:58:17 Modified:modules/transaction LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/modules/transaction/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/modules/transaction/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 28 Jan 2004 21:18:17 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:17 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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 +
cvs commit: incubator-geronimo/specs/ejb LICENSE.txt
gdamour 2004/02/25 01:58:20 Modified:specs/ejb LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/ejb/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/ejb/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Aug 2003 10:27:14 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:20 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/modules/transaction/src/test/org/apache/geronimo/transaction/manager MockResource.java MockResourceManager.java TestTransactionManager.java XATransactionTester.java
gdamour 2004/02/25 01:58:19 Modified:modules/transaction/src/java/org/apache/geronimo/transaction BeanTransactionContext.java ConnectionReleaser.java ContainerTransactionContext.java DoubleKeyedHashMap.java InheritableTransactionContext.java InstanceContext.java TransactionContext.java TransactionManagerProxy.java TransactionProxy.java UnspecifiedTransactionContext.java XAWork.java modules/transaction/src/java/org/apache/geronimo/transaction/log UnrecoverableLog.java modules/transaction/src/java/org/apache/geronimo/transaction/manager TransactionImpl.java TransactionLog.java TransactionManagerImpl.java UserTransactionImpl.java XidFactory.java XidImpl.java XidImporter.java modules/transaction/src/test/org/apache/geronimo/transaction/manager MockResource.java MockResourceManager.java TestTransactionManager.java XATransactionTester.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +14 -53 incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/BeanTransactionContext.java Index: BeanTransactionContext.java === RCS file: /home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/BeanTransactionContext.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BeanTransactionContext.java 31 Jan 2004 19:27:17 - 1.1 +++ BeanTransactionContext.java 25 Feb 2004 09:58:19 - 1.2 @@ -1,57 +1,18 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the
cvs commit: incubator-geronimo/specs/ejb/src/java/javax/xml/rpc/handler MessageContext.java
gdamour 2004/02/25 01:58:23 Modified:specs/ejb/src/java/javax/ejb AccessLocalException.java CreateException.java DuplicateKeyException.java EJBContext.java EJBException.java EJBHome.java EJBLocalHome.java EJBLocalObject.java EJBMetaData.java EJBObject.java EnterpriseBean.java EntityBean.java EntityContext.java FinderException.java Handle.java HomeHandle.java MessageDrivenBean.java MessageDrivenContext.java NoSuchEntityException.java NoSuchObjectLocalException.java ObjectNotFoundException.java RemoveException.java SessionBean.java SessionContext.java SessionSynchronization.java TimedObject.java Timer.java TimerHandle.java TimerService.java TransactionRequiredLocalException.java TransactionRolledbackLocalException.java specs/ejb/src/java/javax/ejb/spi HandleDelegate.java specs/ejb/src/java/javax/xml/rpc/handler MessageContext.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/AccessLocalException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/AccessLocalException.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/CreateException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/CreateException.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/DuplicateKeyException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/DuplicateKeyException.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBContext.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBContext.java.diff?r1=1.1r2=1.2 1.4 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBException.java.diff?r1=1.3r2=1.4 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBHome.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBLocalHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBLocalHome.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBLocalObject.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBLocalObject.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBMetaData.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBMetaData.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBObject.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EJBObject.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EnterpriseBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EnterpriseBean.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EntityBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EntityBean.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/EntityContext.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/EntityContext.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/FinderException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/FinderException.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/Handle.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/Handle.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/HomeHandle.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/ejb/src/java/javax/ejb/HomeHandle.java.diff?r1=1.1r2=1.2 1.2 +21 -57 incubator-geronimo/specs/ejb/src/java/javax/ejb/MessageDrivenBean.java
cvs commit: incubator-geronimo/specs/j2ee LICENSE.txt
gdamour 2004/02/25 01:58:24 Modified:specs/j2ee LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.4 +202 -61 incubator-geronimo/specs/j2ee/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/j2ee/LICENSE.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LICENSE.txt 12 Feb 2004 03:17:54 - 1.3 +++ LICENSE.txt 25 Feb 2004 09:58:24 - 1.4 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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, +
cvs commit: incubator-geronimo/specs/j2ee-connector LICENSE.txt
gdamour 2004/02/25 01:58:25 Modified:specs/j2ee-connector LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/j2ee-connector/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/j2ee-connector/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Aug 2003 05:22:08 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:25 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/specs/j2ee-connector/src/test/javax/resource/spi/work ExecutionContextTest.java WorkEventTest.java WorkExceptionTest.java
gdamour 2004/02/25 01:58:30 Modified:specs/j2ee-connector/src/java/javax/resource NotSupportedException.java Referenceable.java ResourceException.java specs/j2ee-connector/src/java/javax/resource/cci Connection.java ConnectionFactory.java ConnectionMetaData.java ConnectionSpec.java IndexedRecord.java Interaction.java InteractionSpec.java LocalTransaction.java MappedRecord.java MessageListener.java Record.java RecordFactory.java ResourceAdapterMetaData.java ResourceWarning.java ResultSet.java ResultSetInfo.java Streamable.java specs/j2ee-connector/src/java/javax/resource/spi ActivationSpec.java ApplicationServerInternalException.java BootstrapContext.java CommException.java ConnectionEvent.java ConnectionEventListener.java ConnectionManager.java ConnectionRequestInfo.java DissociatableManagedConnection.java EISSystemException.java IllegalStateException.java InvalidPropertyException.java LazyAssociatableConnectionManager.java LazyEnlistableConnectionManager.java LazyEnlistableManagedConnection.java LocalTransaction.java LocalTransactionException.java ManagedConnection.java ManagedConnectionFactory.java ManagedConnectionMetaData.java ResourceAdapter.java ResourceAdapterAssociation.java ResourceAdapterInternalException.java ResourceAllocationException.java SecurityException.java SharingViolationException.java UnavailableException.java ValidatingManagedConnectionFactory.java XATerminator.java specs/j2ee-connector/src/java/javax/resource/spi/endpoint MessageEndpoint.java MessageEndpointFactory.java specs/j2ee-connector/src/java/javax/resource/spi/security GenericCredential.java PasswordCredential.java specs/j2ee-connector/src/java/javax/resource/spi/work ExecutionContext.java Work.java WorkAdapter.java WorkCompletedException.java WorkEvent.java WorkException.java WorkListener.java WorkManager.java WorkRejectedException.java specs/j2ee-connector/src/test/javax/resource ResourceExceptionTest.java specs/j2ee-connector/src/test/javax/resource/spi/security PasswordCredentialTest.java specs/j2ee-connector/src/test/javax/resource/spi/work ExecutionContextTest.java WorkEventTest.java WorkExceptionTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/NotSupportedException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/NotSupportedException.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/Referenceable.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/Referenceable.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/ResourceException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/ResourceException.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/Connection.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/Connection.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/ConnectionFactory.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/ConnectionFactory.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/ConnectionMetaData.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-connector/src/java/javax/resource/cci/ConnectionMetaData.java.diff?r1=1.1r2=1.2 1.2 +15 -53
cvs commit: incubator-geronimo/specs/j2ee-deployment LICENSE.txt
gdamour 2004/02/25 01:58:32 Modified:specs/j2ee-deployment LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/j2ee-deployment/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/j2ee-deployment/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Aug 2003 12:28:26 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:32 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/specs/j2ee-deployment/src/test/javax/enterprise/deploy/spi/factories MockDeploymentFactory.java
gdamour 2004/02/25 01:58:36 Modified:specs/j2ee-deployment/src/java/javax/enterprise/deploy/model DDBean.java DDBeanRoot.java DeployableObject.java J2eeApplicationObject.java XpathEvent.java XpathListener.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/exceptions DDBeanCreateException.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/shared ActionType.java CommandType.java DConfigBeanVersionType.java ModuleType.java StateType.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/shared/factories DeploymentFactoryManager.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/spi DConfigBean.java DConfigBeanRoot.java DeploymentConfiguration.java DeploymentManager.java Target.java TargetModuleID.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/spi/exceptions BeanNotFoundException.java ClientExecuteException.java ConfigurationException.java DConfigBeanVersionUnsupportedException.java DeploymentManagerCreationException.java InvalidModuleException.java OperationUnsupportedException.java TargetException.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/spi/factories DeploymentFactory.java specs/j2ee-deployment/src/java/javax/enterprise/deploy/spi/status ClientConfiguration.java DeploymentStatus.java ProgressEvent.java ProgressListener.java ProgressObject.java specs/j2ee-deployment/src/test/javax/enterprise/deploy/model XPathEventTest.java specs/j2ee-deployment/src/test/javax/enterprise/deploy/shared ActionTypeTest.java CommandTypeTest.java DConfigBeanVersionTypeTest.java ModuleTypeTest.java StateTypeTest.java specs/j2ee-deployment/src/test/javax/enterprise/deploy/shared/factories DeploymentFactoryManagerTest.java specs/j2ee-deployment/src/test/javax/enterprise/deploy/spi MockDeploymentManager.java specs/j2ee-deployment/src/test/javax/enterprise/deploy/spi/factories MockDeploymentFactory.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DDBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DDBean.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DDBeanRoot.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DDBeanRoot.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DeployableObject.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/DeployableObject.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/J2eeApplicationObject.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/J2eeApplicationObject.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/XpathEvent.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/XpathEvent.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/XpathListener.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/XpathListener.java.diff?r1=1.2r2=1.3 1.3 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/exceptions/DDBeanCreateException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/model/exceptions/DDBeanCreateException.java.diff?r1=1.2r2=1.3 1.4 +21 -57 incubator-geronimo/specs/j2ee-deployment/src/java/javax/enterprise/deploy/shared/ActionType.java
cvs commit: incubator-geronimo/specs/j2ee-jacc LICENSE.txt
gdamour 2004/02/25 01:58:37 Modified:specs/j2ee-jacc LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -61 incubator-geronimo/specs/j2ee-jacc/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/j2ee-jacc/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 30 Aug 2003 01:55:12 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:37 - 1.2 @@ -1,61 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * This source code implements specifications defined by the Java - * Community Process. In order to remain compliant with the specification - * DO NOT add / change / or delete method signatures! - * - * - */ - - + + 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,
cvs commit: incubator-geronimo/specs/j2ee-management LICENSE.txt
gdamour 2004/02/25 01:58:40 Modified:specs/j2ee-management LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/j2ee-management/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/j2ee-management/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Aug 2003 12:27:12 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:40 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/specs/j2ee-jacc/src/test/javax/security/jacc EJBMethodPermissionCollectionTest.java EJBMethodPermissionTest.java EJBRoleRefPermissionTest.java WebResourcePermissionTest.java WebRoleRefPermissionTest.java WebUserDataPermissionTest.java
gdamour 2004/02/25 01:58:39 Modified:specs/j2ee-jacc/src/java/javax/security/jacc EJBMethodPermission.java EJBMethodPermissionCollection.java EJBRoleRefPermission.java HTTPMethodSpec.java PolicyConfiguration.java PolicyConfigurationFactory.java PolicyContext.java PolicyContextException.java PolicyContextHandler.java URLPatternSpec.java WebResourcePermission.java WebResourcePermissionCollection.java WebRoleRefPermission.java WebUserDataPermission.java WebUserDataPermissionCollection.java specs/j2ee-jacc/src/test/javax/security/jacc EJBMethodPermissionCollectionTest.java EJBMethodPermissionTest.java EJBRoleRefPermissionTest.java WebResourcePermissionTest.java WebRoleRefPermissionTest.java WebUserDataPermissionTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.3 +24 -61 incubator-geronimo/specs/j2ee-jacc/src/java/javax/security/jacc/EJBMethodPermission.java Index: EJBMethodPermission.java === RCS file: /home/cvs/incubator-geronimo/specs/j2ee-jacc/src/java/javax/security/jacc/EJBMethodPermission.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EJBMethodPermission.java 27 Sep 2003 16:00:23 - 1.2 +++ EJBMethodPermission.java 25 Feb 2004 09:58:38 - 1.3 @@ -1,63 +1,26 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * This source code implements specifications defined by the Java - * Community Process. In order to remain compliant with the specification - * DO NOT add / change / or delete method signatures! - * - * - */ - +/** + * + * Copyright 2004 The Apache Software Foundation + *
cvs commit: incubator-geronimo/specs/j2ee-management/src/test/javax/management/j2ee ListenerRegistrationTest.java
gdamour 2004/02/25 01:58:42 Modified:specs/j2ee-management/src/java/javax/management/j2ee ListenerRegistration.java Management.java ManagementHome.java specs/j2ee-management/src/java/javax/management/j2ee/statistics BoundaryStatistic.java BoundedRangeStatistic.java CountStatistic.java EJBStats.java EntityBeanStats.java JCAConnectionPoolStats.java JCAConnectionStats.java JCAStats.java JDBCConnectionPoolStats.java JDBCConnectionStats.java JDBCStats.java JMSConnectionStats.java JMSConsumerStats.java JMSEndpointStats.java JMSProducerStats.java JMSSessionStats.java JMSStats.java JTAStats.java JVMStats.java JavaMailStats.java MessageDrivenBeanStats.java RangeStatistic.java ServletStats.java SessionBeanStats.java StatefulSessionBeanStats.java StatelessSessionBeanStats.java Statistic.java Stats.java TimeStatistic.java URLStats.java specs/j2ee-management/src/test/javax/management/j2ee ListenerRegistrationTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/ListenerRegistration.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/ListenerRegistration.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/Management.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/Management.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/ManagementHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/ManagementHome.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/BoundaryStatistic.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/BoundaryStatistic.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/BoundedRangeStatistic.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/BoundedRangeStatistic.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/CountStatistic.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/CountStatistic.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/EJBStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/EJBStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/EntityBeanStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/EntityBeanStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAConnectionPoolStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAConnectionPoolStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAConnectionStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAConnectionStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JCAStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53 incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JDBCConnectionPoolStats.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/j2ee-management/src/java/javax/management/j2ee/statistics/JDBCConnectionPoolStats.java.diff?r1=1.1r2=1.2 1.2 +15 -53
cvs commit: incubator-geronimo/specs/jms/src/test/javax/jms IllegalStateExceptionTest.java InvalidClientIDExceptionTest.java InvalidDestinationExceptionTest.java InvalidSelectorExceptionTest.java JMSExceptionTest.java JMSSecurityExceptionTest.java MessageEOFExceptionTest.java MessageFormatExceptionTest.java MessageNotReadableExceptionTest.java MessageNotWriteableExceptionTest.java QueueRequestorTest.java ResourceAllocationExceptionTest.java TopicRequestorTest.java TransactionInProgressExceptionTest.java TransactionRolledBackExceptionTest.java
gdamour 2004/02/25 01:58:49 Modified:specs/jms/src/java/javax/jms BytesMessage.java Connection.java ConnectionConsumer.java ConnectionFactory.java ConnectionMetaData.java DeliveryMode.java Destination.java ExceptionListener.java IllegalStateException.java InvalidClientIDException.java InvalidDestinationException.java InvalidSelectorException.java JMSException.java JMSSecurityException.java MapMessage.java Message.java MessageConsumer.java MessageEOFException.java MessageFormatException.java MessageListener.java MessageNotReadableException.java MessageNotWriteableException.java MessageProducer.java ObjectMessage.java Queue.java QueueBrowser.java QueueConnection.java QueueConnectionFactory.java QueueReceiver.java QueueRequestor.java QueueSender.java QueueSession.java ResourceAllocationException.java ServerSession.java ServerSessionPool.java Session.java StreamMessage.java TemporaryQueue.java TemporaryTopic.java TextMessage.java Topic.java TopicConnection.java TopicConnectionFactory.java TopicPublisher.java TopicRequestor.java TopicSession.java TopicSubscriber.java TransactionInProgressException.java TransactionRolledBackException.java XAConnection.java XAConnectionFactory.java XAQueueConnection.java XAQueueConnectionFactory.java XAQueueSession.java XASession.java XATopicConnection.java XATopicConnectionFactory.java XATopicSession.java specs/jms/src/test/javax/jms IllegalStateExceptionTest.java InvalidClientIDExceptionTest.java InvalidDestinationExceptionTest.java InvalidSelectorExceptionTest.java JMSExceptionTest.java JMSSecurityExceptionTest.java MessageEOFExceptionTest.java MessageFormatExceptionTest.java MessageNotReadableExceptionTest.java MessageNotWriteableExceptionTest.java QueueRequestorTest.java ResourceAllocationExceptionTest.java TopicRequestorTest.java TransactionInProgressExceptionTest.java TransactionRolledBackExceptionTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/BytesMessage.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/BytesMessage.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/Connection.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/Connection.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionConsumer.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionConsumer.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionFactory.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionFactory.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionMetaData.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/ConnectionMetaData.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/DeliveryMode.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/DeliveryMode.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/Destination.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/Destination.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/ExceptionListener.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jms/src/java/javax/jms/ExceptionListener.java.diff?r1=1.2r2=1.3 1.3 +14 -53 incubator-geronimo/specs/jms/src/java/javax/jms/IllegalStateException.java
cvs commit: incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/tagext BodyContent.java BodyTag.java BodyTagSupport.java DynamicAttributes.java FunctionInfo.java IterationTag.java JspFragment.java JspTag.java PageData.java SimpleTag.java SimpleTagSupport.java Tag.java TagAdapter.java TagAttributeInfo.java TagData.java TagExtraInfo.java TagFileInfo.java TagInfo.java TagLibraryInfo.java TagLibraryValidator.java TagSupport.java TagVariableInfo.java TryCatchFinally.java ValidationMessage.java VariableInfo.java
gdamour 2004/02/25 01:58:53 Modified:specs/jsp/src/java/javax/servlet/jsp ErrorData.java HttpJspPage.java JspContext.java JspEngineInfo.java JspException.java JspFactory.java JspPage.java JspTagException.java JspWriter.java PageContext.java SkipPageException.java specs/jsp/src/java/javax/servlet/jsp/el ELException.java ELParseException.java Expression.java ExpressionEvaluator.java FunctionMapper.java VariableResolver.java specs/jsp/src/java/javax/servlet/jsp/tagext BodyContent.java BodyTag.java BodyTagSupport.java DynamicAttributes.java FunctionInfo.java IterationTag.java JspFragment.java JspTag.java PageData.java SimpleTag.java SimpleTagSupport.java Tag.java TagAdapter.java TagAttributeInfo.java TagData.java TagExtraInfo.java TagFileInfo.java TagInfo.java TagLibraryInfo.java TagLibraryValidator.java TagSupport.java TagVariableInfo.java TryCatchFinally.java ValidationMessage.java VariableInfo.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/ErrorData.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/ErrorData.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/HttpJspPage.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/HttpJspPage.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspContext.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspContext.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspEngineInfo.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspEngineInfo.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspException.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspFactory.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspFactory.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspPage.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspPage.java.diff?r1=1.1r2=1.2 1.2 +18 -49 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspTagException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspTagException.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspWriter.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/JspWriter.java.diff?r1=1.1r2=1.2 1.2 +21 -53 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/PageContext.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/PageContext.java.diff?r1=1.1r2=1.2 1.2 +18 -49 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/SkipPageException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/SkipPageException.java.diff?r1=1.1r2=1.2 1.2 +20 -51 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ELException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ELException.java.diff?r1=1.1r2=1.2 1.2 +20 -51 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ELParseException.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ELParseException.java.diff?r1=1.1r2=1.2 1.2 +20 -51 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/Expression.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/Expression.java.diff?r1=1.1r2=1.2 1.2 +20 -51 incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ExpressionEvaluator.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/jsp/src/java/javax/servlet/jsp/el/ExpressionEvaluator.java.diff?r1=1.1r2=1.2 1.2 +20 -52
cvs commit: incubator-geronimo/specs/jta LICENSE.txt
gdamour 2004/02/25 01:58:53 Modified:specs/jta LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/jta/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/jta/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Aug 2003 10:28:16 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:53 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/specs/schema LICENSE.txt
gdamour 2004/02/25 01:58:55 Modified:specs/schema LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/schema/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/schema/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 13 Feb 2004 04:04:25 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:55 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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, +
cvs commit: incubator-geronimo/specs/jta/src/java/javax/transaction/xa XAException.java XAResource.java Xid.java
gdamour 2004/02/25 01:58:55 Modified:specs/jta/src/java/javax/transaction HeuristicCommitException.java HeuristicMixedException.java HeuristicRollbackException.java InvalidTransactionException.java NotSupportedException.java RollbackException.java Status.java Synchronization.java SystemException.java Transaction.java TransactionManager.java TransactionRequiredException.java TransactionRolledbackException.java UserTransaction.java specs/jta/src/java/javax/transaction/xa XAException.java XAResource.java Xid.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +21 -57 incubator-geronimo/specs/jta/src/java/javax/transaction/HeuristicCommitException.java Index: HeuristicCommitException.java === RCS file: /home/cvs/incubator-geronimo/specs/jta/src/java/javax/transaction/HeuristicCommitException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HeuristicCommitException.java 16 Aug 2003 10:28:16 - 1.1 +++ HeuristicCommitException.java 25 Feb 2004 09:58:54 - 1.2 @@ -1,62 +1,26 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * This source code implements specifications defined by the Java - * Community Process. In order to remain compliant with the specification - * DO NOT add / change / or delete method signatures! - * - * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is
cvs commit: incubator-geronimo/specs/servlet LICENSE.txt
gdamour 2004/02/25 01:58:56 Modified:specs/servlet LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/specs/servlet/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/specs/servlet/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 5 Sep 2003 22:55:58 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:56 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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, +
cvs commit: incubator-geronimo/sandbox/activation LICENSE.txt
gdamour 2004/02/25 01:58:59 Modified:sandbox/activation LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +202 -61 incubator-geronimo/sandbox/activation/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/sandbox/activation/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 29 Jan 2004 04:28:52 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:58:59 - 1.2 @@ -1,62 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ - -// -// This source code implements specifications defined by the Java -// Community Process. In order to remain compliant with the specification -// DO NOT add / change / or delete method signatures! -// + + 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
cvs commit: incubator-geronimo/sandbox/explorer LICENSE.txt
gdamour 2004/02/25 01:59:02 Modified:sandbox/explorer LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/sandbox/explorer/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 23 Jan 2004 03:47:02 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:59:02 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/sandbox/explorer/src/java/org/apache/geronimo/explorer ExplorerMain.java MBeanNode.java MBeanServerNode.java MBeanTreeModel.java ViewManager.java
gdamour 2004/02/25 01:59:04 Modified:sandbox/explorer/src/java/org/apache/geronimo/explorer ExplorerMain.java MBeanNode.java MBeanServerNode.java MBeanTreeModel.java ViewManager.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +14 -53 incubator-geronimo/sandbox/explorer/src/java/org/apache/geronimo/explorer/ExplorerMain.java Index: ExplorerMain.java === RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/src/java/org/apache/geronimo/explorer/ExplorerMain.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExplorerMain.java 23 Jan 2004 03:47:02 - 1.1 +++ ExplorerMain.java 25 Feb 2004 09:59:04 - 1.2 @@ -1,57 +1,18 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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. */ package org.apache.geronimo.explorer; 1.2 +14 -53 incubator-geronimo/sandbox/explorer/src/java/org/apache/geronimo/explorer/MBeanNode.java Index: MBeanNode.java === RCS file: /home/cvs/incubator-geronimo/sandbox/explorer/src/java/org/apache/geronimo/explorer/MBeanNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MBeanNode.java23 Jan 2004 03:47:02 - 1.1 +++ MBeanNode.java25 Feb 2004 09:59:04 - 1.2 @@
cvs commit: incubator-geronimo/sandbox/javamail/src/test/javax/mail/internet AllInternetTests.java ContentDispositionTest.java ContentTypeTest.java HeaderTokenizerTest.java InternetAddressTest.java InternetHeadersTest.java MailDateFormatTest.java MimeMessageTest.java NewsAddressTest.java ParameterListTest.java
gdamour 2004/02/25 01:59:11 Modified:sandbox/javamail/src/java/javax/mail Address.java AuthenticationFailedException.java Authenticator.java BodyPart.java FetchProfile.java Flags.java Folder.java FolderClosedException.java FolderNotFoundException.java Header.java IllegalWriteException.java Message.java MessageAware.java MessageContext.java MessageRemovedException.java MessagingException.java MethodNotSupportedException.java Multipart.java MultipartDataSource.java NoSuchProviderException.java Part.java PasswordAuthentication.java Provider.java ReadOnlyFolderException.java SendFailedException.java Service.java Session.java Store.java StoreClosedException.java Transport.java UIDFolder.java URLName.java sandbox/javamail/src/java/javax/mail/event ConnectionAdapter.java ConnectionEvent.java ConnectionListener.java FolderAdapter.java FolderEvent.java FolderListener.java MailEvent.java MessageChangedEvent.java MessageChangedListener.java MessageCountAdapter.java MessageCountEvent.java MessageCountListener.java StoreEvent.java StoreListener.java TransportAdapter.java TransportEvent.java TransportListener.java sandbox/javamail/src/java/javax/mail/internet AddressException.java ContentDisposition.java ContentType.java HeaderTokenizer.java InternetAddress.java InternetHeaders.java MailDateFormat.java MimeBodyPart.java MimeMessage.java MimeMultipart.java MimePart.java MimePartDataSource.java MimeUtility.java NewsAddress.java ParameterList.java ParseException.java SharedInputStream.java sandbox/javamail/src/java/javax/mail/search AddressStringTerm.java AddressTerm.java AndTerm.java BodyTerm.java ComparisonTerm.java DateTerm.java FlagTerm.java FromStringTerm.java FromTerm.java HeaderTerm.java IntegerComparisonTerm.java MessageIDTerm.java MessageNumberTerm.java NotTerm.java OrTerm.java ReceivedDateTerm.java RecipientStringTerm.java RecipientTerm.java SearchException.java SearchTerm.java SentDateTerm.java SizeTerm.java StringTerm.java SubjectTerm.java sandbox/javamail/src/test/javax/mail AllTests.java FlagsTest.java HeaderTest.java MessageContextTest.java MessagingExceptionTest.java PasswordAuthenticationTest.java SimpleFolder.java SimpleTextMessage.java TestData.java URLNameTest.java sandbox/javamail/src/test/javax/mail/event AllEventTests.java ConnectionEventTest.java FolderEventTest.java MessageChangedEventTest.java MessageCountEventTest.java StoreEventTest.java TransportEventTest.java sandbox/javamail/src/test/javax/mail/internet AllInternetTests.java ContentDispositionTest.java ContentTypeTest.java HeaderTokenizerTest.java InternetAddressTest.java InternetHeadersTest.java MailDateFormatTest.java MimeMessageTest.java NewsAddressTest.java ParameterListTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -58 incubator-geronimo/sandbox/javamail/src/java/javax/mail/Address.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/javamail/src/java/javax/mail/Address.java.diff?r1=1.1r2=1.2 1.2 +15 -58 incubator-geronimo/sandbox/javamail/src/java/javax/mail/AuthenticationFailedException.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/javamail/src/java/javax/mail/AuthenticationFailedException.java.diff?r1=1.1r2=1.2 1.2 +15 -58 incubator-geronimo/sandbox/javamail/src/java/javax/mail/Authenticator.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/javamail/src/java/javax/mail/Authenticator.java.diff?r1=1.1r2=1.2 1.2 +15 -58
cvs commit: incubator-geronimo/sandbox/mail LICENSE.txt
gdamour 2004/02/25 01:59:12 Modified:sandbox/mail LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/sandbox/mail/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/sandbox/mail/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 29 Jan 2004 04:07:42 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:59:12 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/sandbox/mail/src/test/org/apache/geronimo/mail/smtp SMTPTransportTest.java
gdamour 2004/02/25 01:59:14 Modified:sandbox/mail/src/java/org/apache/geronimo/mail AbstractFolder.java AbstractStore.java AbstractTransport.java sandbox/mail/src/java/org/apache/geronimo/mail/imap IMAPFolder.java IMAPStore.java sandbox/mail/src/java/org/apache/geronimo/mail/pop3 POP3Folder.java POP3Store.java sandbox/mail/src/java/org/apache/geronimo/mail/smtp SMTPTransport.java sandbox/mail/src/test/org/apache/geronimo/mail AbstractFolderTest.java sandbox/mail/src/test/org/apache/geronimo/mail/imap IMAPFolderTest.java sandbox/mail/src/test/org/apache/geronimo/mail/pop3 POP3FolderTest.java sandbox/mail/src/test/org/apache/geronimo/mail/smtp SMTPTransportTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +15 -53 incubator-geronimo/sandbox/mail/src/java/org/apache/geronimo/mail/AbstractFolder.java Index: AbstractFolder.java === RCS file: /home/cvs/incubator-geronimo/sandbox/mail/src/java/org/apache/geronimo/mail/AbstractFolder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractFolder.java 29 Jan 2004 04:07:42 - 1.1 +++ AbstractFolder.java 25 Feb 2004 09:59:14 - 1.2 @@ -1,58 +1,20 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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
cvs commit: incubator-geronimo/sandbox/twiddle/src/test/org/apache/geronimo/twiddle/console TransientHistoryTest.java
gdamour 2004/02/25 01:59:18 Modified:sandbox/twiddle/src/java/org/apache/geronimo/twiddle Twiddle.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/cli Main.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command AbstractCommand.java Command.java CommandContainer.java CommandContext.java CommandException.java CommandExecutor.java CommandFactory.java CommandInfo.java CommandNotFoundException.java CommandPathParser.java Environment.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/commands DumpPropertiesCommand.java ExitCommand.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/config ConfigurationException.java ConfigurationReader.java Configurator.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/console AbstractConsole.java Completer.java Console.java ConsoleFactory.java History.java IOContext.java InteractiveConsole.java TransientHistory.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/console/java Console.java sandbox/twiddle/src/java/org/apache/geronimo/twiddle/util HelpFormatter.java sandbox/twiddle/src/test/org/apache/geronimo/twiddle/command CommandContainerTest.java CommandFactoryTest.java CommandPathParserTest.java TestCommand.java sandbox/twiddle/src/test/org/apache/geronimo/twiddle/config ConfigurationTest.java sandbox/twiddle/src/test/org/apache/geronimo/twiddle/console TransientHistoryTest.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/AbstractCommand.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/AbstractCommand.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/Command.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/Command.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandContainer.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandContainer.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandContext.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandContext.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandException.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandException.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandExecutor.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandExecutor.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandFactory.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandFactory.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandInfo.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandInfo.java.diff?r1=1.1r2=1.2 1.2 +14 -53 incubator-geronimo/sandbox/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandNotFoundException.java
cvs commit: incubator-geronimo/sandbox/webdav LICENSE.txt
gdamour 2004/02/25 01:59:19 Modified:sandbox/webdav LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/sandbox/webdav/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/sandbox/webdav/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 23 Jan 2004 02:25:51 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:59:19 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty JettyConnector.java JettyConnectorImpl.java JettyDAVServer.java
gdamour 2004/02/25 01:59:20 Modified:sandbox/webdav/src/java/org/apache/geronimo/webdav AbstractConnector.java CatalinaDAVRepository.java Connector.java DAVRepository.java DAVServer.java sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty JettyConnector.java JettyConnectorImpl.java JettyDAVServer.java Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +14 -53 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/AbstractConnector.java Index: AbstractConnector.java === RCS file: /home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/AbstractConnector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractConnector.java23 Jan 2004 02:25:51 - 1.1 +++ AbstractConnector.java25 Feb 2004 09:59:20 - 1.2 @@ -1,57 +1,18 @@ -/* - * The Apache Software License, Version 1.1 +/** * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. + * Copyright 2004 The Apache Software Foundation * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * 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. */ package org.apache.geronimo.webdav; 1.3 +14 -53 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/CatalinaDAVRepository.java Index: CatalinaDAVRepository.java === RCS file:
cvs commit: incubator-geronimo/sandbox/xbeans LICENSE.txt
gdamour 2004/02/25 01:59:22 Modified:sandbox/xbeans LICENSE.txt Log: License migration: 1.1 = 2.0 Revision ChangesPath 1.2 +203 -55 incubator-geronimo/sandbox/xbeans/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/sandbox/xbeans/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 22 Jan 2004 21:39:55 - 1.1 +++ LICENSE.txt 25 Feb 2004 09:59:22 - 1.2 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
[Apache Geronimo Wiki] Updated: IntroduceYourself
Date: 2004-02-25T05:24:27 Editor: 218.148.24.1 Wiki: Apache Geronimo Wiki Page: IntroduceYourself URL: http://wiki.apache.org/geronimo/IntroduceYourself no comment Change Log: -- @@ -124,6 +124,7 @@ || Greg Kerdemelidis || Christchurch || Canterbury || New Zealand || J2EE architect / developer; Director of [http://www.genixsystems.com/ Genix Systems] || || Laurent Foret || Bordeaux || Aquitaine|| France || || || Adam Carbone || Middleboro || Massachusetts || USA || Senior Developer || +|| Uijin Hong || Seoul || Seoul || Korea || || CategoryCategory
[Apache Geronimo Wiki] Updated: KnownWorkingConfigurations
Date: 2004-02-25T05:28:47 Editor: 218.148.24.1 Wiki: Apache Geronimo Wiki Page: KnownWorkingConfigurations URL: http://wiki.apache.org/geronimo/KnownWorkingConfigurations no comment Change Log: -- @@ -14,6 +14,10 @@ Sun Java 2 SDK 1.4.0_01, 1.4.1_02, 1.4.2, 1.4.2_02 Maven 1.0 rc1 +== Windows 2003 == +Sun Java 2 SDK 1.4.2_03 +Maven 1.0 RC1 + = Linux = == Debian Linux (Unstable) == Sun Java 2 SDK 1.4.2 (Blackdown-1.4.1-01 works too)
cvs commit: incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl - New directory
gdamour 2004/02/25 05:35:46 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl - New directory
cvs commit: incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote - New directory
gdamour 2004/02/25 05:35:46 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote - New directory
cvs commit: incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local - New directory
gdamour 2004/02/25 05:35:46 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local - New directory
cvs commit: incubator-geronimo/sandbox/webdav project.xml
gdamour 2004/02/25 05:36:16 Modified:sandbox/webdav project.xml Added: sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore GFileStub.java GFileManagerProxy.java GFileCommand.java CommandWithProxy.java CommandResult.java ProxyCommand.java GFileManagerClient.java sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/messaging ServerNode.java QueueOutInterceptor.java MsgHeader.java MsgHeaderConstants.java HeaderInInterceptor.java StreamInInterceptor.java MsgQueue.java Connector.java StreamManagerImpl.java Processor.java StreamOutInterceptor.java RequestSender.java MsgCopier.java StreamInputStream.java MsgBody.java MsgInInterceptor.java Processors.java HeaderOutInterceptor.java HeaderReactor.java ServantNode.java GInputStream.java MsgOutInterceptor.java StreamOutputStream.java QueueInInterceptor.java ServerProcessors.java StreamManager.java Msg.java sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local LocalGFileDAO.java LocalGFileManager.java sandbox/webdav/src/java/org/apache/geronimo/datastore/impl DirtyMarkerImpl.java GFileDAO.java GFileTO.java GFileDelegateImpl.java DirtyMarker.java GFileImpl.java GFileStateManager.java StateManager.java DAOException.java GFileDelegate.java LockManager.java AbstractGFileManager.java sandbox/webdav/src/java/org/apache/geronimo/datastore GFileManagerException.java GFile.java GFileManager.java Log: Initial check-in of a distributed filesystem. The local filesystem is modeled as a Domain Store. The remote part is based on a general purpose networking infrastructure using messaging as the mean of communication. Both of these implementations have been only partially tested as they need to be refactored and GBeanify. Revision ChangesPath 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileStub.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileStub.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileManagerProxy.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileManagerProxy.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileCommand.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileCommand.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/CommandWithProxy.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/CommandWithProxy.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/CommandResult.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/CommandResult.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/ProxyCommand.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/ProxyCommand.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileManagerClient.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/datastore/GFileManagerClient.java?rev=1.1 1.1 incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/messaging/ServerNode.java http://cvs.apache.org/viewcvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/messaging/ServerNode.java?rev=1.1 1.1
cvs commit: incubator-geronimo LICENSE.txt
gdamour 2004/02/25 05:59:27 Modified:.LICENSE.txt Log: Reporter: Davanum Srinivas. Licence file missed during the migration. Revision ChangesPath 1.5 +203 -55 incubator-geronimo/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/incubator-geronimo/LICENSE.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LICENSE.txt 12 Aug 2003 14:45:45 - 1.4 +++ LICENSE.txt 25 Feb 2004 13:59:27 - 1.5 @@ -1,55 +1,203 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, - *if any, must include the following acknowledgment: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowledgment may appear in the software itself, - *if and wherever such third-party acknowledgments normally appear. - * - * 4. The names Apache and Apache Software Foundation and - *Apache Geronimo must not be used to endorse or promote products - *derived from this software without prior written permission. For - *written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache, - *Apache Geronimo, nor may Apache appear in their name, without - *prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * - */ + + 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
cvs commit: incubator-geronimo STATUS
jboynes 2004/02/25 07:55:31 Modified:.STATUS Log: Revision ChangesPath 1.25 +2 -2 incubator-geronimo/STATUS Index: STATUS === RCS file: /home/cvs/incubator-geronimo/STATUS,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- STATUS20 Feb 2004 23:54:25 - 1.24 +++ STATUS25 Feb 2004 15:55:31 - 1.25 @@ -13,7 +13,7 @@ X -- Do All the software in the codebase, are licensed (or multi-licensed) under the Apache licence? - Yes - all code is currently ASL1.1 and will move soon to ASL2.0 + Yes - code converted to ASL2.0 on 2004/02/25 (thanks Gianny) X -- Do all the software in the codebase,are compliant with the Specifications set by Java Community Process?(Wherever applicable)
cvs commit: incubator-geronimo/modules/transaction/src/test/org/apache/geronimo/transaction TransactionManagerProxyTest.java
djencks 2004/02/25 10:05:51
Modified:modules/transaction/src/java/org/apache/geronimo/transaction
TransactionManagerProxy.java
modules/transaction/src/test/org/apache/geronimo/transaction/manager
MockResource.java
Added:
modules/transaction/src/test/org/apache/geronimo/transaction/manager
XidImporterTest.java
modules/transaction/src/test/org/apache/geronimo/transaction
TransactionManagerProxyTest.java
Log:
a few simple tm tests
Revision ChangesPath
1.5 +2 -2
incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java
Index: TransactionManagerProxy.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransactionManagerProxy.java 25 Feb 2004 09:58:19 - 1.4
+++ TransactionManagerProxy.java 25 Feb 2004 18:05:51 - 1.5
@@ -75,7 +75,7 @@
*/
public TransactionManagerProxy() {
this.delegate = new TransactionManagerImpl();
-this.importer = null;
+this.importer = (XidImporter)delegate;
}
public void setTransactionTimeout(int timeout) throws SystemException {
1.3 +19 -1
incubator-geronimo/modules/transaction/src/test/org/apache/geronimo/transaction/manager/MockResource.java
Index: MockResource.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/transaction/src/test/org/apache/geronimo/transaction/manager/MockResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockResource.java 25 Feb 2004 09:58:19 - 1.2
+++ MockResource.java 25 Feb 2004 18:05:51 - 1.3
@@ -30,6 +30,9 @@
private Xid xid;
private MockResourceManager manager;
private int timeout = 0;
+private boolean prepared;
+private boolean committed;
+private boolean rolledback;
public MockResource(MockResourceManager manager) {
this.manager = manager;
@@ -67,13 +70,16 @@
}
public int prepare(Xid xid) throws XAException {
+prepared = true;
return 0;
}
public void commit(Xid xid, boolean onePhase) throws XAException {
+committed = true;
}
public void rollback(Xid xid) throws XAException {
+rolledback = true;
manager.forget(xid, this);
}
@@ -90,6 +96,18 @@
public Xid[] recover(int flag) throws XAException {
throw new UnsupportedOperationException();
+}
+
+public boolean isPrepared() {
+return prepared;
+}
+
+public boolean isCommitted() {
+return committed;
+}
+
+public boolean isRolledback() {
+return rolledback;
}
}
1.1
incubator-geronimo/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
Index: XidImporterTest.java
===
/**
*
* Copyright 2004 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.
*/
package org.apache.geronimo.transaction.manager;
import javax.transaction.xa.Xid;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.XAException;
import javax.transaction.Transaction;
import javax.transaction.Status;
import junit.framework.TestCase;
/**
*
*
* @version $Revision: 1.1 $ $Date: 2004/02/25 18:05:51 $
*
* */
public class XidImporterTest extends TestCase{
MockResourceManager rm1 = new MockResourceManager(true);
MockResource r1_1 = new MockResource(rm1);
MockResource r1_2 = new MockResource(rm1);
MockResourceManager rm2 = new MockResourceManager(true);
MockResource r2_1 = new MockResource(rm2);
MockResource r2_2 = new MockResource(rm2);
XidImporter tm = new TransactionManagerImpl();
XidFactory xidFactory = new XidFactory();
public void
