Reprecate AM;CM;QM;RM POJOs in v4 client

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
eclipse · Nov 3, 2020 · 36e503c · 36e503c
1 parent 411bae9
commit 36e503c
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 113 deletions.
diff --git a/...j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureConstants.java b/...j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureConstants.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,13 +9,11 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Michael Fiedler        - initial implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
-
+@Deprecated
 public interface ArchitectureConstants
 {
     public static final String ARCHITECTURE_DOMAIN        = "http://open-services.net/ns/am#";

diff --git a/...4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureLinkType.java b/...4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureLinkType.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2014 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Michael Fiedler       - initial implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -34,6 +32,7 @@
 import org.eclipse.lyo.oslc4j.core.model.Occurs;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 
+@Deprecated
 @OslcResourceShape(title = "Architecture Management LinkType Resource Shape", describes = ArchitectureConstants.TYPE_ARCHITECTURE_LINK_TYPE)
 @OslcNamespace(ArchitectureConstants.ARCHITECTURE_NAMESPACE)
 @OslcName(ArchitectureConstants.ARCHITECTURE_LINK_TYPE)

diff --git a/...4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureResource.java b/...4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ArchitectureResource.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2014 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Michael Fiedler       - initial implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -36,6 +34,7 @@
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
 
+@Deprecated
 @OslcResourceShape(title = "Architecture Management Resource Resource Shape", describes = ArchitectureConstants.TYPE_ARCHITECTURE_RESOURCE)
 @OslcNamespace(ArchitectureConstants.ARCHITECTURE_NAMESPACE)
 @OslcName(ArchitectureConstants.ARCHITECTURE_RESOURCE)

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ChangeRequest.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/ChangeRequest.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,13 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Russell Boykin       - initial API and implementation
- *     Alberto Giammaria    - initial API and implementation
- *     Chris Peters         - initial API and implementation
- *     Gianluca Bernardini  - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -43,6 +38,7 @@
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
 
+@Deprecated
 @OslcNamespace(CmConstants.CHANGE_MANAGEMENT_NAMESPACE)
 @OslcResourceShape(title = "Change Request Resource Shape", describes = CmConstants.TYPE_CHANGE_REQUEST)
 public final class ChangeRequest

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/CmConstants.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/CmConstants.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,17 +9,13 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Russell Boykin       - initial API and implementation
- *     Alberto Giammaria    - initial API and implementation
- *     Chris Peters         - initial API and implementation
- *     Gianluca Bernardini  - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 
+@Deprecated
 public interface CmConstants
 {
     public static String CHANGE_MANAGEMENT_DOMAIN                    = "http://open-services.net/ns/cm#";

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/QmConstants.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/QmConstants.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,14 +9,13 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Paul McMahan         - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 
+@Deprecated
 public interface QmConstants
 {
     public static String CHANGE_MANAGEMENT_DOMAIN                    = "http://open-services.net/ns/cm#";

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/QmResource.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/QmResource.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Paul McMahan         - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -37,6 +35,7 @@
 /**
  * @see http://open-services.net/bin/view/Main/QmSpecificationV2
  */
+@Deprecated
 public abstract class QmResource
        extends AbstractResource
 {

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/Requirement.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/Requirement.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2015 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,12 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *	 Gabriel Ruelas	   - initial API and implementation
- *	 Carlos A Arreola	 - initial API and implementation
- *	 Samuel Padgett	   - avoid unnecessary URISyntaxException
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -40,7 +36,7 @@
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
 
-
+@Deprecated
 @OslcNamespace(RmConstants.REQUIREMENTS_MANAGEMENT_NAMESPACE)
 @OslcResourceShape(title = "Requirement Resource Shape", describes = RmConstants.TYPE_REQUIREMENT)
 public class Requirement

diff --git a/...j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/RequirementCollection.java b/...j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/RequirementCollection.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2015 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,12 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Gabriel Ruelas       - initial API and implementation
- *     Carlos A Arreola     - initial API and implementation
- *     Samuel Padgett       - avoid unnecessary URISyntaxException
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -31,6 +27,7 @@
 import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle;
 
 
+@Deprecated
 @OslcNamespace(RmConstants.REQUIREMENTS_MANAGEMENT_NAMESPACE)
 @OslcResourceShape(title = "Requirement Collection Resource Shape", describes = RmConstants.TYPE_REQUIREMENT_COLLECTION)
 public final class RequirementCollection

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/RmConstants.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/RmConstants.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,11 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Gabriel Ruelas       - initial API and implementation
- *     Carlos A Arreola     - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import javax.xml.namespace.QName;
@@ -22,6 +19,7 @@
 
 import org.apache.jena.datatypes.BaseDatatype;
 
+@Deprecated
 public interface RmConstants
 {
     public static String REQUIREMENTS_MANAGEMENT_DOMAIN                    = "http://open-services.net/ns/rm#";

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestCase.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestCase.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Paul McMahan         - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -34,11 +32,12 @@
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
 
-@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_CASE)
-@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 /**
  * @see http://open-services.net/bin/view/Main/QmSpecificationV2#Resource_TestCase
  */
+@Deprecated
+@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_CASE)
+@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 public final class TestCase
        extends QmResource
 {

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestExecutionRecord.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestExecutionRecord.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Paul McMahan         - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -32,11 +30,12 @@
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 
-@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_EXECUTION_RECORD)
-@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 /**
  * @see http://open-services.net/bin/view/Main/QmSpecificationV2#Resource_TestExecutionRecord
  */
+@Deprecated
+@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_EXECUTION_RECORD)
+@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 public final class TestExecutionRecord
        extends QmResource
 {

diff --git a/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestPlan.java b/oslc4j-client/src/main/java/org/eclipse/lyo/oslc4j/client/resources/TestPlan.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+/*
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,8 @@
  * and the Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
- * Contributors:
- *
- *     Paul McMahan         - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
 package org.eclipse.lyo.oslc4j.client.resources;
 
 import java.net.URI;
@@ -34,11 +32,12 @@
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
 
-@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_PLAN)
-@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 /**
  * @see http://open-services.net/bin/view/Main/QmSpecificationV2#Resource_TestPlan
  */
+@Deprecated
+@OslcResourceShape(title = "Quality Management Resource Shape", describes = QmConstants.TYPE_TEST_PLAN)
+@OslcNamespace(QmConstants.QUALITY_MANAGEMENT_NAMESPACE)
 public final class TestPlan
        extends QmResource
 {