Author: ritchiem
Date: Mon Jun 18 03:49:50 2007
New Revision: 548302
URL: http://svn.apache.org/viewvc?view=rev&rev=548302
Log:
Various License header updates.
Update to PrincipalDatabase's to ensure they work correctly with # comments.
Modified:
incubator/qpid/branches/M2/java/broker/etc/access
incubator/qpid/branches/M2/java/broker/etc/md5passwd
incubator/qpid/branches/M2/java/broker/etc/passwd
incubator/qpid/branches/M2/java/broker/etc/passwdVhost
incubator/qpid/branches/M2/java/broker/etc/qpid.passwd
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
Modified: incubator/qpid/branches/M2/java/broker/etc/access
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/etc/access?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
--- incubator/qpid/branches/M2/java/broker/etc/access (original)
+++ incubator/qpid/branches/M2/java/broker/etc/access Mon Jun 18 03:49:50 2007
@@ -1 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
guest:localhost(rw),test(rw)
Modified: incubator/qpid/branches/M2/java/broker/etc/md5passwd
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/etc/md5passwd?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
--- incubator/qpid/branches/M2/java/broker/etc/md5passwd (original)
+++ incubator/qpid/branches/M2/java/broker/etc/md5passwd Mon Jun 18 03:49:50
2007
@@ -1 +1,21 @@
-guest:qfgyy4ewnVMBg
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+guest:qfgyy4ewnVMBg
+admin:ISMvKXpXpadDiUoOSoAfww==
+user:aBzonUodYLhwSa8s9A10sA==
Modified: incubator/qpid/branches/M2/java/broker/etc/passwd
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/etc/passwd?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
--- incubator/qpid/branches/M2/java/broker/etc/passwd (original)
+++ incubator/qpid/branches/M2/java/broker/etc/passwd Mon Jun 18 03:49:50 2007
@@ -1 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
guest:guest
Modified: incubator/qpid/branches/M2/java/broker/etc/passwdVhost
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/etc/passwdVhost?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
--- incubator/qpid/branches/M2/java/broker/etc/passwdVhost (original)
+++ incubator/qpid/branches/M2/java/broker/etc/passwdVhost Mon Jun 18 03:49:50
2007
@@ -1 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
guest:guest:localhost,test
Modified: incubator/qpid/branches/M2/java/broker/etc/qpid.passwd
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/etc/qpid.passwd?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
--- incubator/qpid/branches/M2/java/broker/etc/qpid.passwd (original)
+++ incubator/qpid/branches/M2/java/broker/etc/qpid.passwd Mon Jun 18 03:49:50
2007
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
guest:CE4DQ6BIb/BVMN9scFyLtA==
admin:ISMvKXpXpadDiUoOSoAfww==
user:CE4DQ6BIb/BVMN9scFyLtA==
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
---
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
(original)
+++
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
Mon Jun 18 03:49:50 2007
@@ -29,18 +29,17 @@
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.BufferedReader;
import java.io.FileReader;
-import java.io.UnsupportedEncodingException;
-import java.util.regex.Pattern;
-import java.util.Map;
+import java.io.IOException;
+import java.security.Principal;
import java.util.HashMap;
-import java.util.List;
import java.util.LinkedList;
-import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
/**
* Represents a user database where the account information is stored in a
simple flat file.
@@ -212,7 +211,7 @@
reader = new BufferedReader(new FileReader(_passwordFile));
String line;
- while ((line = reader.readLine()) != null)
+ while ((line = reader.readLine()) != null && !line.startsWith("#"))
{
String[] result = _regexp.split(line);
if (result == null || result.length < 2)
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java?view=diff&rev=548302&r1=548301&r2=548302
==============================================================================
---
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
(original)
+++
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
Mon Jun 18 03:49:50 2007
@@ -20,17 +20,17 @@
*/
package org.apache.qpid.server.security.auth.database;
+import org.apache.log4j.Logger;
import org.apache.qpid.server.security.access.AccessManager;
import org.apache.qpid.server.security.access.AccessResult;
-import org.apache.qpid.server.security.access.Accessable;
import org.apache.qpid.server.security.access.AccessRights;
+import org.apache.qpid.server.security.access.Accessable;
import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.log4j.Logger;
-import java.io.IOException;
import java.io.BufferedReader;
import java.io.FileReader;
+import java.io.IOException;
import java.security.Principal;
/**
@@ -61,7 +61,7 @@
reader = new BufferedReader(new FileReader(_passwordFile));
String line;
- while ((line = reader.readLine()) != null)
+ while ((line = reader.readLine()) != null &&
!line.startsWith("#"))
{
String[] result = _regexp.split(line);
if (result == null || result.length < 3)
