Project properties were excluded from api package

Signed-off-by: Winston Prakash <winston.prakash@gmail.com>

29 files changed, 104 insertions, 89 deletions

diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index 940294d..073bb45 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -39,7 +39,7 @@ import hudson.model.Queue.WaitingItem;
 import hudson.model.RunMap.Constructor;
 import hudson.util.CascadingUtil;
 import hudson.util.DescribableListUtil;
-import org.eclipse.hudson.api.model.project.property.IntegerProjectProperty;
+import org.eclipse.hudson.model.project.property.IntegerProjectProperty;
 import hudson.model.queue.CauseOfBlockage;
 import hudson.model.queue.SubTask;
 import hudson.model.queue.SubTaskContributor;
@@ -93,7 +93,7 @@ import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.eclipse.hudson.api.model.IAbstractProject;
-import org.eclipse.hudson.api.model.project.property.TriggerProjectProperty;
+import org.eclipse.hudson.model.project.property.TriggerProjectProperty;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.stapler.ForwardToView;
diff --git a/hudson-core/src/main/java/hudson/model/Items.java b/hudson-core/src/main/java/hudson/model/Items.java
index 081aabe..9c6eb53 100644
--- a/hudson-core/src/main/java/hudson/model/Items.java
+++ b/hudson-core/src/main/java/hudson/model/Items.java
@@ -19,17 +19,17 @@ package hudson.model;
 import com.thoughtworks.xstream.XStream;
 import hudson.DescriptorExtensionList;
 import hudson.Extension;
