[isis] branch master updated: ISIS-1679 applib: move dto classes into new package

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 14afca8  ISIS-1679 applib: move dto classes into new package
14afca8 is described below

commit 14afca8b0a12fa66295447bcbb6d47fe006f44fc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 12 14:28:58 2018 +0200

    ISIS-1679 applib: move dto classes into new package
---
 .../org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java    | 2 +-
 .../java/org/apache/isis/applib/{services => mixins}/dto/Dto.java | 2 +-
 .../isis/applib/{services => mixins}/dto/DtoMappingHelper.java    | 2 +-
 .../isis/applib/{services => mixins}/dto/Dto_downloadXml.java     | 2 +-
 .../isis/applib/{services => mixins}/dto/Dto_downloadXsd.java     | 2 +-
 .../org/apache/isis/applib/{services => mixins}/dto/Util.java     | 2 +-
 .../apache/isis/applib/{services => mixins}/dto/package-info.java | 8 ++++----
 .../java/org/apache/isis/applib/services/jaxb/JaxbService.java    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
index 897ef29..3bd439c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.layout.component.FieldSet;
 import org.apache.isis.applib.layout.component.PropertyLayoutData;
 import org.apache.isis.applib.layout.grid.Grid;
 import org.apache.isis.applib.layout.grid.GridAbstract;
-import org.apache.isis.applib.services.dto.Dto;
+import org.apache.isis.applib.mixins.dto.Dto;
 
 /**
  * This is the top-level for rendering the domain object's properties, collections and actions.  It simply consists
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
similarity index 94%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
index ca4d801..1ed6b11 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.applib.services.dto;
+package org.apache.isis.applib.mixins.dto;
 
 public interface Dto {
 
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/DtoMappingHelper.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
similarity index 98%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/DtoMappingHelper.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
index 9a97c6c..9cb75d2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/DtoMappingHelper.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.applib.services.dto;
+package org.apache.isis.applib.mixins.dto;
 
 import javax.inject.Inject;
 
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
similarity index 98%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
index 37eebc9..f071dc7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.applib.services.dto;
+package org.apache.isis.applib.mixins.dto;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
index e76dad8..ed73593 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.applib.services.dto;
+package org.apache.isis.applib.mixins.dto;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Util.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Util.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/Util.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Util.java
index b87051b..d5bf81b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Util.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Util.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.applib.services.dto;
+package org.apache.isis.applib.mixins.dto;
 
 class Util {
 
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
similarity index 80%
rename from core/applib/src/main/java/org/apache/isis/applib/services/dto/package-info.java
rename to core/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
index 55c325a..b5f3b54 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/package-info.java
@@ -18,11 +18,11 @@
  */
 
 /**
- * The {@link org.apache.isis.applib.services.dto.Dto} role interface is intended to be implemented by JAXB-annotated
+ * The {@link org.apache.isis.applib.mixins.dto.Dto} role interface is intended to be implemented by JAXB-annotated
  * view models, that is, annotated using <code>@XmlRootElement</code>. It enables the ability to download the XML and
- * XSD schema of those objects using two mixins, {@link org.apache.isis.applib.services.dto.Dto_downloadXml} and
- * {@link org.apache.isis.applib.services.dto.Dto_downloadXsd}.
+ * XSD schema of those objects using two mixins, {@link org.apache.isis.applib.mixins.dto.Dto_downloadXml} and
+ * {@link org.apache.isis.applib.mixins.dto.Dto_downloadXsd}.
  *
  * @see <a href="http://isis.apache.org/guides/rgcms/rgcms.html#_rgcms_classes_mixins_Dto">Classes, Methods &amp; Schema guide</a>
  */
-package org.apache.isis.applib.services.dto;
\ No newline at end of file
+package org.apache.isis.applib.mixins.dto;
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 6c9e02f..8a1e27c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.internal.base._Casts;
 import org.apache.isis.applib.internal.base._NullSafe;
 import org.apache.isis.applib.internal.collections._Maps;
-import org.apache.isis.applib.services.dto.Dto_downloadXsd;
+import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
 import org.apache.isis.applib.util.JaxbUtil;
 
 public interface JaxbService {

-- 
To stop receiving notification emails like this one, please contact
ahuber@apache.org.