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/22 11:47:38 UTC
[03/14] isis git commit: ISIS-1386: suitable namespace prefixes for
'aim', 'cmd', 'common' memento XML instances.
ISIS-1386: suitable namespace prefixes for 'aim', 'cmd', 'common' memento XML instances.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a335327
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a335327
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a335327
Branch: refs/heads/ISIS-1291
Commit: 0a335327e3110249b61a46f3b24d42063c964922
Parents: a04ef99
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 21 13:18:10 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 21 13:34:50 2016 +0100
----------------------------------------------------------------------
core/schema/pom.xml | 11 +++++++++++
.../org/apache/isis/schema/aim/aim-2.0-binding.xml | 16 +++++++++++++++-
.../org/apache/isis/schema/cmd/cmd-1.0-binding.xml | 13 ++++++++++++-
3 files changed, 38 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0a335327/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 50233c0..5417339 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -82,9 +82,20 @@
<bindingIncludes>
<bindingInclude>aim-2.0-binding.xml</bindingInclude>
</bindingIncludes>
+ <args>
+ <arg>-extension</arg>
+ <arg>-Xnamespace-prefix</arg>
+ </args>
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-namespace-prefix</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/0a335327/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-2.0-binding.xml
----------------------------------------------------------------------
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-2.0-binding.xml b/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-2.0-binding.xml
index c8cf1ed..67d8e60 100644
--- a/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-2.0-binding.xml
+++ b/core/schema/src/main/resources/org/apache/isis/schema/aim/aim-2.0-binding.xml
@@ -19,7 +19,12 @@
-->
<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- jaxb:version="2.0">
+ jaxb:version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+ http://jaxb2-commons.dev.java.net/namespace-prefix http://java.net/projects/jaxb2-commons/sources/svn/content/namespace-prefix/trunk/src/main/resources/prefix-namespace-schema.xsd"
+>
<jaxb:bindings schemaLocation="aim-2.0.xsd">
<jaxb:schemaBindings>
<!--
@@ -28,6 +33,9 @@
-->
<jaxb:package name="org.apache.isis.schema.aim.v2"/>
</jaxb:schemaBindings>
+ <jaxb:bindings>
+ <namespace:prefix name="aim" />
+ </jaxb:bindings>
</jaxb:bindings>
<!-- since aim-2.0.xsd does an xs:import of common-1.0.xsd, we need to specify common's package bindings -->
<jaxb:bindings schemaLocation="../common/common-1.0.xsd">
@@ -38,6 +46,9 @@
-->
<jaxb:package name="org.apache.isis.schema.common.v1"/>
</jaxb:schemaBindings>
+ <jaxb:bindings>
+ <namespace:prefix name="common" />
+ </jaxb:bindings>
</jaxb:bindings>
<!-- since aim-2.0.xsd does an xs:import of cmd-1.0.xsd, we need to specify common's package bindings -->
<jaxb:bindings schemaLocation="../cmd/cmd-1.0.xsd">
@@ -48,5 +59,8 @@
-->
<jaxb:package name="org.apache.isis.schema.cmd.v1"/>
</jaxb:schemaBindings>
+ <jaxb:bindings>
+ <namespace:prefix name="cmd" />
+ </jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/0a335327/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.0-binding.xml
----------------------------------------------------------------------
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.0-binding.xml b/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.0-binding.xml
index 8e91ef3..1454688 100644
--- a/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.0-binding.xml
+++ b/core/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.0-binding.xml
@@ -19,7 +19,12 @@
-->
<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- jaxb:version="2.0">
+ jaxb:version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+ http://jaxb2-commons.dev.java.net/namespace-prefix http://java.net/projects/jaxb2-commons/sources/svn/content/namespace-prefix/trunk/src/main/resources/prefix-namespace-schema.xsd"
+ >
<jaxb:bindings schemaLocation="cmd-1.0.xsd">
<jaxb:schemaBindings>
<!--
@@ -28,6 +33,9 @@
-->
<jaxb:package name="org.apache.isis.schema.cmd.v1"/>
</jaxb:schemaBindings>
+ <jaxb:bindings>
+ <namespace:prefix name="cmd" />
+ </jaxb:bindings>
</jaxb:bindings>
<!-- since cmd-1.0.xsd does an xs:import of common-1.0.xsd, we need to specify common's package bindings -->
<jaxb:bindings schemaLocation="../common/common-1.0.xsd">
@@ -38,5 +46,8 @@
-->
<jaxb:package name="org.apache.isis.schema.common.v1"/>
</jaxb:schemaBindings>
+ <jaxb:bindings>
+ <namespace:prefix name="common" />
+ </jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>
\ No newline at end of file