Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-05-24 13:05:32 -0400
committerWinston Prakash2012-05-24 13:05:32 -0400
commit68c99ace7c8dad89b121ed3e5a0fac062c7bbbc2 (patch)
treebfe2d5f69a61b20e215475a7a2d5c28a5e8d25a9
parentbc9352063998071545b1a6f347985772c15d4689 (diff)
downloadorg.eclipse.hudson.core-68c99ace7c8dad89b121ed3e5a0fac062c7bbbc2.tar.gz
org.eclipse.hudson.core-68c99ace7c8dad89b121ed3e5a0fac062c7bbbc2.tar.xz
org.eclipse.hudson.core-68c99ace7c8dad89b121ed3e5a0fac062c7bbbc2.zip
Netbeans some how did not rename the "package" namespace though it renamed the folder. Had to manually do everything else.
-rw-r--r--hudson-core/src/main/java/hudson/DependencyRunner.java2
-rw-r--r--hudson-core/src/main/java/hudson/Functions.java1
-rw-r--r--hudson-core/src/main/java/hudson/cli/CLICommand.java2
-rw-r--r--hudson-core/src/main/java/hudson/cli/ClientAuthenticationCache.java2
-rw-r--r--hudson-core/src/main/java/hudson/cli/LoginCommand.java2
-rw-r--r--hudson-core/src/main/java/hudson/cli/declarative/CLIRegisterer.java2
-rw-r--r--hudson-core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java9
-rw-r--r--hudson-core/src/main/java/hudson/model/AbstractItem.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/AbstractProject.java24
-rw-r--r--hudson-core/src/main/java/hudson/model/AsyncPeriodicWork.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/BaseBuildableProject.java8
-rw-r--r--hudson-core/src/main/java/hudson/model/BuildAuthorizationToken.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Cause.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Computer.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Executor.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/FreeStyleProject.java4
-rw-r--r--hudson-core/src/main/java/hudson/model/Hudson.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Items.java24
-rw-r--r--hudson-core/src/main/java/hudson/model/Job.java25
-rw-r--r--hudson-core/src/main/java/hudson/model/LoadStatistics.java6
-rw-r--r--hudson-core/src/main/java/hudson/model/MyView.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Node.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java6
-rw-r--r--hudson-core/src/main/java/hudson/model/Project.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/UpdateCenter.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/UpdateSite.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/User.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/View.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/ACL.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/AuthorizationMatrixProperty.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/ContainerAuthentication.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/FederatedLoginService.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/HudsonFilter.java2
-rw-r--r--hudson-core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/PAMSecurityRealm.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/SecurityRealm.java1
-rw-r--r--hudson-core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java2
-rw-r--r--hudson-core/src/main/java/hudson/slaves/Cloud.java7
-rw-r--r--hudson-core/src/main/java/hudson/slaves/NodeProvisioner.java4
-rw-r--r--hudson-core/src/main/java/hudson/slaves/SlaveComputer.java2
-rw-r--r--hudson-core/src/main/java/hudson/tasks/junit/History.java9
-rw-r--r--hudson-core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java13
-rw-r--r--hudson-core/src/main/java/hudson/triggers/SafeTimerTask.java3
-rw-r--r--hudson-core/src/main/java/hudson/util/CascadingUtil.java58
-rw-r--r--hudson-core/src/main/java/hudson/util/DescribableListUtil.java6
-rw-r--r--hudson-core/src/main/java/hudson/util/Graph.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/HudsonServletContextListener.java8
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/matrix/IMatrixProject.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IAbstractProject.java3
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IBaseBuildableProject.java32
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/ICascadingJob.java34
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IFreeStyleProject.java3
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java5
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java3
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/ChartLabel.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/ChartUtil.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/DataSet.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/Graph.java3
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSeries.java21
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupport.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupportDescriptor.java2
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/graph/MultiStageTimeSeries.java3
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java6
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityEntitiesHolder.java4
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityManager.java3
-rw-r--r--hudson-core/src/main/resources/hudson/hudson-core.properties2
-rw-r--r--hudson-core/src/main/resources/lib/hudson/cascadingDescriptorList.jelly4
-rw-r--r--hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly2
-rw-r--r--hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java6
-rw-r--r--hudson-core/src/test/java/hudson/model/FreeStyleProjectTest.java2
-rw-r--r--hudson-core/src/test/java/hudson/model/LegacyProjectTest.java2
-rw-r--r--hudson-core/src/test/java/hudson/model/LoadStatisticsTest.java13
-rw-r--r--hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java2
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/AxisListProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/AxisListProjectPropertyTest.java)4
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/BaseProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/BaseProjectPropertyTest.java)10
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/CopyOnWriteListProjectPropertyTest.java)10
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/DescribableListProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/DescribableListProjectPropertyTest.java)10
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ExternalProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/ExternalProjectPropertyTest.java)6
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/ProjectPropertyTest.java)2
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/SCMProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/SCMProjectPropertyTest.java)6
-rw-r--r--hudson-core/src/test/java/org/eclipse/hudson/model/project/property/TriggerProjectPropertyTest.java (renamed from hudson-core/src/test/java/org/hudsonci/model/project/property/TriggerProjectPropertyTest.java)6
-rw-r--r--hudson-test-framework/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java2
99 files changed, 281 insertions, 263 deletions
diff --git a/hudson-core/src/main/java/hudson/DependencyRunner.java b/hudson-core/src/main/java/hudson/DependencyRunner.java
index 28d1671f..4875f91d 100644
--- a/hudson-core/src/main/java/hudson/DependencyRunner.java
+++ b/hudson-core/src/main/java/hudson/DependencyRunner.java
@@ -18,7 +18,7 @@ package hudson;
import hudson.model.AbstractProject;
import hudson.model.Hudson;
-import hudson.security.HudsonSecurityManager;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/hudson-core/src/main/java/hudson/Functions.java b/hudson-core/src/main/java/hudson/Functions.java
index 3846bf8f..6918b7c4 100644
--- a/hudson-core/src/main/java/hudson/Functions.java
+++ b/hudson-core/src/main/java/hudson/Functions.java
@@ -120,6 +120,7 @@ import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import java.util.regex.Pattern;
import org.eclipse.hudson.script.ScriptSupport;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Utility functions used in views.
diff --git a/hudson-core/src/main/java/hudson/cli/CLICommand.java b/hudson-core/src/main/java/hudson/cli/CLICommand.java
index 79c1f5fd..da51e3da 100644
--- a/hudson-core/src/main/java/hudson/cli/CLICommand.java
+++ b/hudson-core/src/main/java/hudson/cli/CLICommand.java
@@ -27,7 +27,6 @@ import hudson.remoting.Callable;
import hudson.remoting.Channel;
import hudson.remoting.ChannelProperty;
import hudson.security.CliAuthenticator;
-import hudson.security.HudsonSecurityEntitiesHolder;
import hudson.security.SecurityRealm;
import org.springframework.security.Authentication;
import org.springframework.security.context.SecurityContext;
@@ -47,6 +46,7 @@ import java.lang.reflect.Type;
import java.util.List;
import java.util.Locale;
import java.util.logging.Logger;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Base class for Hudson CLI.
diff --git a/hudson-core/src/main/java/hudson/cli/ClientAuthenticationCache.java b/hudson-core/src/main/java/hudson/cli/ClientAuthenticationCache.java
index 0ffa49ce..d1fb11e1 100644
--- a/hudson-core/src/main/java/hudson/cli/ClientAuthenticationCache.java
+++ b/hudson-core/src/main/java/hudson/cli/ClientAuthenticationCache.java
@@ -25,7 +25,6 @@ import hudson.model.Hudson.MasterComputer;
import hudson.remoting.Callable;
import hudson.remoting.Channel;
import hudson.remoting.VirtualChannel;
-import hudson.security.HudsonSecurityEntitiesHolder;
import hudson.util.Secret;
import org.springframework.security.Authentication;
import org.springframework.security.AuthenticationException;
@@ -39,6 +38,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Properties;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Represents the authentication credential store of the CLI client.
diff --git a/hudson-core/src/main/java/hudson/cli/LoginCommand.java b/hudson-core/src/main/java/hudson/cli/LoginCommand.java
index 0fad21f7..f64b6c98 100644
--- a/hudson-core/src/main/java/hudson/cli/LoginCommand.java
+++ b/hudson-core/src/main/java/hudson/cli/LoginCommand.java
@@ -17,7 +17,7 @@ package hudson.cli;
import hudson.Extension;
import hudson.model.Hudson;
-import hudson.security.HudsonSecurityManager;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.springframework.security.Authentication;
import org.kohsuke.args4j.CmdLineException;
diff --git a/hudson-core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/hudson-core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
index 75b2e788..bfcae422 100644
--- a/hudson-core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
+++ b/hudson-core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
@@ -24,7 +24,6 @@ import hudson.cli.CloneableCLICommand;
import hudson.model.Hudson;
import hudson.remoting.Channel;
import hudson.security.CliAuthenticator;
-import hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.security.Authentication;
import org.springframework.security.context.SecurityContext;
import org.springframework.security.context.SecurityContextHolder;
@@ -48,6 +47,7 @@ import java.util.Locale;
import java.util.Stack;
import static java.util.logging.Level.SEVERE;
import java.util.logging.Logger;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Discover {@link CLIMethod}s and register them as {@link CLICommand} implementations.
diff --git a/hudson-core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/hudson-core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
index 61080100..7599ee1f 100644
--- a/hudson-core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
+++ b/hudson-core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java
@@ -11,7 +11,6 @@
*
* Kohsuke Kawaguchi, Winston Prakash
*
- *
*******************************************************************************/
package hudson.diagnosis;
@@ -20,9 +19,6 @@ import hudson.util.TimeUnit2;
import hudson.Extension;
import hudson.model.PeriodicWork;
import hudson.util.ColorPalette;
-import hudson.util.graph.MultiStageTimeSeries;
-import hudson.util.graph.MultiStageTimeSeries.TimeScale;
-import hudson.util.graph.MultiStageTimeSeries.TrendChart;
import java.lang.management.MemoryPoolMXBean;
import java.lang.management.MemoryType;
@@ -31,6 +27,9 @@ import java.lang.management.ManagementFactory;
import java.util.List;
import java.util.ArrayList;
import java.io.IOException;
+import org.eclipse.hudson.graph.MultiStageTimeSeries;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TimeScale;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TrendChart;
import org.kohsuke.stapler.QueryParameter;
@@ -107,10 +106,12 @@ public final class MemoryUsageMonitor extends PeriodicWork {
nonHeap = new MemoryGroup(pools, MemoryType.NON_HEAP);
}
+ @Override
public long getRecurrencePeriod() {
return TimeUnit2.SECONDS.toMillis(10);
}
+ @Override
protected void doRun() {
heap.update();
nonHeap.update();
diff --git a/hudson-core/src/main/java/hudson/model/AbstractItem.java b/hudson-core/src/main/java/hudson/model/AbstractItem.java
index d59ecc69..30c25158 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractItem.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractItem.java
@@ -26,7 +26,6 @@ import hudson.model.listeners.SaveableListener;
import hudson.security.AccessControlled;
import hudson.security.Permission;
import hudson.security.ACL;
-import hudson.security.HudsonSecurityEntitiesHolder;
import hudson.util.AtomicFileWriter;
import hudson.util.IOException2;
import org.apache.tools.ant.taskdefs.Copy;
@@ -54,6 +53,7 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Partial default implementation of {@link Item}.
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index f2a306f0..4c19b400 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -41,7 +41,7 @@ import hudson.model.Queue.WaitingItem;
import hudson.model.RunMap.Constructor;
import hudson.util.CascadingUtil;
import hudson.util.DescribableListUtil;
-import org.hudsonci.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;
@@ -94,8 +94,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.math.NumberUtils;
-import org.hudsonci.api.model.IAbstractProject;
-import org.hudsonci.model.project.property.TriggerProjectProperty;
+import org.eclipse.hudson.api.model.IAbstractProject;
+import org.eclipse.hudson.model.project.property.TriggerProjectProperty;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.stapler.ForwardToView;
@@ -143,7 +143,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
* {@link SCM} associated with the project. To allow derived classes to link {@link SCM}
* config to elsewhere, access to this variable should always go through {@link #getScm()}.
*
- * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -161,7 +161,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
/**
* The quiet period. Null to delegate to the system default.
*
- * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*
*/
@@ -170,7 +170,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
/**
* The retry count. Null to delegate to the system default.
*
- * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -217,7 +217,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
* building.
*
* @deprecated as of 2.2.0. Don't use this field directly, logic was moved
- * to {@link org.hudsonci.api.model.IProjectProperty}. Use
+ * to {@link org.eclipse.hudson.api.model.IProjectProperty}. Use
* getter/setter for accessing to this field.
*/
@Deprecated
@@ -227,7 +227,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
* building.
*
* @deprecated as of 2.2.0. Don't use this field directly, logic was moved
- * to {@link org.hudsonci.api.model.IProjectProperty}. Use
+ * to {@link org.eclipse.hudson.api.model.IProjectProperty}. Use
* getter/setter for accessing to this field.
*/
@Deprecated
@@ -240,7 +240,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
* are saved independently.
*
* @see Hudson#getJDK(String)
- * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -256,7 +256,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
*
* @deprecated as of 2.2.0
*
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
protected List<Trigger<?>> triggers = new Vector<Trigger<?>>();
@@ -271,7 +271,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
@CopyOnWrite
protected transient volatile List<Action> transientActions = new Vector<Action>();
/**
- * @deprecated as of 2.2.0 Don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 Don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -279,7 +279,7 @@ public abstract class AbstractProject<P extends AbstractProject<P, R>, R extends
/**
* True to clean the workspace prior to each build.
*
- * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * @deprecated as of 2.2.0 don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
diff --git a/hudson-core/src/main/java/hudson/model/AsyncPeriodicWork.java b/hudson-core/src/main/java/hudson/model/AsyncPeriodicWork.java
index cf9d9cb2..f918eb03 100644
--- a/hudson-core/src/main/java/hudson/model/AsyncPeriodicWork.java
+++ b/hudson-core/src/main/java/hudson/model/AsyncPeriodicWork.java
@@ -15,12 +15,12 @@
package hudson.model;
-import hudson.security.HudsonSecurityManager;
import hudson.util.StreamTaskListener;
import java.io.File;
import java.io.IOException;
import java.util.logging.Level;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* {@link PeriodicWork} that takes a long time to run.
diff --git a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
index 80f0b6cf..5ce3761c 100644
--- a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
+++ b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
import net.sf.json.JSONObject;
-import org.hudsonci.api.model.IBaseBuildableProject;
+import org.eclipse.hudson.api.model.IBaseBuildableProject;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@@ -50,7 +50,7 @@ public abstract class BaseBuildableProject<P extends BaseBuildableProject<P,B>,B
* List of active {@link Builder}s configured for this project.
*
* @deprecated as of 2.2.0
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -61,7 +61,7 @@ public abstract class BaseBuildableProject<P extends BaseBuildableProject<P,B>,B
* List of active {@link Publisher}s configured for this project.
*
* @deprecated as of 2.2.0
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
@@ -72,7 +72,7 @@ public abstract class BaseBuildableProject<P extends BaseBuildableProject<P,B>,B
* List of active {@link BuildWrapper}s configured for this project.
*
* @deprecated as of 2.2.0
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
diff --git a/hudson-core/src/main/java/hudson/model/BuildAuthorizationToken.java b/hudson-core/src/main/java/hudson/model/BuildAuthorizationToken.java
index eb56cb58..735c61c4 100644
--- a/hudson-core/src/main/java/hudson/model/BuildAuthorizationToken.java
+++ b/hudson-core/src/main/java/hudson/model/BuildAuthorizationToken.java
@@ -18,11 +18,11 @@ package hudson.model;
import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
import hudson.Util;
import hudson.security.ACL;
-import hudson.security.HudsonSecurityEntitiesHolder;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import java.io.IOException;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.security.AccessDeniedException;
/**
diff --git a/hudson-core/src/main/java/hudson/model/Cause.java b/hudson-core/src/main/java/hudson/model/Cause.java
index e0144f8a..52ced23e 100644
--- a/hudson-core/src/main/java/hudson/model/Cause.java
+++ b/hudson-core/src/main/java/hudson/model/Cause.java
@@ -25,7 +25,7 @@ import hudson.util.XStream2;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import hudson.security.HudsonSecurityManager;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Cause object base class. This class hierarchy is used to keep track of why
diff --git a/hudson-core/src/main/java/hudson/model/Computer.java b/hudson-core/src/main/java/hudson/model/Computer.java
index c87ebf56..d91a093c 100644
--- a/hudson-core/src/main/java/hudson/model/Computer.java
+++ b/hudson-core/src/main/java/hudson/model/Computer.java
@@ -71,6 +71,8 @@ import java.nio.charset.Charset;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.Inet4Address;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Represents the running state of a remote computer that holds {@link Executor}s.
diff --git a/hudson-core/src/main/java/hudson/model/Executor.java b/hudson-core/src/main/java/hudson/model/Executor.java
index a2787407..5cea7e09 100644
--- a/hudson-core/src/main/java/hudson/model/Executor.java
+++ b/hudson-core/src/main/java/hudson/model/Executor.java
@@ -38,7 +38,7 @@ import java.util.logging.Level;
import java.lang.reflect.Method;
import static hudson.model.queue.Executables.*;
-import hudson.security.HudsonSecurityManager;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
diff --git a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
index e5547ade..d9280a77 100644
--- a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
+++ b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java
@@ -21,7 +21,7 @@ import hudson.Extension;
import hudson.util.CascadingUtil;
import java.io.IOException;
-import org.hudsonci.api.model.IFreeStyleProject;
+import org.eclipse.hudson.api.model.IFreeStyleProject;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@@ -40,7 +40,7 @@ public class FreeStyleProject extends Project<FreeStyleProject,FreeStyleBuild> i
*
* @since 1.216
* @deprecated as of 2.2.0
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
@Deprecated
diff --git a/hudson-core/src/main/java/hudson/model/Hudson.java b/hudson-core/src/main/java/hudson/model/Hudson.java
index 2ce742a4..09febf7f 100644
--- a/hudson-core/src/main/java/hudson/model/Hudson.java
+++ b/hudson-core/src/main/java/hudson/model/Hudson.java
@@ -201,6 +201,8 @@ import java.util.concurrent.TimeoutException;
import java.util.logging.LogRecord;
import java.util.regex.Pattern;
import org.eclipse.hudson.script.ScriptSupport;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hudson-core/src/main/java/hudson/model/Items.java b/hudson-core/src/main/java/hudson/model/Items.java
index e0aeb559..9c6eb530 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.hudsonci.model.project.property.AxisListProjectProperty;
-import org.hudsonci.model.project.property.BaseProjectProperty;
-import org.hudsonci.model.project.property.BooleanProjectProperty;
-import org.hudsonci.model.project.property.CopyOnWriteListProjectProperty;
-import org.hudsonci.model.project.property.DescribableListProjectProperty;
-import org.hudsonci.model.project.property.ExternalProjectProperty;
-import org.hudsonci.model.project.property.IntegerProjectProperty;
-import org.hudsonci.model.project.property.LogRotatorProjectProperty;
-import org.hudsonci.model.project.property.ResultProjectProperty;
-import org.hudsonci.model.project.property.SCMProjectProperty;
-import org.hudsonci.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.hudsonci.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 a3bc0329..a57c1663 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -21,7 +21,6 @@ import hudson.util.CascadingUtil;
import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.commons.collections.ListUtils;
import org.apache.commons.collections.MapUtils;
-import hudson.util.graph.GraphSeries;
import hudson.widgets.Widget;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -45,20 +44,13 @@ import hudson.tasks.LogRotator;
import hudson.util.ColorPalette;
import hudson.util.CopyOnWriteList;
-import hudson.util.graph.DataSet;
-
import hudson.util.IOException2;
import hudson.util.RunList;
import hudson.util.TextFile;
-import hudson.util.graph.ChartLabel;
-import hudson.util.graph.Graph;
-
-
import hudson.widgets.HistoryWidget;
import hudson.widgets.HistoryWidget.Adapter;
-
import java.awt.Color;
import java.io.File;
@@ -81,11 +73,11 @@ import net.sf.json.JSONException;
import net.sf.json.JSONObject;
-import org.hudsonci.api.model.ICascadingJob;
-import org.hudsonci.api.model.IJob;
-import org.hudsonci.api.model.IProjectProperty;
-import org.hudsonci.model.project.property.BaseProjectProperty;
-import org.hudsonci.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.IJob;
+import org.eclipse.hudson.api.model.IProjectProperty;
+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;
@@ -96,6 +88,11 @@ import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.export.Exported;
import static javax.servlet.http.HttpServletResponse.*;
+import org.eclipse.hudson.graph.ChartLabel;
+import org.eclipse.hudson.graph.DataSet;
+import org.eclipse.hudson.graph.Graph;
+import org.eclipse.hudson.graph.GraphSeries;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* A job is an runnable entity under the monitoring of Hudson.
@@ -134,7 +131,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
/**
* @deprecated as of 2.2.0
- * don't use this field directly, logic was moved to {@link org.hudsonci.api.model.IProjectProperty}.
+ * don't use this field directly, logic was moved to {@link org.eclipse.hudson.api.model.IProjectProperty}.
* Use getter/setter for accessing to this field.
*/
private volatile LogRotator logRotator;
diff --git a/hudson-core/src/main/java/hudson/model/LoadStatistics.java b/hudson-core/src/main/java/hudson/model/LoadStatistics.java
index dd685a4f..52bc5782 100644
--- a/hudson-core/src/main/java/hudson/model/LoadStatistics.java
+++ b/hudson-core/src/main/java/hudson/model/LoadStatistics.java
@@ -18,15 +18,15 @@ package hudson.model;
import hudson.Extension;
import hudson.util.ColorPalette;
-import hudson.util.graph.MultiStageTimeSeries;
-import hudson.util.graph.MultiStageTimeSeries.TimeScale;
-import hudson.util.graph.MultiStageTimeSeries.TrendChart;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.export.ExportedBean;
import org.kohsuke.stapler.export.Exported;
import java.io.IOException;
import java.util.List;
+import org.eclipse.hudson.graph.MultiStageTimeSeries;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TimeScale;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TrendChart;
/**
* Utilization statistics for a node or a set of nodes.
diff --git a/hudson-core/src/main/java/hudson/model/MyView.java b/hudson-core/src/main/java/hudson/model/MyView.java
index 5b7df213..efc0d05b 100644
--- a/hudson-core/src/main/java/hudson/model/MyView.java
+++ b/hudson-core/src/main/java/hudson/model/MyView.java
@@ -29,7 +29,7 @@ import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.DataBoundConstructor;
import hudson.model.Descriptor.FormException;
import hudson.Extension;
-import hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* {@link View} that only contains projects for which the current user has access to.
diff --git a/hudson-core/src/main/java/hudson/model/Node.java b/hudson-core/src/main/java/hudson/model/Node.java
index 4d039607..632b503b 100644
--- a/hudson-core/src/main/java/hudson/model/Node.java
+++ b/hudson-core/src/main/java/hudson/model/Node.java
@@ -27,7 +27,6 @@ import hudson.node_monitors.NodeMonitor;
import hudson.remoting.VirtualChannel;
import hudson.security.ACL;
import hudson.security.AccessControlled;
-import hudson.security.HudsonSecurityEntitiesHolder;
import hudson.security.Permission;
import hudson.slaves.ComputerListener;
import hudson.slaves.NodeDescriptor;
@@ -45,6 +44,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.log4j.Logger;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
diff --git a/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java b/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
index 68d77628..55267103 100644
--- a/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
+++ b/hudson-core/src/main/java/hudson/model/OverallLoadStatistics.java
@@ -17,9 +17,9 @@
package hudson.model;
import hudson.util.ColorPalette;
-import hudson.util.graph.MultiStageTimeSeries;
-import hudson.util.graph.MultiStageTimeSeries.TimeScale;
-import hudson.util.graph.MultiStageTimeSeries.TrendChart;
+import org.eclipse.hudson.graph.MultiStageTimeSeries;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TimeScale;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TrendChart;
import org.kohsuke.stapler.export.Exported;
/**
diff --git a/hudson-core/src/main/java/hudson/model/Project.java b/hudson-core/src/main/java/hudson/model/Project.java
index 2c51eab1..328effa3 100644
--- a/hudson-core/src/main/java/hudson/model/Project.java
+++ b/hudson-core/src/main/java/hudson/model/Project.java
@@ -22,7 +22,7 @@ import hudson.tasks.Fingerprinter;
import hudson.tasks.Maven;
import hudson.tasks.Maven.ProjectWithMaven;
import hudson.tasks.Maven.MavenInstallation;
-import org.hudsonci.api.model.IProject;
+import org.eclipse.hudson.api.model.IProject;
import java.util.HashSet;
import java.util.Set;
diff --git a/hudson-core/src/main/java/hudson/model/UpdateCenter.java b/hudson-core/src/main/java/hudson/model/UpdateCenter.java
index e82a5ede..0d3ab481 100644
--- a/hudson-core/src/main/java/hudson/model/UpdateCenter.java
+++ b/hudson-core/src/main/java/hudson/model/UpdateCenter.java
@@ -30,7 +30,6 @@ import hudson.lifecycle.Lifecycle;
import hudson.model.UpdateSite.Data;
import hudson.model.UpdateSite.Plugin;
import hudson.model.listeners.SaveableListener;
-import hudson.security.HudsonSecurityManager;
import hudson.util.DaemonThreadFactory;
import hudson.util.IOException2;
import hudson.util.PersistedList;
@@ -65,6 +64,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
diff --git a/hudson-core/src/main/java/hudson/model/UpdateSite.java b/hudson-core/src/main/java/hudson/model/UpdateSite.java
index 4df526e5..d1e95abe 100644
--- a/hudson-core/src/main/java/hudson/model/UpdateSite.java
+++ b/hudson-core/src/main/java/hudson/model/UpdateSite.java
@@ -19,7 +19,6 @@ import hudson.PluginWrapper;
import hudson.PluginManager;
import hudson.model.UpdateCenter.UpdateCenterJob;
import hudson.lifecycle.Lifecycle;
-import hudson.security.HudsonSecurityManager;
import hudson.util.IOUtils;
import hudson.util.JSONCanonicalUtils;
import hudson.util.TextFile;
@@ -59,6 +58,7 @@ import java.security.cert.TrustAnchor;
import javax.servlet.ServletContext;
import org.apache.commons.codec.binary.Base64;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
diff --git a/hudson-core/src/main/java/hudson/model/User.java b/hudson-core/src/main/java/hudson/model/User.java
index d51e733b..c07f4323 100644
--- a/hudson-core/src/main/java/hudson/model/User.java
+++ b/hudson-core/src/main/java/hudson/model/User.java
@@ -53,6 +53,8 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Represents a user.
diff --git a/hudson-core/src/main/java/hudson/model/View.java b/hudson-core/src/main/java/hudson/model/View.java
index b694284e..f1b83578 100644
--- a/hudson-core/src/main/java/hudson/model/View.java
+++ b/hudson-core/src/main/java/hudson/model/View.java
@@ -44,6 +44,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
diff --git a/hudson-core/src/main/java/hudson/security/ACL.java b/hudson-core/src/main/java/hudson/security/ACL.java
index fe2b6717..ce00ccb2 100644
--- a/hudson-core/src/main/java/hudson/security/ACL.java
+++ b/hudson-core/src/main/java/hudson/security/ACL.java
@@ -20,6 +20,7 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke
import org.springframework.security.acls.sid.PrincipalSid;
import org.springframework.security.acls.sid.Sid;
import hudson.model.Executor;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Gate-keeper that controls access to Hudson's model objects.
diff --git a/hudson-core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java b/hudson-core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
index 72b2bf4b..48c081df 100644
--- a/hudson-core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
@@ -24,6 +24,7 @@ import hudson.tasks.MailAddressResolver;
import java.io.Console;
import java.io.IOException;
import java.util.Arrays;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.security.Authentication;
import org.springframework.security.AuthenticationException;
import org.springframework.security.BadCredentialsException;
diff --git a/hudson-core/src/main/java/hudson/security/AuthorizationMatrixProperty.java b/hudson-core/src/main/java/hudson/security/AuthorizationMatrixProperty.java
index b8542fff..2f757def 100644
--- a/hudson-core/src/main/java/hudson/security/AuthorizationMatrixProperty.java
+++ b/hudson-core/src/main/java/hudson/security/AuthorizationMatrixProperty.java
@@ -52,6 +52,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import javax.servlet.ServletException;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* {@link JobProperty} to associate ACL for each project.
diff --git a/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
index 609d8b5d..5a96eda3 100644
--- a/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
+++ b/hudson-core/src/main/java/hudson/security/BasicAuthenticationFilter.java
@@ -29,6 +29,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.security.context.SecurityContextHolder;
/**
diff --git a/hudson-core/src/main/java/hudson/security/ContainerAuthentication.java b/hudson-core/src/main/java/hudson/security/ContainerAuthentication.java
index cff5ea7e..cb544ab9 100644
--- a/hudson-core/src/main/java/hudson/security/ContainerAuthentication.java
+++ b/hudson-core/src/main/java/hudson/security/ContainerAuthentication.java
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.List;
import java.util.ArrayList;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* {@link Authentication} implementation for {@link Principal}
diff --git a/hudson-core/src/main/java/hudson/security/FederatedLoginService.java b/hudson-core/src/main/java/hudson/security/FederatedLoginService.java
index afd756d8..bf4f87e5 100644
--- a/hudson-core/src/main/java/hudson/security/FederatedLoginService.java
+++ b/hudson-core/src/main/java/hudson/security/FederatedLoginService.java
@@ -53,6 +53,7 @@ import org.kohsuke.stapler.StaplerResponse;
import javax.servlet.ServletException;
import java.io.IOException;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Abstraction for a login mechanism through external authenticator/identity provider
diff --git a/hudson-core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/hudson-core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
index 90727644..ac16164c 100644
--- a/hudson-core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
+++ b/hudson-core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
@@ -53,6 +53,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.SortedMap;
import java.util.TreeMap;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Role-based authorization via a matrix.
diff --git a/hudson-core/src/main/java/hudson/security/HudsonFilter.java b/hudson-core/src/main/java/hudson/security/HudsonFilter.java
index c189318b..9bbc6d08 100644
--- a/hudson-core/src/main/java/hudson/security/HudsonFilter.java
+++ b/hudson-core/src/main/java/hudson/security/HudsonFilter.java
@@ -25,6 +25,8 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hudson-core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/hudson-core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index 1aad3b3d..a2ab17cf 100644
--- a/hudson-core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -54,6 +54,7 @@ import java.util.Collections;
import java.util.List;
import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* {@link SecurityRealm} that performs authentication by looking up {@link User}.
diff --git a/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java b/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
index 9dc91476..c2e3e727 100644
--- a/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -57,6 +57,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.support.DefaultDirObjectFactory;
import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
diff --git a/hudson-core/src/main/java/hudson/security/PAMSecurityRealm.java b/hudson-core/src/main/java/hudson/security/PAMSecurityRealm.java
index 03aa8d29..f72e24a8 100644
--- a/hudson-core/src/main/java/hudson/security/PAMSecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/PAMSecurityRealm.java
@@ -27,6 +27,7 @@ import java.util.Arrays;
import org.kohsuke.stapler.DataBoundConstructor;
import java.util.Set;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.springframework.security.Authentication;
import org.springframework.security.AuthenticationException;
diff --git a/hudson-core/src/main/java/hudson/security/SecurityRealm.java b/hudson-core/src/main/java/hudson/security/SecurityRealm.java
index 7bd6eb34..0c62de23 100644
--- a/hudson-core/src/main/java/hudson/security/SecurityRealm.java
+++ b/hudson-core/src/main/java/hudson/security/SecurityRealm.java
@@ -39,6 +39,7 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpSession;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.Stapler;
diff --git a/hudson-core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/hudson-core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
index c7f5fd41..f1040c32 100644
--- a/hudson-core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
+++ b/hudson-core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
@@ -24,12 +24,12 @@ import java.util.logging.Logger;
import hudson.Extension;
import hudson.model.Hudson;
import hudson.model.ModelObject;
-import hudson.security.HudsonSecurityManager;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import net.sf.json.JSONObject;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.springframework.security.Authentication;
import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/hudson-core/src/main/java/hudson/slaves/Cloud.java b/hudson-core/src/main/java/hudson/slaves/Cloud.java
index 1a42f353..dcac2cb6 100644
--- a/hudson-core/src/main/java/hudson/slaves/Cloud.java
+++ b/hudson-core/src/main/java/hudson/slaves/Cloud.java
@@ -28,11 +28,11 @@ import hudson.model.Label;
import hudson.model.Descriptor;
import hudson.security.ACL;
import hudson.security.AccessControlled;
-import hudson.security.HudsonSecurityEntitiesHolder;
import hudson.security.Permission;
import hudson.util.DescriptorList;
import java.util.Collection;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
/**
* Creates {@link Node}s to dynamically expand/shrink the slaves attached to Hudson.
@@ -56,22 +56,27 @@ public abstract class Cloud extends AbstractModelObject implements ExtensionPoin
this.name = name;
}
+ @Override
public String getDisplayName() {
return name;
}
+ @Override
public String getSearchUrl() {
return "cloud/"+name;
}
+ @Override
public ACL getACL() {
return HudsonSecurityEntitiesHolder.getHudsonSecurityManager().getAuthorizationStrategy().getACL(this);
}
+ @Override
public final void checkPermission(Permission permission) {
getACL().checkPermission(permission);
}
+ @Override
public final boolean hasPermission(Permission permission) {
return getACL().hasPermission(permission);
}
diff --git a/hudson-core/src/main/java/hudson/slaves/NodeProvisioner.java b/hudson-core/src/main/java/hudson/slaves/NodeProvisioner.java
index 64345414..c34b0b10 100644
--- a/hudson-core/src/main/java/hudson/slaves/NodeProvisioner.java
+++ b/hudson-core/src/main/java/hudson/slaves/NodeProvisioner.java
@@ -23,8 +23,6 @@ import hudson.model.Label;
import hudson.model.PeriodicWork;
import static hudson.model.LoadStatistics.DECAY;
import hudson.Extension;
-import hudson.util.graph.MultiStageTimeSeries;
-import hudson.util.graph.MultiStageTimeSeries.TimeScale;
import java.awt.Color;
import java.util.concurrent.Future;
@@ -36,6 +34,8 @@ import java.util.Iterator;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.io.IOException;
+import org.eclipse.hudson.graph.MultiStageTimeSeries;
+import org.eclipse.hudson.graph.MultiStageTimeSeries.TimeScale;
/**
* Uses the {@link LoadStatistics} and determines when we need to allocate
diff --git a/hudson-core/src/main/java/hudson/slaves/SlaveComputer.java b/hudson-core/src/main/java/hudson/slaves/SlaveComputer.java
index 358ef1a2..3c7ca35b 100644
--- a/hudson-core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/hudson-core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -30,7 +30,6 @@ import hudson.lifecycle.WindowsSlaveInstaller;
import hudson.Util;
import hudson.AbortException;
import hudson.remoting.Launcher;
-import hudson.security.HudsonSecurityManager;
import static hudson.slaves.SlaveComputer.LogHolder.SLAVE_LOG_HANDLER;
import hudson.slaves.OfflineCause.ChannelTermination;
@@ -59,6 +58,7 @@ import org.kohsuke.stapler.HttpRedirect;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* {@link Computer} for {@link Slave}s.
diff --git a/hudson-core/src/main/java/hudson/tasks/junit/History.java b/hudson-core/src/main/java/hudson/tasks/junit/History.java
index a099a13f..17711444 100644
--- a/hudson-core/src/main/java/hudson/tasks/junit/History.java
+++ b/hudson-core/src/main/java/hudson/tasks/junit/History.java
@@ -20,14 +20,13 @@ import hudson.model.Hudson;
import hudson.tasks.test.TestObject;
import hudson.tasks.test.TestResult;
import hudson.util.ColorPalette;
-import hudson.util.graph.ChartLabel;
-import hudson.util.graph.DataSet;
-import hudson.util.graph.Graph;
-
-import hudson.util.graph.GraphSeries;
import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.hudson.graph.ChartLabel;
+import org.eclipse.hudson.graph.DataSet;
+import org.eclipse.hudson.graph.Graph;
+import org.eclipse.hudson.graph.GraphSeries;
import org.kohsuke.stapler.Stapler;
diff --git a/hudson-core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/hudson-core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
index 956cccbf..22700fdd 100644
--- a/hudson-core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
+++ b/hudson-core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
@@ -16,16 +16,10 @@
package hudson.tasks.test;
-import hudson.util.graph.DataSet;
import hudson.Functions;
import hudson.model.*;
import hudson.tasks.junit.CaseResult;
import hudson.util.*;
-import hudson.util.graph.ChartLabel;
-import hudson.util.graph.ChartUtil;
-import hudson.util.graph.ChartUtil.NumberOnlyBuildLabel;
-import hudson.util.graph.Graph;
-import hudson.util.graph.GraphSeries;
import java.awt.Color;
import org.jvnet.localizer.Localizable;
import org.kohsuke.stapler.StaplerRequest;
@@ -39,6 +33,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.eclipse.hudson.graph.Graph;
+import org.eclipse.hudson.graph.ChartLabel;
+import org.eclipse.hudson.graph.ChartUtil;
+import org.eclipse.hudson.graph.ChartUtil.NumberOnlyBuildLabel;
+import org.eclipse.hudson.graph.DataSet;
+import org.eclipse.hudson.graph.GraphSeries;
+
/**
* Common base class for recording test result.
*
diff --git a/hudson-core/src/main/java/hudson/triggers/SafeTimerTask.java b/hudson-core/src/main/java/hudson/triggers/SafeTimerTask.java
index ec162208..90922fb7 100644
--- a/hudson-core/src/main/java/hudson/triggers/SafeTimerTask.java
+++ b/hudson-core/src/main/java/hudson/triggers/SafeTimerTask.java
@@ -19,8 +19,7 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.logging.Logger;
import java.util.logging.Level;
-
-import hudson.security.HudsonSecurityManager;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* {@link Timer} wrapper so that a fatal error in {@link TimerTask}
diff --git a/hudson-core/src/main/java/hudson/util/CascadingUtil.java b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
index e4b23ddb..ad9f5958 100644
--- a/hudson-core/src/main/java/hudson/util/CascadingUtil.java
+++ b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
@@ -36,20 +36,20 @@ import java.util.Set;
import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.hudsonci.api.model.ICascadingJob;
-import org.hudsonci.api.model.IProjectProperty;
-import org.hudsonci.model.project.property.AxisListProjectProperty;
-import org.hudsonci.model.project.property.BaseProjectProperty;
-import org.hudsonci.model.project.property.BooleanProjectProperty;
-import org.hudsonci.model.project.property.CopyOnWriteListProjectProperty;
-import org.hudsonci.model.project.property.DescribableListProjectProperty;
-import org.hudsonci.model.project.property.ExternalProjectProperty;
-import org.hudsonci.model.project.property.IntegerProjectProperty;
-import org.hudsonci.model.project.property.LogRotatorProjectProperty;
-import org.hudsonci.model.project.property.ResultProjectProperty;
-import org.hudsonci.model.project.property.SCMProjectProperty;
-import org.hudsonci.model.project.property.StringProjectProperty;
-import org.hudsonci.model.project.property.TriggerProjectProperty;
+import org.eclipse.hudson.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.IProjectProperty;
+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;
/**
@@ -66,7 +66,7 @@ public class CascadingUtil {
*
* @param currentJob job that should be analyzed.
* @param key key.
- * @return {@link import org.hudsonci.api.model.IProjectProperty} instance or null.
+ * @return {@link import org.eclipse.hudson.api.model.IProjectProperty} instance or null.
* @throws IllegalArgumentException if currentJob is null.
*/
public static IProjectProperty getProjectProperty(Job currentJob, String key) {
@@ -79,7 +79,7 @@ public class CascadingUtil {
*
* @param currentJob job that should be analyzed.
* @param key key.
- * @return {@link org.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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.hudsonci.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) {
@@ -236,7 +236,7 @@ public class CascadingUtil {
* @param key key.
* @param clazz required property class.
* If class is not null and property was not found, property of given class will be created.
- * @return {@link org.hudsonci.api.model.IProjectProperty} instance or null.
+ * @return {@link org.eclipse.hudson.api.model.IProjectProperty} instance or null.
* @throws IllegalArgumentException if currentJob is null.
*/
@SuppressWarnings("unchecked")
@@ -406,7 +406,7 @@ public class CascadingUtil {
}
/**
- * Creates {@link org.hudsonci.model.project.property.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 11a49a7f..3171d467 100644
--- a/hudson-core/src/main/java/hudson/util/DescribableListUtil.java
+++ b/hudson-core/src/main/java/hudson/util/DescribableListUtil.java
@@ -29,8 +29,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.json.JSONObject;
-import org.hudsonci.api.model.IProjectProperty;
-import org.hudsonci.model.project.property.ExternalProjectProperty;
+import org.eclipse.hudson.api.model.IProjectProperty;
+import org.eclipse.hudson.model.project.property.ExternalProjectProperty;
import org.kohsuke.stapler.StaplerRequest;
/**
@@ -106,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 org.hudsonci.model.project.property.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/hudson/util/Graph.java b/hudson-core/src/main/java/hudson/util/Graph.java
index 3d7ad7d5..27c37f8c 100644
--- a/hudson-core/src/main/java/hudson/util/Graph.java
+++ b/hudson-core/src/main/java/hudson/util/Graph.java
@@ -20,9 +20,9 @@ import java.util.Calendar;
* Exists solely for backward compatibility
*
* @author Winston Prakash
- * @see hudson.util.graph.Graph
+ * @see org.eclipse.hudson.graph.Graph
*/
-public class Graph extends hudson.util.graph.Graph {
+public class Graph extends org.eclipse.hudson.graph.Graph {
public Graph(long timestamp, int defaultW, int defaultH) {
super(timestamp, defaultW, defaultH);
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/HudsonServletContextListener.java b/hudson-core/src/main/java/org/eclipse/hudson/HudsonServletContextListener.java
index 3af6dd16..9c133430 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/HudsonServletContextListener.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/HudsonServletContextListener.java
@@ -19,11 +19,8 @@ import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider
import com.thoughtworks.xstream.core.JVM;
import hudson.EnvVars;
import hudson.model.Hudson;
-import hudson.security.HudsonSecurityEntitiesHolder;
-import hudson.security.HudsonSecurityManager;
-import org.eclipse.hudson.WebAppController.DefaultInstallStrategy;
import hudson.util.*;
-import hudson.util.graph.ChartUtil;
+import org.eclipse.hudson.WebAppController.DefaultInstallStrategy;
import org.jvnet.localizer.LocaleProvider;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
@@ -45,7 +42,10 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
import java.security.Security;
+import org.eclipse.hudson.graph.ChartUtil;
import org.eclipse.hudson.init.InitialSetup;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/matrix/IMatrixProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/matrix/IMatrixProject.java
index 2d04090f..fa201a33 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/matrix/IMatrixProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/matrix/IMatrixProject.java
@@ -17,7 +17,7 @@ package org.eclipse.hudson.api.matrix;
import hudson.matrix.AxisList;
import hudson.model.Result;
import java.io.IOException;
-import org.hudsonci.api.model.IBaseBuildableProject;
+import org.eclipse.hudson.api.model.IBaseBuildableProject;
/**
* Matrix Project Interface.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IAbstractProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IAbstractProject.java
index 75aef7e8..bf12fe30 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IAbstractProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IAbstractProject.java
@@ -12,7 +12,8 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.api.model;
+
+package org.eclipse.hudson.api.model;
import hudson.FilePath;
import hudson.model.AbstractBuild;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IBaseBuildableProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IBaseBuildableProject.java
index a4c0659f..c1f82a33 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IBaseBuildableProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IBaseBuildableProject.java
@@ -1,27 +1,19 @@
-/*
- * The MIT License
+/*******************************************************************************
*
- * Copyright (c) 2011, Oracle Corporation, Nikita Levyankov
+ * Copyright (c) 2011 Oracle Corporation.
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * Contributors:
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.hudsonci.api.model;
+ * Nikita Levyankov
+ *
+ *******************************************************************************/
+
+package org.eclipse.hudson.api.model;
import hudson.model.Descriptor;
import hudson.tasks.BuildWrapper;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/ICascadingJob.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/ICascadingJob.java
index 4f5f1f97..d424e644 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/ICascadingJob.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/ICascadingJob.java
@@ -1,27 +1,19 @@
-/*
- * The MIT License
+/*******************************************************************************
*
- * Copyright (c) 2004-2011, Oracle Corporation, Nikita Levyankov
+ * Copyright (c) 2011 Oracle Corporation.
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * Contributors:
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.hudsonci.api.model;
+ * Nikita Levyankov
+ *
+ *******************************************************************************/
+
+package org.eclipse.hudson.api.model;
import hudson.model.Job;
import java.io.IOException;
@@ -72,7 +64,7 @@ public interface ICascadingJob<T extends Job<?,?>> extends IJob<T> {
* Returns job property by specified key.
*
* @param key key.
- * @return {@link org.hudsonci.api.model.IProjectProperty} instance or null.
+ * @return {@link org.eclipse.hudson.api.model.IProjectProperty} instance or null.
*/
IProjectProperty getProperty(String key);
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IFreeStyleProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IFreeStyleProject.java
index 031be9d6..21ac8830 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IFreeStyleProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IFreeStyleProject.java
@@ -12,7 +12,8 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.api.model;
+
+package org.eclipse.hudson.api.model;
import java.io.IOException;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java
index 762a9e45..2f0448a6 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java
@@ -12,7 +12,8 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.api.model;
+
+package org.eclipse.hudson.api.model;
import hudson.PermalinkList;
import hudson.model.BallColor;
@@ -27,7 +28,7 @@ import hudson.model.Queue;
import hudson.model.Result;
import hudson.model.Run;
import hudson.tasks.LogRotator;
-import hudson.util.graph.Graph;
+import org.eclipse.hudson.graph.Graph;
import hudson.util.RunList;
import hudson.widgets.Widget;
import java.io.IOException;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
index d1d311d1..48d6c479 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProject.java
@@ -12,7 +12,8 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.api.model;
+
+package org.eclipse.hudson.api.model;
/**
* Project interface
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java
index 9559ad17..0ccea081 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.api.model;
+package org.eclipse.hudson.api.model;
import java.io.Serializable;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartLabel.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartLabel.java
index 5f4e698e..04d37f9d 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartLabel.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartLabel.java
@@ -14,7 +14,7 @@
*
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import java.awt.Color;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartUtil.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartUtil.java
index e34906e1..af8c4dca 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartUtil.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/ChartUtil.java
@@ -14,7 +14,7 @@
*
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import hudson.model.AbstractBuild;
import java.awt.Font;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/DataSet.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/DataSet.java
index a827ce06..81451fae 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/DataSet.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/DataSet.java
@@ -13,7 +13,7 @@
*
*
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import java.util.ArrayList;
import java.util.List;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/Graph.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/Graph.java
index db602771..c1ab8943 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/Graph.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/Graph.java
@@ -11,9 +11,8 @@
*
* Kohsuke Kawaguchi, Winston.Prakash@Oracle.com
*
- *
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import hudson.model.Descriptor.FormException;
import hudson.util.ColorPalette;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSeries.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSeries.java
index 379cc11e..ed337b5b 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSeries.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSeries.java
@@ -1,8 +1,19 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package hudson.util.graph;
+/*******************************************************************************
+ *
+ * Copyright (c) 2011, Oracle Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * Winston Prakash
+ *
+ *******************************************************************************/
+
+package org.eclipse.hudson.graph;
import java.awt.Color;
import java.util.ArrayList;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupport.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupport.java
index d527c5c0..2e3b1117 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupport.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupport.java
@@ -14,7 +14,7 @@
*
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import hudson.DescriptorExtensionList;
import hudson.ExtensionPoint;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupportDescriptor.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupportDescriptor.java
index ac50b833..854a0e34 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupportDescriptor.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/GraphSupportDescriptor.java
@@ -14,7 +14,7 @@
*
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import hudson.model.Descriptor;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/graph/MultiStageTimeSeries.java b/hudson-core/src/main/java/org/eclipse/hudson/graph/MultiStageTimeSeries.java
index e3b2a185..e564e51b 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/graph/MultiStageTimeSeries.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/graph/MultiStageTimeSeries.java
@@ -11,10 +11,9 @@
*
* Kohsuke Kawaguchi, Winston Prakash
*
- *
*******************************************************************************/
-package hudson.util.graph;
+package org.eclipse.hudson.graph;
import hudson.model.Api;
import hudson.model.Messages;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java b/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
index ac3b6ca1..52e58aff 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
@@ -21,8 +21,6 @@ import hudson.Util;
import hudson.XmlFile;
import hudson.model.Hudson;
import hudson.model.User;
-import hudson.security.HudsonSecurityEntitiesHolder;
-import hudson.security.HudsonSecurityManager;
import hudson.security.Permission;
import org.eclipse.hudson.WebAppController;
import hudson.triggers.SafeTimerTask;
@@ -40,6 +38,8 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.hudson.init.AvailablePluginManager.AvailablePluginInfo;
import org.eclipse.hudson.init.InstalledPluginManager.InstalledPluginInfo;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.HttpResponses;
import org.kohsuke.stapler.QueryParameter;
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java
index 301a36e4..6bd0804f 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/AxisListProjectProperty.java
@@ -13,10 +13,10 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.matrix.AxisList;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents {@link hudson.matrix.AxisList} property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java
index 03e1bd37..a37957a0 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BaseProjectProperty.java
@@ -13,12 +13,12 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.util.DeepEquals;
import org.apache.commons.lang3.ObjectUtils;
-import org.hudsonci.api.model.ICascadingJob;
-import org.hudsonci.api.model.IProjectProperty;
+import org.eclipse.hudson.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.IProjectProperty;
/**
* Base property implementation. Contains common methods for setting and getting cascading and overridden properties.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java
index e1cda187..6409beca 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/BooleanProjectProperty.java
@@ -12,9 +12,9 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents boolean property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java
index 48ad48b3..1ed5b27c 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectProperty.java
@@ -12,10 +12,10 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.util.CopyOnWriteList;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Project property for {@link CopyOnWriteList}
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java
index 56f3af67..c1c1247e 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/DescribableListProjectProperty.java
@@ -12,13 +12,13 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.util.DeepEquals;
import hudson.util.DescribableList;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Property represents DescribableList object.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java
index 516382f2..6def6956 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ExternalProjectProperty.java
@@ -12,9 +12,9 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Class property is intended to be used for ProjectProperties without correct equals and hashCode methods, such as
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java
index 9ca86006..44448c22 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/IntegerProjectProperty.java
@@ -12,9 +12,9 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents integer property for project.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java
index 4ca842f7..4565863e 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/LogRotatorProjectProperty.java
@@ -12,10 +12,10 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.tasks.LogRotator;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents LogRotator property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java
index e9e4deb3..0f98732a 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/ResultProjectProperty.java
@@ -13,9 +13,9 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.model.Result;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents {@link Result} property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java
index 56f3e1a2..b7bc051f 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/SCMProjectProperty.java
@@ -12,11 +12,11 @@
* Anton Kozak
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.scm.NullSCM;
import hudson.scm.SCM;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Represents {@link SCM} property.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java
index f1e71043..8241489d 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/StringProjectProperty.java
@@ -13,10 +13,10 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import org.apache.commons.lang3.StringUtils;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* String property for project.
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java
index e1bcb831..0be106ae 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/model/project/property/TriggerProjectProperty.java
@@ -13,10 +13,10 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.triggers.Trigger;
-import org.hudsonci.api.model.ICascadingJob;
+import org.eclipse.hudson.api.model.ICascadingJob;
/**
* Property for triggers in case of we should use child project trigger
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityEntitiesHolder.java b/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityEntitiesHolder.java
index d4d45917..61254af2 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityEntitiesHolder.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityEntitiesHolder.java
@@ -14,7 +14,9 @@
*
******************************************************************************
*/
-package hudson.security;
+package org.eclipse.hudson.security;
+
+import hudson.security.HudsonFilter;
/**
* This is a Container class to set and fetch the Security related entities such
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityManager.java b/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityManager.java
index 36e32cbd..247b71a6 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityManager.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/security/HudsonSecurityManager.java
@@ -14,7 +14,7 @@
*
******************************************************************************
*/
-package hudson.security;
+package org.eclipse.hudson.security;
import com.thoughtworks.xstream.XStream;
import hudson.BulkChange;
@@ -25,6 +25,7 @@ import hudson.markup.RawHtmlMarkupFormatter;
import hudson.model.Descriptor.FormException;
import hudson.model.Saveable;
import hudson.model.listeners.SaveableListener;
+import hudson.security.*;
import hudson.util.TextFile;
import hudson.util.XStream2;
import java.io.File;
diff --git a/hudson-core/src/main/resources/hudson/hudson-core.properties b/hudson-core/src/main/resources/hudson/hudson-core.properties
index 99c4fa03..0ac551b3 100644
--- a/hudson-core/src/main/resources/hudson/hudson-core.properties
+++ b/hudson-core/src/main/resources/hudson/hudson-core.properties
@@ -12,4 +12,4 @@
#
#**************************************************************************
-hudson.PluginStrategy=org.hudsonci.inject.internal.plugin.DelegatingPluginStrategy
+hudson.PluginStrategy=org.eclipse.hudson.inject.internal.plugin.DelegatingPluginStrategy
diff --git a/hudson-core/src/main/resources/lib/hudson/cascadingDescriptorList.jelly b/hudson-core/src/main/resources/lib/hudson/cascadingDescriptorList.jelly
index 90bda8fd..24ff6f27 100644
--- a/hudson-core/src/main/resources/lib/hudson/cascadingDescriptorList.jelly
+++ b/hudson-core/src/main/resources/lib/hudson/cascadingDescriptorList.jelly
@@ -26,14 +26,14 @@
<st:attribute name="projectPropertyClass">
ProjectProperty class that will be used for creating project property instance
based on hudson.util.CascadingUtil.getProjectProperty method. Default value is
- org.hudsonci.model.project.property.ExternalProjectProperty.class.
+ org.eclipse.hudson.model.project.property.ExternalProjectProperty.class.
</st:attribute>
</st:documentation>
<j:set var="targetType" value="${it.class}"/>
<j:if test="${attrs.projectPropertyClass==null}">
<j:set var="attrs.projectPropertyClass"
- value="${org.hudsonci.model.project.property.ExternalProjectProperty.class}"/>
+ value="${org.eclipse.hudson.model.project.property.ExternalProjectProperty.class}"/>
</j:if>
<j:if test="${!empty(descriptors) or context['org.apache.commons.jelly.body']!=null}">
<f:section title="${attrs.title}" name="${attrs.name}">
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 c88fc1c7..26ef0ce7 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
@@ -25,7 +25,7 @@
<j:arg value="${it}" type="hudson.model.Item" />
</j:invokeStatic>
<t:cascadingDescriptorList title="${%Build Triggers}" descriptors="${triggers}"
- propertyClass="${org.hudsonci.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 55a2dd1e..6b981a0a 100644
--- a/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java
+++ b/hudson-core/src/test/java/hudson/matrix/MatrixProjectTest.java
@@ -17,9 +17,9 @@ package hudson.matrix;
import hudson.model.Result;
import hudson.security.Permission;
import java.io.IOException;
-import org.hudsonci.api.model.IProjectProperty;
-import org.hudsonci.model.project.property.ResultProjectProperty;
-import org.hudsonci.model.project.property.StringProjectProperty;
+import org.eclipse.hudson.api.model.IProjectProperty;
+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/FreeStyleProjectTest.java b/hudson-core/src/test/java/hudson/model/FreeStyleProjectTest.java
index 56427c53..d0875926 100644
--- a/hudson-core/src/test/java/hudson/model/FreeStyleProjectTest.java
+++ b/hudson-core/src/test/java/hudson/model/FreeStyleProjectTest.java
@@ -31,6 +31,8 @@ import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static org.easymock.EasyMock.expect;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
import static org.junit.Assert.assertFalse;
import static org.powermock.api.easymock.PowerMock.createMock;
import static org.powermock.api.easymock.PowerMock.mockStatic;
diff --git a/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java b/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
index d95f1e5e..4c15a795 100644
--- a/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
+++ b/hudson-core/src/test/java/hudson/model/LegacyProjectTest.java
@@ -27,7 +27,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
-import org.hudsonci.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/model/LoadStatisticsTest.java b/hudson-core/src/test/java/hudson/model/LoadStatisticsTest.java
index c21b25c8..d21e75de 100644
--- a/hudson-core/src/test/java/hudson/model/LoadStatisticsTest.java
+++ b/hudson-core/src/test/java/hudson/model/LoadStatisticsTest.java
@@ -8,24 +8,15 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
-*
-* Kohsuke Kawaguchi
- *
*
+ * Kohsuke Kawaguchi
+ *
*******************************************************************************/
package hudson.model;
-import hudson.util.graph.Graph;
-import hudson.util.graph.MultiStageTimeSeries.TimeScale;
import junit.framework.TestCase;
-import org.apache.commons.io.IOUtils;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
/**
diff --git a/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java b/hudson-core/src/test/java/hudson/util/DescribableListUtilTest.java
index bd014fdf..dc03b8ab 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.hudsonci.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/hudsonci/model/project/property/AxisListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/AxisListProjectPropertyTest.java
index 35d51368..a218cbf7 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/AxisListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/AxisListProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.matrix.AxisList;
import hudson.model.FreeStyleProjectMock;
@@ -58,7 +58,7 @@ public class AxisListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/BaseProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/BaseProjectPropertyTest.java
index 0f187e95..b9a495db 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/BaseProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/BaseProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.matrix.Axis;
import hudson.matrix.AxisList;
@@ -70,7 +70,7 @@ public class BaseProjectPropertyTest {
}
/**
- * Verify {@link BaseProjectProperty#setJob(org.hudsonci.api.model.IJob)} method.
+ * Verify {@link BaseProjectProperty#setJob(org.eclipse.hudson.api.model.IJob)} method.
*/
@Test
public void testSetJob() {
@@ -358,7 +358,7 @@ public class BaseProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
*/
@Test
public void testOnCascadingProjectRemoved() {
@@ -369,7 +369,7 @@ public class BaseProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.BaseProjectProperty#onCascadingProjectRemoved()} method.
*/
@Test
public void testOnCascadingProjectSet() {
@@ -389,7 +389,7 @@ public class BaseProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/CopyOnWriteListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectPropertyTest.java
index 75a8fe56..922dc9fa 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/CopyOnWriteListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/CopyOnWriteListProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.model.FreeStyleProjectMock;
import hudson.util.CopyOnWriteList;
@@ -61,7 +61,7 @@ public class CopyOnWriteListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.CopyOnWriteListProjectProperty#getDefaultValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getDefaultValue()} method.
*/
@Test
public void testGetDefaultValue() {
@@ -73,7 +73,7 @@ public class CopyOnWriteListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
*/
@Test
public void testGetOriginalValue() {
@@ -85,7 +85,7 @@ public class CopyOnWriteListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
*/
@Test
public void testReturnOriginalValue() {
@@ -104,7 +104,7 @@ public class CopyOnWriteListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/DescribableListProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/DescribableListProjectPropertyTest.java
index cb3cd0b5..09cc9067 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/DescribableListProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/DescribableListProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.model.FreeStyleProjectMock;
import hudson.tasks.Shell;
@@ -66,7 +66,7 @@ public class DescribableListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.DescribableListProjectProperty#getDefaultValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.DescribableListProjectProperty#getDefaultValue()} method.
*/
@Test
public void testGetDefaultValue() {
@@ -78,7 +78,7 @@ public class DescribableListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#getOriginalValue()} method.
*/
@Test
public void testGetOriginalValue() {
@@ -90,7 +90,7 @@ public class DescribableListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.CopyOnWriteListProjectProperty#returnOriginalValue()} method.
*/
@Test
public void testReturnOriginalValue() {
@@ -109,7 +109,7 @@ public class DescribableListProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/ExternalProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ExternalProjectPropertyTest.java
index fc2822ca..602b8a12 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/ExternalProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ExternalProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.model.FreeStyleProjectMock;
import org.junit.Before;
@@ -56,7 +56,7 @@ public class ExternalProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.ExternalProjectProperty#updateOriginalValue(Object, Object)} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.ExternalProjectProperty#updateOriginalValue(Object, Object)} method.
*/
@Test
public void testUpdateOriginalValue() {
@@ -73,7 +73,7 @@ public class ExternalProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/ProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ProjectPropertyTest.java
index 0031f7a7..6996104d 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/ProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/ProjectPropertyTest.java
@@ -13,7 +13,7 @@
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.model.FreeStyleProjectMock;
import hudson.tasks.LogRotator;
diff --git a/hudson-core/src/test/java/org/hudsonci/model/project/property/SCMProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/SCMProjectPropertyTest.java
index 47138adc..4ddd86de 100644
--- a/hudson-core/src/test/java/org/hudsonci/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.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import hudson.FilePath;
import hudson.Launcher;
@@ -67,7 +67,7 @@ public class SCMProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.SCMProjectProperty#getDefaultValue()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.SCMProjectProperty#getDefaultValue()} method.
*/
@Test
public void testGetDefaultValue() {
@@ -75,7 +75,7 @@ public class SCMProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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/hudsonci/model/project/property/TriggerProjectPropertyTest.java b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/TriggerProjectPropertyTest.java
index 5a2d3d9c..27d17b79 100644
--- a/hudson-core/src/test/java/org/hudsonci/model/project/property/TriggerProjectPropertyTest.java
+++ b/hudson-core/src/test/java/org/eclipse/hudson/model/project/property/TriggerProjectPropertyTest.java
@@ -12,7 +12,7 @@
* Nikita Levyankov
*
*******************************************************************************/
-package org.hudsonci.model.project.property;
+package org.eclipse.hudson.model.project.property;
import antlr.ANTLRException;
import hudson.model.FreeStyleProjectMock;
@@ -53,7 +53,7 @@ public class TriggerProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.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 +92,7 @@ public class TriggerProjectPropertyTest {
}
/**
- * Verify {@link org.hudsonci.model.project.property.TriggerProjectProperty#onCascadingProjectRemoved()} method.
+ * Verify {@link org.eclipse.hudson.model.project.property.TriggerProjectProperty#onCascadingProjectRemoved()} method.
*
* @throws antlr.ANTLRException if any
*/
diff --git a/hudson-test-framework/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/hudson-test-framework/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index 9350c466..fd809216 100644
--- a/hudson-test-framework/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/hudson-test-framework/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -148,6 +148,8 @@ import hudson.util.SecurityFailedToInit;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.eclipse.hudson.HudsonServletContextListener;
+import org.eclipse.hudson.security.HudsonSecurityEntitiesHolder;
+import org.eclipse.hudson.security.HudsonSecurityManager;
/**
* Base class for all Hudson test cases.

Back to the top