Merge pull request #40 from arsysop/develop

to 0.3.3

.gitignore

@@ -1,19 +1,11 @@
 ###############################################################################
-# Copyright (c) 2018 ArSysOp
+# Copyright (c) 2018-2019 ArSysOp and others
 #
-# 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
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
 #
-#     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.
-#
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     ArSysOp - initial API and implementation

.mvn/extensions.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018 ArSysOp
+	Copyright (c) 2018-2019 ArSysOp and others
 
-	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
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	http://www.eclipse.org/legal/epl-2.0.
 
-		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.
-
-	SPDX-License-Identifier: Apache-2.0
+	SPDX-License-Identifier: EPL-2.0
 
 	Contributors:
 		ArSysOp - initial API and implementation

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.root</name>
+	<name>org.eclipse.passage.lic.root</name>
 	<comment></comment>
 	<projects>
 	</projects>

NOTICE

@@ -1,13 +1,11 @@
-# Notices for Passage Binary Resources and Components
+# Notices for Passage Licensing Integration Components
+This content is produced and maintained by the Eclipse Passage project.
 
-This content is produced and maintained by the ArSysOp Passage team.
-
- * Project home: http://arsysop.ru
+* Project home: https://projects.eclipse.org/projects/technology.passage
 
 ## Trademarks
 
-ArSysOp, and the ArSysOp Logo are
-registered trademarks of the ArSysOp.
+Eclipse Passage is a trademark of the Eclipse Foundation.
 
 ## Copyright
 
@@ -18,19 +16,16 @@ listed source code repository logs.
 ## Declared Project Licenses
 
 This program and the accompanying materials are made available under the terms
-of the Apache Software License 2.0 which is available at 
-https://www.apache.org/licenses/LICENSE-2.0.
+of the Eclipse Public License - v 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: EPL-2.0
 
 ## Source Code
 
 The project maintains the following source code repositories:
 
- * https://github.com/arsysop/passage-brc (Binary Resources and Components)
- * https://github.com/arsysop/passage-lic (Licensing Integration Components)
- * https://github.com/arsysop/passage-loc (Licensing Operator Components)
- * https://github.com/arsysop/passage-lbc (Licensing Backend Components)
+ * https://git.eclipse.org/c/passage 
 
 ## Third-party Content
 

README.md

@@ -1,6 +1,6 @@
 ## Passage Licensing Integration Components (LIC) 
 
