Permalink
Browse files

Updated product naming and copyright header

Updated copyright to include both Attila Kiskó and Couchbase, Inc.
Updated AssemblyInfo file to reference Couchbase product naming.
Removed public_key.snk from solution items, which was Attila's public key.

Change-Id: If77d6ded0b03a4c3fc6333bbc84da1184534e48c
Reviewed-on: http://review.couchbase.org/12082
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information...
1 parent 14a81da commit 6d39476d146d91c50a8e0bf2c4f89e79a8e8a139 @johnzablocki johnzablocki committed with ingenthr Jan 5, 2012
@@ -27,7 +27,9 @@ ISyncOperation ICouchbaseOperationFactory.Sync(SyncMode mode, IList<KeyValuePair
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -258,7 +258,10 @@ private static Uri ResolveBucketUri(WebClientWithTimeout client, Uri root, strin
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ *
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -74,7 +74,9 @@ public static ClusterConfig ResolveBucket(WebClient client, Uri poolUri, string
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,9 @@ public enum BucketPortType
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -275,7 +275,9 @@ public SPC(ISocketPoolConfiguration original)
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -151,7 +151,9 @@ TimeSpan ICouchbaseClientConfiguration.RetryTimeout
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,9 @@ void IProvider.Initialize(Dictionary<string, string> parameters)
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,7 +57,9 @@ public interface ICouchbaseClientConfiguration
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@ public interface ICouchbasePerformanceMonitorFactory: IProvider
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -101,7 +101,9 @@ public TimeSpan RetryTimeout
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@ public Uri Uri
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +50,9 @@ public IList<Uri> ToUriCollection()
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -67,7 +67,9 @@ public override object ConvertTo(System.ComponentModel.ITypeDescriptorContext co
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,6 @@
<None Include="Demo.config" />
<None Include="Changes.mdown" />
<None Include="Couchbase.nuspec" />
- <None Include="public_key.snk" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\lib\EnyimMemcached\Enyim.Caching\Enyim.Caching.csproj">
@@ -559,7 +559,9 @@ IEnumerable<IMemcachedNode> IMemcachedNodeLocator.GetWorkingNodes()
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -200,7 +200,9 @@ public override IEnumerable<Type> SupportedTypes
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -546,7 +546,9 @@ private void Worker(object state)
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +70,9 @@ OperationState IOperationWithState.State
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -222,7 +222,9 @@ public interface ISyncOperation : IOperation
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,23 +1,28 @@
using System.Reflection;
using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
-[assembly: AssemblyProduct("Couchbase")]
-
-[assembly: AssemblyCompany("enyim.com")]
-[assembly: AssemblyCopyright("Copyright © enyim.com, Attila Kiskó 2010")]
+[assembly: AssemblyCompany("Couchbase, Inc.")]
+[assembly: AssemblyProduct("Couchbase .NET Client Library")]
+[assembly: AssemblyCopyright("Copyright 2012 Couchbase, Inc.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(true)]
-[assembly: Guid("8460330E-5027-4e2c-AA84-FC8539780160")]
+[assembly: Guid("90a3fa8d-c2d5-44b5-8565-713ec99ed76b")]
+
+[assembly: InternalsVisibleTo("CouchbaseTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010013719a62782d9b2a78a4e4ef4c0b1ca0234851c4625ddc9a8159cbbd7fa368e51069de974477209bb5ee7de894ecbe66eb36e2d5a717c796095b407368cb507186381d2826a1f5b4f446d0b57e98d095534a175f499f24e60da35ab769c29c53bb6ed24dfdd377f38d287afb8c462dcbfb23aa3cd575c3de368740e0303af8d2")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -341,7 +341,9 @@ internal enum OperationState { Unspecified, Success, Failure, InvalidVBucket }
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -98,7 +98,9 @@ public WebRequest GetWebRequest(Uri address, string connectionGroupName)
#region [ License information ]
/* ************************************************************
*
- * Copyright (c) 2010 Attila Kiskó, enyim.com
+ * @author Couchbase <info@couchbase.com>
+ * @copyright 2012 Couchbase, Inc.
+ * @copyright 2010 Attila Kiskó, enyim.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Binary file not shown.

0 comments on commit 6d39476

Please sign in to comment.