@@ -1,18 +1,15 @@ -This software is licensed under the ISC license, quoted below. -See <http://en.wikipedia.org/wiki/ISC_license> for details, but it is -effectively a shorter version of the BSD license, and very permissive. +This software is licensed under the Apache 2 license, quoted below. +Copyright 2009 Robey Pointer <robeypointer@lag.net> -Copyright (c) 2008, Robey Pointer <robey@lag.net> +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 -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. + http://www.apache.org/licenses/LICENSE-2.0 -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +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. LICENSE @@ -419,5 +419,5 @@ with a cleaner interface. ## Contact Configgy was written by Robey Pointer <robeypointer@gmail.com> and is licensed -under the ISC license (included). Please write me with questions or comments, -but the software is provided as-is. +under the Apache 2 license (included). Please write me with questions or +comments, but the software is provided as-is. README.md @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/Attributes.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/Config.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/ConfigMap.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/ConfigParser.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/Configgy.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/EnvironmentAttributes.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/Importer.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/RuntimeEnvironment.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/main/scala/net/lag/configgy/Subscriber.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag src/main/scala/net/lag/extensions.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/main/scala/net/lag/logging/FileHandler.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/main/scala/net/lag/logging/Formatter.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/main/scala/net/lag/logging/Handler.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/main/scala/net/lag/logging/Logger.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/main/scala/net/lag/logging/Syslog.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag src/test/scala/net/lag/ExtensionsSpec.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag src/test/scala/net/lag/TestRunner.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/test/scala/net/lag/configgy/AttributesSpec.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/test/scala/net/lag/configgy/ConfigParserSpec.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/test/scala/net/lag/configgy/ConfigSpec.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.configgy src/test/scala/net/lag/configgy/ConfiggySpec.scala @@ -1,6 +1,17 @@ /* - * Copyright (c) 2008, Robey Pointer <robeypointer@gmail.com> - * ISC licensed. Please see the included LICENSE file for more information. + * Copyright 2009 Robey Pointer <robeypointer@gmail.com> + * + * 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 net.lag.logging src/test/scala/net/lag/logging/LoggingSpec.scala 153a431c658c06962f67cbfbdd3813e371c75a36 Robey Pointer robeypointer@gmail.com http://github.com/robey/configgy/commit/2db2a57b2e63ef6b9f7ee36472daa124b65a24b3 2db2a57b2e63ef6b9f7ee36472daa124b65a24b3 2009-03-09T01:09:02-07:00 2009-03-09T01:09:02-07:00 use apache 2 license. d45a0f1daf4dd8512b0ee36a3648de5cd3860a7b Robey Pointer robeypointer@gmail.com