You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2004/02/27 06:45:47 UTC
cvs commit: jakarta-tomcat/src/etc/users admin-users.xml example-users.xml global-users.xml tomcat-users.xml
billbarker 2004/02/26 21:45:47
Modified: src/etc apps-127.0.0.1.xml apps-admin.xml apps-examples.xml
modules.xml server.xml tomcat.policy
src/etc/jk mod_jk.conf mod_jk.conf-jni obj.conf
uriworkermap.properties workers.properties
wrapper.properties
src/etc/users admin-users.xml example-users.xml
global-users.xml tomcat-users.xml
Log:
Update to the Apache License v2.0.
Revision Changes Path
1.2 +15 -0 jakarta-tomcat/src/etc/apps-127.0.0.1.xml
Index: apps-127.0.0.1.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/apps-127.0.0.1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apps-127.0.0.1.xml 10 Feb 2001 16:53:15 -0000 1.1
+++ apps-127.0.0.1.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
<Server>
<!-- Virtual host example - to show that it works we'll
map the /examples as / and the ROOT as /examples :-)
1.2 +15 -0 jakarta-tomcat/src/etc/apps-admin.xml
Index: apps-admin.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/apps-admin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apps-admin.xml 10 Feb 2001 16:53:15 -0000 1.1
+++ apps-admin.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
<webapps>
<!-- Special rules for the admin webapplication -->
1.2 +15 -0 jakarta-tomcat/src/etc/apps-examples.xml
Index: apps-examples.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/apps-examples.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apps-examples.xml 10 Feb 2001 16:53:15 -0000 1.1
+++ apps-examples.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
<webapps>
<!-- Setting special properties for /examples
( as an example of overriding the defaults )
1.18 +15 -0 jakarta-tomcat/src/etc/modules.xml
Index: modules.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/modules.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- modules.xml 17 Feb 2004 06:28:57 -0000 1.17
+++ modules.xml 27 Feb 2004 05:45:47 -0000 1.18
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-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.
+-->
<modules>
<module name="JNIConnectionHandler" javaClass="org.apache.tomcat.modules.server.JNIConnectionHandler"/>
1.103 +15 -0 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- server.xml 17 Feb 2004 06:28:57 -0000 1.102
+++ server.xml 27 Feb 2004 05:45:47 -0000 1.103
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
<Server>
<!-- You can add a "home" attribute to represent the "base" for
1.9 +15 -0 jakarta-tomcat/src/etc/tomcat.policy
Index: tomcat.policy
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/tomcat.policy,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tomcat.policy 25 Jan 2001 05:07:34 -0000 1.8
+++ tomcat.policy 27 Feb 2004 05:45:47 -0000 1.9
@@ -1,3 +1,18 @@
+//
+// Copyright 1999-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.
+//
// Permissions for tomcat.
// javac
1.3 +15 -0 jakarta-tomcat/src/etc/jk/mod_jk.conf
Index: mod_jk.conf
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/mod_jk.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_jk.conf 20 Jul 2001 02:59:33 -0000 1.2
+++ mod_jk.conf 27 Feb 2004 05:45:47 -0000 1.3
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-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.
+#
LoadModule jk_module modules/mod_jk.dll
1.2 +15 -0 jakarta-tomcat/src/etc/jk/mod_jk.conf-jni
Index: mod_jk.conf-jni
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/mod_jk.conf-jni,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_jk.conf-jni 15 Aug 2001 02:40:37 -0000 1.1
+++ mod_jk.conf-jni 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-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.
+#
LoadModule jk_module modules/mod_jk.dll
1.3 +15 -0 jakarta-tomcat/src/etc/jk/obj.conf
Index: obj.conf
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/obj.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obj.conf 20 Mar 2002 03:33:24 -0000 1.2
+++ obj.conf 27 Feb 2004 05:45:47 -0000 1.3
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-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.
+#
Init fn=flex-init access="d:/web-servers/ent3.6/https-ps139-16/logs/access" format.access="%Ses->client.ip% - %Req->vars.auth-user% [%SYSDATE%] \"%Req->reqpb.clf-request%\" %Req->srvhdrs.clf-status% %Req->srvhdrs.content-length%"
Init fn=load-types mime-types=mime.types
1.3 +15 -0 jakarta-tomcat/src/etc/jk/uriworkermap.properties
Index: uriworkermap.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/uriworkermap.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uriworkermap.properties 20 Mar 2002 03:24:00 -0000 1.2
+++ uriworkermap.properties 27 Feb 2004 05:45:47 -0000 1.3
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-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.
+#
#
# Simple uriworkermap configuration file
1.6 +15 -0 jakarta-tomcat/src/etc/jk/workers.properties
Index: workers.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/workers.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workers.properties 24 Aug 2001 01:10:38 -0000 1.5
+++ workers.properties 27 Feb 2004 05:45:47 -0000 1.6
@@ -1,5 +1,20 @@
# workers.properties -
#
+# Copyright 1999-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.
+#
+#
# This file provides jk derived plugins with the needed information to
# connect to the different tomcat workers. Note that the distributed
# version of this file requires modification before it is usable by a
1.5 +18 -3 jakarta-tomcat/src/etc/jk/wrapper.properties
Index: wrapper.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/wrapper.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wrapper.properties 13 Mar 2002 03:40:07 -0000 1.4
+++ wrapper.properties 27 Feb 2004 05:45:47 -0000 1.5
@@ -4,6 +4,21 @@
# $Date$
#
#
+# Copyright 1999-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.
+#
+#
# jk_service.properties - a bootstrup file for the Tomcat NT service.
#
# This file provides jk_nt_service with the needed information to
1.2 +15 -0 jakarta-tomcat/src/etc/users/admin-users.xml
Index: admin-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/users/admin-users.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admin-users.xml 29 Dec 2000 00:33:14 -0000 1.1
+++ admin-users.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-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.
+-->
<tomcat-users>
<user name="admin" password="changethis" roles="tomcat_admin,tomcat,role1" />
</tomcat-users>
1.2 +15 -0 jakarta-tomcat/src/etc/users/example-users.xml
Index: example-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/users/example-users.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example-users.xml 29 Dec 2000 00:33:14 -0000 1.1
+++ example-users.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-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.
+-->
<tomcat-users>
<user name="tomcat" password="tomcat" roles="tomcat" />
<user name="role1" password="tomcat" roles="role1" />
1.2 +15 -0 jakarta-tomcat/src/etc/users/global-users.xml
Index: global-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/users/global-users.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- global-users.xml 29 Dec 2000 00:33:14 -0000 1.1
+++ global-users.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-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.
+-->
<tomcat-users>
<user name="root" password="changethis" roles="tomcat,role1,tomcat_admin,tomcat_root" />
</tomcat-users>
1.2 +15 -0 jakarta-tomcat/src/etc/users/tomcat-users.xml
Index: tomcat-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/users/tomcat-users.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-users.xml 29 Dec 2000 00:33:14 -0000 1.1
+++ tomcat-users.xml 27 Feb 2004 05:45:47 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-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.
+-->
<tomcat-users>
<user name="tomcat" password="tomcat" roles="tomcat" />
<user name="role1" password="tomcat" roles="role1" />
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org