Skip to content

Commit

Permalink
Update license for EE source codes
Browse files Browse the repository at this point in the history 
- Updated license to CBLDatabaseEndpoint.{h,m}.
- Made DatabaseEndpoint.swift into its own file and updated license.
  • Loading branch information
@pasin
pasin committed Apr 6, 2018
1 parent 2f2a209 commit 6b7a1ea
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 30 deletions.
19 changes: 19 additions & 0 deletions CouchbaseLite.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
936483BA1E4431C6008D08B3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 936483B01E4431C6008D08B3 /* Main.storyboard */; };
936483BD1E4431C6008D08B3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 936483B41E4431C6008D08B3 /* main.m */; };
936483BE1E4431C6008D08B3 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 936483B61E4431C6008D08B3 /* ViewController.m */; };
9369A35320775B2F009B5B83 /* DatabaseEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9369A35220775B2F009B5B83 /* DatabaseEndpoint.swift */; };
937441D31E7B8B0500CB8F11 /* CBLPredicateQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 937441D01E7B8B0500CB8F11 /* CBLPredicateQuery.h */; };
937441D41E7B8B0500CB8F11 /* CBLPredicateQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 937441D01E7B8B0500CB8F11 /* CBLPredicateQuery.h */; };
937441D51E7B8B0500CB8F11 /* CBLPredicateQuery.mm in Sources */ = {isa = PBXBuildFile; fileRef = 937441D11E7B8B0500CB8F11 /* CBLPredicateQuery.mm */; };
Expand Down Expand Up @@ -686,6 +687,13 @@
remoteGlobalIDString = 938CF9ED1E442A3E00291631;
remoteInfo = "CBL-iOS-Tests-App";
};
9369A36520775B2F009B5B83 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9398D9311E0347B600464432 /* LiteCore.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 27B64934206971FB00FC12F7;
remoteInfo = "LiteCore framework";
};
938CFA1E1E442A9100291631 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9398D9091E03434200464432 /* Project object */;
Expand Down Expand Up @@ -957,6 +965,7 @@
936483B41E4431C6008D08B3 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
936483B51E4431C6008D08B3 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
936483B61E4431C6008D08B3 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
9369A35220775B2F009B5B83 /* DatabaseEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseEndpoint.swift; sourceTree = "<group>"; };
937441D01E7B8B0500CB8F11 /* CBLPredicateQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBLPredicateQuery.h; sourceTree = "<group>"; };
937441D11E7B8B0500CB8F11 /* CBLPredicateQuery.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CBLPredicateQuery.mm; sourceTree = "<group>"; };
937441D21E7B8B0500CB8F11 /* CBLPredicateQuery+Predicates.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CBLPredicateQuery+Predicates.mm"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1341,6 +1350,7 @@
isa = PBXGroup;
children = (
93CED8D020488C9500E6F0A4 /* Authenticator.swift */,
9369A35220775B2F009B5B83 /* DatabaseEndpoint.swift */,
93248DE72005E72A00C15B00 /* Endpoint.swift */,
27E35A911E8C4F4300E103F9 /* Replicator.swift */,
93DB80001ED8FCE200C4F845 /* ReplicatorConfiguration.swift */,
Expand Down Expand Up @@ -1666,6 +1676,7 @@
children = (
9398D9441E0347B600464432 /* libLiteCore-static.a */,
9398D9461E0347B600464432 /* libLiteCore.dylib */,
9369A36620775B2F009B5B83 /* LiteCore.framework */,
2749B9771EB25A660068DBF9 /* libLiteCoreREST-static.a */,
2749B9791EB25A660068DBF9 /* libLiteCoreREST.dylib */,
27F961961ED777EA0060F804 /* libSupport.a */,
Expand Down Expand Up @@ -2453,6 +2464,13 @@
remoteRef = 27F961951ED777EA0060F804 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9369A36620775B2F009B5B83 /* LiteCore.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = LiteCore.framework;
remoteRef = 9369A36520775B2F009B5B83 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9398D9441E0347B600464432 /* libLiteCore-static.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -2643,6 +2661,7 @@
938196161EC113650032CC51 /* CBLDocumentFragment.m in Sources */,
9322DCE21F14603400C4ACF7 /* CBLQueryLimit.m in Sources */,
9380D26A1F0D832C007DD84A /* Function.swift in Sources */,
9369A35320775B2F009B5B83 /* DatabaseEndpoint.swift in Sources */,
9322DCAB1F0F0E0200C4ACF7 /* Ordering.swift in Sources */,
27E35A921E8C4F4300E103F9 /* Replicator.swift in Sources */,
938CDF251E807F86002EE790 /* FromRouter.swift in Sources */,
Expand Down
7 changes: 3 additions & 4 deletions Objective-C/CBLDatabaseEndpoint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
// CBLDatabaseEndpoint.h
// CouchbaseLite
//
// Copyright (c) 2018 Couchbase, Inc All rights reserved.
// Copyright (c) 2018 Couchbase, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// Licensed under the Couchbase License Agreement (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
// https://info.couchbase.com/rs/302-GJY-034/images/2017-10-30_License_Agreement.pdf
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
7 changes: 3 additions & 4 deletions Objective-C/CBLDatabaseEndpoint.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
// CBLDatabaseEndpoint.m
// CouchbaseLite
//
// Copyright (c) 2018 Couchbase, Inc All rights reserved.
// Copyright (c) 2018 Couchbase, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// Licensed under the Couchbase License Agreement (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
// https://info.couchbase.com/rs/302-GJY-034/images/2017-10-30_License_Agreement.pdf
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
42 changes: 42 additions & 0 deletions Swift/DatabaseEndpoint.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//
// DatabaseEndpoint.swift
// CouchbaseLite
//
// Copyright (c) 2018 Couchbase, Inc. All rights reserved.
//
// Licensed under the Couchbase License Agreement (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// https://info.couchbase.com/rs/302-GJY-034/images/2017-10-30_License_Agreement.pdf
//
// 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.
//


import Foundation

#if COUCHBASE_ENTERPRISE
/// Database based replication target endpoint. Available in the Enterprise Edition only.
public struct DatabaseEndpoint: IEndpoint {

/// The database object.
public let database: Database

/// Initializes the DatabaseEndpoint with the database object.
///
/// - Parameter database: The database object.
public init(database: Database) {
self.database = database
}

// MARK: Internal

func toImpl() -> CBLEndpoint {
return CBLDatabaseEndpoint(database: self.database._impl)
}
}
#endif
22 changes: 0 additions & 22 deletions Swift/Endpoint.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,6 @@ public protocol Endpoint {
func toImpl() -> CBLEndpoint;
}

#if COUCHBASE_ENTERPRISE
/// Database based replication target endpoint. Available in the Enterprise Edition only.
public struct DatabaseEndpoint: IEndpoint {

/// The database object.
public let database: Database

/// Initializes the DatabaseEndpoint with the database object.
///
/// - Parameter database: The database object.
public init(database: Database) {
self.database = database
}

// MARK: Internal

func toImpl() -> CBLEndpoint {
return CBLDatabaseEndpoint(database: self.database._impl)
}
}
#endif

/// URL based replication target endpoint.
public struct URLEndpoint: IEndpoint {

Expand Down

0 comments on commit 6b7a1ea

Please sign in to comment.