[JENKINS-28881] - Move Folder files. Folders belong to the model

jenkinsci · Jan 6, 2016 · e5039a9220b6718501a5aa40c5e1d9a394c3426e · e5039a9
1 parent 6302e83
commit e5039a9220b6718501a5aa40c5e1d9a394c3426e
Showing 17 changed files with 11 additions and 11 deletions.
diff --git a/...ownership/folders/FolderItemListener.java → ...hip/model/folders/FolderItemListener.java b/...ownership/folders/FolderItemListener.java → ...hip/model/folders/FolderItemListener.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.cloudbees.hudson.plugins.folder.Folder;

diff --git a/...ership/folders/FolderOwnershipAction.java → .../model/folders/FolderOwnershipAction.java b/...ership/folders/FolderOwnershipAction.java → .../model/folders/FolderOwnershipAction.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.cloudbees.hudson.plugins.folder.Folder;

diff --git a/...folders/FolderOwnershipActionFactory.java → ...folders/FolderOwnershipActionFactory.java b/...folders/FolderOwnershipActionFactory.java → ...folders/FolderOwnershipActionFactory.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.Folder;
 import com.cloudbees.hudson.plugins.folder.TransientFolderActionFactory;

diff --git a/...ers/FolderOwnershipDescriptionSource.java → ...ers/FolderOwnershipDescriptionSource.java b/...ers/FolderOwnershipDescriptionSource.java → ...ers/FolderOwnershipDescriptionSource.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.synopsys.arc.jenkins.plugins.ownership.OwnershipDescription;

diff --git a/...ership/folders/FolderOwnershipHelper.java → .../model/folders/FolderOwnershipHelper.java b/...ership/folders/FolderOwnershipHelper.java → .../model/folders/FolderOwnershipHelper.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.cloudbees.hudson.plugins.folder.AbstractFolderProperty;

diff --git a/...ship/folders/FolderOwnershipProperty.java → ...odel/folders/FolderOwnershipProperty.java b/...ship/folders/FolderOwnershipProperty.java → ...odel/folders/FolderOwnershipProperty.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.cloudbees.hudson.plugins.folder.AbstractFolderProperty;

diff --git a/...folders/FolderOwnershipAction/index.jelly → ...folders/FolderOwnershipAction/index.jelly b/...folders/FolderOwnershipAction/index.jelly → ...folders/FolderOwnershipAction/index.jelly
diff --git a/...FolderOwnershipAction/manage-owners.jelly → ...FolderOwnershipAction/manage-owners.jelly b/...FolderOwnershipAction/manage-owners.jelly → ...FolderOwnershipAction/manage-owners.jelly
diff --git a/...lders/FolderOwnershipAction/summary.jelly → ...lders/FolderOwnershipAction/summary.jelly b/...lders/FolderOwnershipAction/summary.jelly → ...lders/FolderOwnershipAction/summary.jelly
diff --git a/...rOwnershipDescriptionSource/summary.jelly → ...rOwnershipDescriptionSource/summary.jelly b/...rOwnershipDescriptionSource/summary.jelly → ...rOwnershipDescriptionSource/summary.jelly
diff --git a/...ders/FolderOwnershipProperty/config.jelly → ...ders/FolderOwnershipProperty/config.jelly b/...ders/FolderOwnershipProperty/config.jelly → ...ders/FolderOwnershipProperty/config.jelly
diff --git a/...ers/FolderOwnershipProperty/summary.jelly → ...ers/FolderOwnershipProperty/summary.jelly b/...ers/FolderOwnershipProperty/summary.jelly → ...ers/FolderOwnershipProperty/summary.jelly
diff --git a/...t/java/com/synopsys/arc/jenkins/plugins/ownership/wrappers/OwnershipBuildWrapperTest.java b/...t/java/com/synopsys/arc/jenkins/plugins/ownership/wrappers/OwnershipBuildWrapperTest.java
@@ -48,7 +48,7 @@
 import java.util.Collections;
 import java.util.concurrent.Future;
 import static junit.framework.Assert.*;
-import org.jenkinsci.plugins.ownership.folders.FolderOwnershipHelper;
+import org.jenkinsci.plugins.ownership.model.folders.FolderOwnershipHelper;
 import org.jenkinsci.plugins.ownership.test.util.OwnershipPluginConfigurer;
 import org.jenkinsci.plugins.ownership.util.environment.EnvSetupOptions;
 import org.jenkinsci.plugins.ownership.util.mail.MailOptions;

diff --git a/...ip/folders/FolderOwnershipHelperTest.java → ...el/folders/FolderOwnershipHelperTest.java b/...ip/folders/FolderOwnershipHelperTest.java → ...el/folders/FolderOwnershipHelperTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.Folder;
 import org.jenkinsci.plugins.ownership.model.OwnershipHelperLocator;

diff --git a/...wnership/folders/FolderOwnershipTest.java → ...ip/model/folders/FolderOwnershipTest.java b/...wnership/folders/FolderOwnershipTest.java → ...ip/model/folders/FolderOwnershipTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.ownership.folders;
+package org.jenkinsci.plugins.ownership.model.folders;
 
 import com.cloudbees.hudson.plugins.folder.AbstractFolder;
 import com.cloudbees.hudson.plugins.folder.Folder;

diff --git a/src/test/java/org/jenkinsci/plugins/ownership/model/runs/RunOwnershipActionTest.java b/src/test/java/org/jenkinsci/plugins/ownership/model/runs/RunOwnershipActionTest.java
@@ -40,7 +40,7 @@
 
 import static org.junit.Assert.assertThat;
 import static org.hamcrest.Matchers.*;
-import org.jenkinsci.plugins.ownership.folders.FolderOwnershipHelper;
+import org.jenkinsci.plugins.ownership.model.folders.FolderOwnershipHelper;
 import org.jenkinsci.plugins.ownership.model.OwnershipInfo;
 import static org.junit.Assert.assertThat;
 import org.jvnet.hudson.test.Bug;

diff --git a/...ava/org/jenkinsci/plugins/ownership/security/rolestrategy/OwnershipBasedSecurityTest.java b/...ava/org/jenkinsci/plugins/ownership/security/rolestrategy/OwnershipBasedSecurityTest.java
@@ -36,7 +36,7 @@
 import java.util.Arrays;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import org.jenkinsci.plugins.ownership.folders.FolderOwnershipHelper;
+import org.jenkinsci.plugins.ownership.model.folders.FolderOwnershipHelper;
 import org.jenkinsci.remoting.RoleChecker;
 import org.junit.Rule;
 import org.junit.Test;