-The Passage LIC is a part of the [Passage Licensing](https://projects.eclipse.org/proposals/eclipse-passage) solution.
+The Passage LIC is a part of the [Eclipse Passage](https://projects.eclipse.org/projects/technology.passage) solution.
 This component verifies that the software has sufficient license grants in accordance with the specified licensing requirements.
 The Equinox-based implementation includes various validators for the time-limited, node-locked and other types of licenses.
 
@@ -17,16 +17,12 @@ The Passage LIC works inside your product installed on the user side. Its basic
 4. Use the system configuration and the evaluated license state to make a decision.
 5. If there are uncovered licensing requirements, call the required constraint functions to impose restrictions: limit certain functionality or disable everything.
 
-### Related repositories
-
-To find out more about the Passage Licensing solution, check out the following repositories:
-- [Passage Binary Resources and Components](https://github.com/arsysop/passage-brc)
-- [Passage Licensing Operator](https://github.com/arsysop/passage-loc)
-- [Passage Licensing Backend](https://github.com/arsysop/passage-lbc)
-
 ### License
 
-Copyright 2018 ArSysOp
+Copyright (c) 2018-2019 ArSysOp and others
 
-Licensed under the [Apache License, Version 2.0](https://projects.eclipse.org/content/apache-license-version-2.0) license, see the [LICENSE](https://github.com/arsysop/passage-lic/blob/develop/LICENSE) file for details.
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License 2.0 which is available at
+[http://www.eclipse.org/legal/epl-2.0](http://www.eclipse.org/legal/epl-2.0).
 
+SPDX-License-Identifier: EPL-2.0

bundles/org.eclipse.passage.lic.base/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

bundles/ru.arsysop.passage.lic.runtime/.project → bundles/org.eclipse.passage.lic.base/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ru.arsysop.passage.lic.runtime</name>
+	<name>org.eclipse.passage.lic.base</name>
 	<comment></comment>
 	<projects>
 	</projects>

bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF

@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.runtime.base
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.base
+Bundle-Version: 0.3.3.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.passage.lic.runtime;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.base

bundles/org.eclipse.passage.lic.base/OSGI-INF/l10n/bundle.properties

@@ -0,0 +1,23 @@
+#Properties file for org.eclipse.passage.lic.base
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC Base
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018-2019 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\

bundles/org.eclipse.passage.lic.base/build.properties

@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2018-2019 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/

bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseAccessManager.java → bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseAccessManager.java

@@ -1,26 +1,18 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * 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
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     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.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_CONDITION_TYPE;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_CONDITION_TYPE;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,18 +22,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import ru.arsysop.passage.lic.base.LicensingEvents.LicensingLifeCycle;
-import ru.arsysop.passage.lic.runtime.AccessManager;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-import ru.arsysop.passage.lic.runtime.ConditionMiner;
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.ConfigurationResolver;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.PermissionExaminer;
-import ru.arsysop.passage.lic.runtime.RestrictionExecutor;
-import ru.arsysop.passage.lic.runtime.RestrictionVerdict;
+import org.eclipse.passage.lic.base.LicensingEvents.LicensingLifeCycle;
+import org.eclipse.passage.lic.runtime.AccessManager;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
+import org.eclipse.passage.lic.runtime.ConditionMiner;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.ConfigurationResolver;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.PermissionExaminer;
+import org.eclipse.passage.lic.runtime.RestrictionExecutor;
+import org.eclipse.passage.lic.runtime.RestrictionVerdict;
 
 public abstract class BaseAccessManager implements AccessManager {
 

bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConditionEvaluator.java → bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConditionEvaluator.java

@@ -1,34 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * 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
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     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.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
-import ru.arsysop.passage.lic.runtime.ConditionEvaluator;
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.ConditionEvaluator;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public abstract class BaseConditionEvaluator implements ConditionEvaluator {
 

bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseConfigurationRequirement.java → bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseConfigurationRequirement.java

@@ -1,32 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * 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
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     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.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_NAME;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
-import static ru.arsysop.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_IDENTIFIER;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_NAME;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_FEATURE_VERSION;
+import static org.eclipse.passage.lic.base.LicensingProperties.LICENSING_RESTRICTION_LEVEL;
 
-import ru.arsysop.passage.lic.runtime.ConfigurationRequirement;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.ConfigurationRequirement;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class BaseConfigurationRequirement implements ConfigurationRequirement {
 

bundles/ru.arsysop.passage.lic.base/src/ru/arsysop/passage/lic/base/BaseFeaturePermission.java → bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BaseFeaturePermission.java

@@ -1,32 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 ArSysOp
+ * Copyright (c) 2018-2019 ArSysOp
  *
- * 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
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
  *
- *     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.
- *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package ru.arsysop.passage.lic.base;
+package org.eclipse.passage.lic.base;
 
-import static ru.arsysop.passage.lic.base.LicensingProperties.*;
+import static org.eclipse.passage.lic.base.LicensingProperties.*;
 
 import java.util.Date;
 
-import ru.arsysop.passage.lic.runtime.FeaturePermission;
-import ru.arsysop.passage.lic.runtime.LicensingCondition;
-import ru.arsysop.passage.lic.runtime.LicensingConfiguration;
+import org.eclipse.passage.lic.runtime.FeaturePermission;
+import org.eclipse.passage.lic.runtime.LicensingCondition;
+import org.eclipse.passage.lic.runtime.LicensingConfiguration;
 
 public class BaseFeaturePermission implements FeaturePermission {