-import org.eclipse.hudson.api.model.project.property.AxisListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
-import org.eclipse.hudson.api.model.project.property.CopyOnWriteListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.DescribableListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
-import org.eclipse.hudson.api.model.project.property.IntegerProjectProperty;
-import org.eclipse.hudson.api.model.project.property.LogRotatorProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ResultProjectProperty;
-import org.eclipse.hudson.api.model.project.property.SCMProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
+import org.eclipse.hudson.model.project.property.AxisListProjectProperty;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.BooleanProjectProperty;
+import org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty;
+import org.eclipse.hudson.model.project.property.DescribableListProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.model.project.property.IntegerProjectProperty;
+import org.eclipse.hudson.model.project.property.LogRotatorProjectProperty;
+import org.eclipse.hudson.model.project.property.ResultProjectProperty;
+import org.eclipse.hudson.model.project.property.SCMProjectProperty;
+import org.eclipse.hudson.model.project.property.StringProjectProperty;
 import hudson.matrix.MatrixProject;
 import hudson.matrix.MatrixConfiguration;
 import hudson.XmlFile;
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.StringTokenizer;
-import org.eclipse.hudson.api.model.project.property.TriggerProjectProperty;
+import org.eclipse.hudson.model.project.property.TriggerProjectProperty;
 
 /**
  * Convenience methods related to {@link Item}.
diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index e560700..a24f788 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -88,8 +88,8 @@ import net.sf.json.JSONObject;
 
 import org.eclipse.hudson.api.model.IJob;
 import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
diff --git a/hudson-core/src/main/java/hudson/util/CascadingUtil.java b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
index a2165f7..53617c2 100644
--- a/hudson-core/src/main/java/hudson/util/CascadingUtil.java
+++ b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
@@ -38,18 +38,18 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hudson.api.model.IJob;
 import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.AxisListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
-import org.eclipse.hudson.api.model.project.property.CopyOnWriteListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.DescribableListProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
-import org.eclipse.hudson.api.model.project.property.IntegerProjectProperty;
-import org.eclipse.hudson.api.model.project.property.LogRotatorProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ResultProjectProperty;
-import org.eclipse.hudson.api.model.project.property.SCMProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
-import org.eclipse.hudson.api.model.project.property.TriggerProjectProperty;
+import org.eclipse.hudson.model.project.property.AxisListProjectProperty;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.BooleanProjectProperty;
+import org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty;
+import org.eclipse.hudson.model.project.property.DescribableListProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.model.project.property.IntegerProjectProperty;
+import org.eclipse.hudson.model.project.property.LogRotatorProjectProperty;
+import org.eclipse.hudson.model.project.property.ResultProjectProperty;
+import org.eclipse.hudson.model.project.property.SCMProjectProperty;
+import org.eclipse.hudson.model.project.property.StringProjectProperty;
+import org.eclipse.hudson.model.project.property.TriggerProjectProperty;
 import org.kohsuke.stapler.StaplerRequest;
 
 /**
@@ -79,7 +79,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.StringProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.StringProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static StringProjectProperty getStringProjectProperty(Job currentJob, String key) {
@@ -92,7 +92,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.BaseProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.BaseProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static BaseProjectProperty getBaseProjectProperty(Job currentJob, String key) {
@@ -105,7 +105,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.ExternalProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.ExternalProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static ExternalProjectProperty getExternalProjectProperty(Job currentJob, String key) {
@@ -118,7 +118,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.CopyOnWriteListProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static CopyOnWriteListProjectProperty getCopyOnWriteListProjectProperty(Job currentJob, String key) {
@@ -131,7 +131,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.ResultProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.ResultProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static ResultProjectProperty getResultProjectProperty(Job currentJob, String key) {
@@ -144,7 +144,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.BooleanProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.BooleanProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static BooleanProjectProperty getBooleanProjectProperty(Job currentJob, String key) {
@@ -157,7 +157,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.IntegerProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.IntegerProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static IntegerProjectProperty getIntegerProjectProperty(Job currentJob, String key) {
@@ -170,7 +170,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.LogRotatorProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.LogRotatorProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static LogRotatorProjectProperty getLogRotatorProjectProperty(Job currentJob, String key) {
@@ -183,7 +183,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.DescribableListProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.DescribableListProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static DescribableListProjectProperty getDescribableListProjectProperty(Job currentJob, String key) {
@@ -196,7 +196,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.AxisListProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.AxisListProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static AxisListProjectProperty getAxesListProjectProperty(Job currentJob, String key) {
@@ -209,7 +209,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.SCMProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.SCMProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static SCMProjectProperty getScmProjectProperty(Job currentJob, String key) {
@@ -222,7 +222,7 @@ public class CascadingUtil {
      *
      * @param currentJob job that should be analyzed.
      * @param key key.
-     * @return {@link org.eclipse.hudson.api.model.project.property.TriggerProjectProperty} instance.
+     * @return {@link org.eclipse.hudson.model.project.property.TriggerProjectProperty} instance.
      * @throws IllegalArgumentException if currentJob is null.
      */
     public static TriggerProjectProperty getTriggerProjectProperty(Job currentJob, String key) {
@@ -406,7 +406,7 @@ public class CascadingUtil {
     }
 
     /**
-     * Creates {@link ExternalProjectProperty} based on Descriptors collection, StaplerRequest and JSON resonse.
+     * Creates {@link org.eclipse.hudson.model.project.property.ExternalProjectProperty} based on Descriptors collection, StaplerRequest and JSON resonse.
      *
      * @param req StaplerRequest
      * @param json JSONObject
diff --git a/hudson-core/src/main/java/hudson/util/DescribableListUtil.java b/hudson-core/src/main/java/hudson/util/DescribableListUtil.java
index 7174cd7..3171d46 100644
--- a/hudson-core/src/main/java/hudson/util/DescribableListUtil.java
+++ b/hudson-core/src/main/java/hudson/util/DescribableListUtil.java
@@ -30,8 +30,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.sf.json.JSONObject;
 import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BaseProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
 import org.kohsuke.stapler.StaplerRequest;
 
 /**
@@ -107,7 +106,7 @@ public final class DescribableListUtil {
 
     /**
      * Converts describableList data to project properties map. {@link hudson.model.Descriptor#getJsonSafeClassName()}
-     * is used as key, value - {@link BaseProjectProperty}.
+     * is used as key, value - {@link org.eclipse.hudson.model.project.property.BaseProjectProperty}.
      *
      * @param describableList source.
      * @param owner new owner for properties.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java
index 4e92283..5134bc0 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/AxisListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.matrix.AxisList;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BaseProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java
index f983b83..36ac845 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BaseProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.util.DeepEquals;
 import org.apache.commons.lang3.ObjectUtils;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java
index 786de4a..129a832 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/BooleanProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import org.eclipse.hudson.api.model.IJob;
 
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/CopyOnWriteListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java
index 78a894a..bd3c591 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/CopyOnWriteListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.util.CopyOnWriteList;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/DescribableListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java
index 02884c1..29c9dcd 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/DescribableListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.util.DescribableList;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/ExternalProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java
index 76e3e84..45915cd 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/ExternalProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import org.eclipse.hudson.api.model.IJob;
 
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java
index be099b2..affc003 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/IntegerProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import org.eclipse.hudson.api.model.IJob;
 
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/LogRotatorProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java
index 3d3262d..6eaef07 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/LogRotatorProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.tasks.LogRotator;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/ResultProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java
index 92a4ffc..9e4c92b 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/ResultProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 import hudson.model.Result;
 import org.eclipse.hudson.api.model.IJob;
 
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/SCMProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java
index 52ce352..607b38e 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/SCMProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java
@@ -12,7 +12,7 @@
  *    Anton Kozak
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 import hudson.scm.NullSCM;
 import hudson.scm.SCM;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java
index d4b499d..047cca1 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/StringProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/TriggerProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java
index 9b3a006..cde7dfd 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/project/property/TriggerProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java
@@ -13,7 +13,7 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.triggers.Trigger;
 import org.eclipse.hudson.api.model.IJob;
diff --git a/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly b/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly
index bd79463..7abac54 100644
--- a/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly
+++ b/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly
@@ -24,7 +24,7 @@
     <j:arg value="${it}" type="hudson.model.Item" />
   </j:invokeStatic>
     <t:cascadingDescriptorList title="${%Build Triggers}" descriptors="${triggers}"
-                               propertyClass="${org.eclipse.hudson.api.model.project.property.TriggerProjectProperty.class}">
+                               propertyClass="${org.eclipse.hudson.model.project.property.TriggerProjectProperty.class}">
     <d:invokeBody />
     <!-- pseudo-trigger to configure URL to trigger builds remotely. -->
     <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />
diff --git a/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java b/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java
index 9dbc483..6b981a0 100644
--- a/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java
+++ b/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java
@@ -18,8 +18,8 @@ import hudson.model.Result;
 import hudson.security.Permission;
 import java.io.IOException;
 import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.ResultProjectProperty;
-import org.eclipse.hudson.api.model.project.property.StringProjectProperty;
+import org.eclipse.hudson.model.project.property.ResultProjectProperty;
+import org.eclipse.hudson.model.project.property.StringProjectProperty;
 import org.junit.Test;
 
 import static hudson.model.AbstractProject.PROPERTY_NAME_SEPARATOR;
diff --git a/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java b/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
index 93a0b38..4c15a79 100644
--- a/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
+++ b/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
@@ -27,9 +27,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
-import org.eclipse.hudson.api.model.IProjectProperty;
-import org.eclipse.hudson.api.model.project.property.BooleanProjectProperty;
-import org.eclipse.hudson.api.model.project.property.CopyOnWriteListProjectProperty;
+import org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java b/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java
index 66091af..dc03b8a 100644
--- a/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java
+++ b/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java
@@ -22,7 +22,7 @@ import hudson.tasks.Mailer;
 import hudson.tasks.Publisher;
 import java.io.IOException;
 import java.util.Map;
-import org.eclipse.hudson.api.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/AxisListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/AxisListProjectPropertyTest.java
index dd14dcc..c34256d 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/AxisListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/AxisListProjectPropertyTest.java
@@ -13,10 +13,12 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.matrix.AxisList;
 import hudson.model.FreeStyleProjectMock;
+import org.eclipse.hudson.model.project.property.AxisListProjectProperty;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -58,7 +60,7 @@ public class AxisListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#getDefaultValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getDefaultValue()} method.
      */
     @Test
     public void testAxisListProjectPropertyGetDefaultValue() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/BaseProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/BaseProjectPropertyTest.java
index 8a61150..5e22f81 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/BaseProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/BaseProjectPropertyTest.java
@@ -13,12 +13,13 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.matrix.Axis;
 import hudson.matrix.AxisList;
 import hudson.model.FreeStyleProjectMock;
 import hudson.tasks.JavadocArchiver;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -358,7 +359,7 @@ public class BaseProjectPropertyTest {
     }
 
     /**
-     * Verify {@link BaseProjectProperty#onCascadingProjectRemoved()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
      */
     @Test
     public void testOnCascadingProjectRemoved() {
@@ -369,7 +370,7 @@ public class BaseProjectPropertyTest {
     }
 
     /**
-     * Verify {@link BaseProjectProperty#onCascadingProjectRemoved()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
      */
     @Test
     public void testOnCascadingProjectSet() {
@@ -389,7 +390,7 @@ public class BaseProjectPropertyTest {
     }
 
     /**
-     * Verify {@link BaseProjectProperty#onCascadingProjectChanged()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.BaseProjectProperty#onCascadingProjectChanged()} method.
      */
     @Test
     public void testOnCascadingProjectChanged() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/CopyOnWriteListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectPropertyTest.java
index ca6cdb0..ec326f2 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/CopyOnWriteListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectPropertyTest.java
@@ -13,11 +13,13 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.model.FreeStyleProjectMock;
 import hudson.util.CopyOnWriteList;
 import java.util.Arrays;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -61,7 +63,7 @@ public class CopyOnWriteListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#getDefaultValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getDefaultValue()} method.
      */
     @Test
     public void testGetDefaultValue() {
@@ -73,7 +75,7 @@ public class CopyOnWriteListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#getOriginalValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
      */
     @Test
     public void testGetOriginalValue() {
@@ -85,7 +87,7 @@ public class CopyOnWriteListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#returnOriginalValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
      */
     @Test
     public void testReturnOriginalValue() {
@@ -104,7 +106,7 @@ public class CopyOnWriteListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#clearOriginalValue(hudson.util.CopyOnWriteList)} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#clearOriginalValue(hudson.util.CopyOnWriteList)} method.
      */
     @Test
     public void testClearOriginalValue() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/DescribableListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/DescribableListProjectPropertyTest.java
index 447b887..1ca0415 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/DescribableListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/DescribableListProjectPropertyTest.java
@@ -13,12 +13,14 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.model.FreeStyleProjectMock;
 import hudson.tasks.Shell;
 import hudson.util.DescribableList;
 import java.util.Arrays;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.DescribableListProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -66,7 +68,7 @@ public class DescribableListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link DescribableListProjectProperty#getDefaultValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.DescribableListProjectProperty#getDefaultValue()} method.
      */
     @Test
     public void testGetDefaultValue() {
@@ -78,7 +80,7 @@ public class DescribableListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#getOriginalValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
      */
     @Test
     public void testGetOriginalValue() {
@@ -90,7 +92,7 @@ public class DescribableListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#returnOriginalValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
      */
     @Test
     public void testReturnOriginalValue() {
@@ -109,7 +111,7 @@ public class DescribableListProjectPropertyTest {
     }
 
     /**
-     * Verify {@link CopyOnWriteListProjectProperty#allowOverrideValue(Object, Object)} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#allowOverrideValue(Object, Object)} method.
      */
     @Test
     public void testAllowOverrideValue() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/ExternalProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ExternalProjectPropertyTest.java
index 83dd24e..c6da1ba 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/ExternalProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ExternalProjectPropertyTest.java
@@ -13,9 +13,11 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.model.FreeStyleProjectMock;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -56,7 +58,7 @@ public class ExternalProjectPropertyTest {
     }
 
     /**
-     * Verify {@link ExternalProjectProperty#updateOriginalValue(Object, Object)} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.ExternalProjectProperty#updateOriginalValue(Object, Object)} method.
      */
     @Test
     public void testUpdateOriginalValue() {
@@ -73,7 +75,7 @@ public class ExternalProjectPropertyTest {
     }
 
     /**
-     * Verify {@link ExternalProjectProperty#onCascadingProjectSet()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.ExternalProjectProperty#onCascadingProjectSet()} method.
      */
     @Test
     public void testOnCascadingProjectSet() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/ProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ProjectPropertyTest.java
index 6ee0bb5..a34d318 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/ProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ProjectPropertyTest.java
@@ -13,10 +13,15 @@
  *
  *******************************************************************************/
 
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.model.FreeStyleProjectMock;
 import hudson.tasks.LogRotator;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.BooleanProjectProperty;
+import org.eclipse.hudson.model.project.property.IntegerProjectProperty;
+import org.eclipse.hudson.model.project.property.LogRotatorProjectProperty;
+import org.eclipse.hudson.model.project.property.StringProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/SCMProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/SCMProjectPropertyTest.java
index 74b44c3..a0246fe 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/SCMProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/SCMProjectPropertyTest.java
@@ -12,7 +12,7 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import hudson.FilePath;
 import hudson.Launcher;
@@ -28,6 +28,8 @@ import hudson.scm.SCM;
 import hudson.scm.SCMRevisionState;
 import java.io.File;
 import java.io.IOException;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.SCMProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -67,7 +69,7 @@ public class SCMProjectPropertyTest {
     }
 
     /**
-     * Verify {@link SCMProjectProperty#getDefaultValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.SCMProjectProperty#getDefaultValue()} method.
      */
     @Test
     public void testGetDefaultValue() {
@@ -75,7 +77,7 @@ public class SCMProjectPropertyTest {
     }
 
     /**
-     * Verify {@link SCMProjectProperty#returnOriginalValue()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.SCMProjectProperty#returnOriginalValue()} method.
      */
     @Test
     public void testReturnOriginalValue() {
diff --git a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/TriggerProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/TriggerProjectPropertyTest.java
index b0f9c6a..4b0b240 100644
--- a/hudson-core/src/test/java/org/eclipse/hudson/api/model/project/property/TriggerProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/TriggerProjectPropertyTest.java
@@ -12,12 +12,14 @@
  *    Nikita Levyankov
  *
  *******************************************************************************/
-package org.eclipse.hudson.api.model.project.property;
+package org.eclipse.hudson.model.project.property;
 
 import antlr.ANTLRException;
 import hudson.model.FreeStyleProjectMock;
 import hudson.triggers.TimerTrigger;
 import hudson.triggers.Trigger;
+import org.eclipse.hudson.model.project.property.BaseProjectProperty;
+import org.eclipse.hudson.model.project.property.TriggerProjectProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -53,7 +55,7 @@ public class TriggerProjectPropertyTest {
     }
 
     /**
-     * Verify {@link TriggerProjectProperty#clearOriginalValue(hudson.triggers.Trigger)} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.TriggerProjectProperty#clearOriginalValue(hudson.triggers.Trigger)} method.
      *
      * @throws antlr.ANTLRException if any
      */
@@ -92,7 +94,7 @@ public class TriggerProjectPropertyTest {
     }
 
     /**
-     * Verify {@link TriggerProjectProperty#onCascadingProjectRemoved()} method.
+     * Verify {@link org.eclipse.hudson.model.project.property.TriggerProjectProperty#onCascadingProjectRemoved()} method.
      *
      * @throws antlr.ANTLRException if any
      */