You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/04/21 14:38:23 UTC
isis git commit: ISIS-1387: ensure that the geneated bs3 layout XML
files have suitable namespace prefix 'bs3:' and 'cpt:'
Repository: isis
Updated Branches:
refs/heads/master 6bff3d31f -> 4846c96da
ISIS-1387: ensure that the geneated bs3 layout XML files have suitable namespace prefix 'bs3:' and 'cpt:'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4846c96d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4846c96d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4846c96d
Branch: refs/heads/master
Commit: 4846c96dadceedf9c76df7058d9e0ac62e2c33b4
Parents: 6bff3d3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 21 13:17:19 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 21 13:33:52 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/layout/component/package-info.java | 7 +++++--
.../isis/applib/layout/grid/bootstrap3/package-info.java | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4846c96d/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
index 3b17836..49bcff5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/component/package-info.java
@@ -29,8 +29,11 @@
*/
@javax.xml.bind.annotation.XmlSchema(
namespace = "http://isis.apache.org/applib/layout/component",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
- // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why...
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ xmlns = {
+ @javax.xml.bind.annotation.XmlNs(
+ namespaceURI = "http://isis.apache.org/applib/layout/component", prefix = "cpt")
+ } // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why...
//, location = ..."http://isis.apache.org/schema/metamodel/layout/common/common.xsd"
)
package org.apache.isis.applib.layout.component;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/4846c96d/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
index 3658ae9..6fcc0e7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/package-info.java
@@ -29,6 +29,9 @@
*/
@javax.xml.bind.annotation.XmlSchema(
namespace = "http://isis.apache.org/applib/layout/grid/bootstrap3",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
-)
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ xmlns = {
+ @javax.xml.bind.annotation.XmlNs(
+ namespaceURI = "http://isis.apache.org/applib/layout/grid/bootstrap3", prefix = "bs3")
+ })
package org.apache.isis.applib.layout.grid.bootstrap3;
\ No newline at end of file