From: remillet <remillet@yahoo.com>
Date: Thu, 9 Nov 2017 21:03:02 +0000 (-0800)
Subject: DRYD-122: Made 'rel' the namespace prefix for the relations-common-list type.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f3b207685f1338e56a373e319c1a2ec5202cfe1c;p=tmp%2Fjakarta-migration.git

DRYD-122: Made 'rel' the namespace prefix for the relations-common-list type.
---

diff --git a/pom.xml b/pom.xml
index b43b46c2a..0119afe1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,6 +219,14 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+	    <pluginRepository>
+	        <id>plugins-snapshot-local</id>
+	        <name>plugins-snapshot-local</name>
+	        <url>http://nightly.collectionspace.org:8081/artifactory/plugins-snapshot-local</url>
+	        <snapshots>
+	            <enabled>true</enabled>
+	        </snapshots>
+	    </pluginRepository>
 		<pluginRepository>
 			<id>repo1</id>
 			<name>Maven repo1</name>
diff --git a/services/jaxb/src/main/resources/bindings.xml b/services/jaxb/src/main/resources/bindings.xml
new file mode 100644
index 000000000..76f7b6ad0
--- /dev/null
+++ b/services/jaxb/src/main/resources/bindings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<jxb:bindings version="1.0"
+    xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+    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 https://raw.githubusercontent.com/Siggen/jaxb2-namespace-prefix/master/src/main/resources/prefix-namespace-schema.xsd">
+
+    <jxb:bindings schemaLocation="relations_common.xsd">
+        <jxb:bindings>
+            <namespace:prefix name="rel" />
+            <!-- Additional @XmlNs prefix declarations to take effect for this schema/package -->
+            <namespace:prefix name="xsi" namespaceURI="http://www.w3.org/2001/XMLSchema-instance" />
+        </jxb:bindings>
+    </jxb:bindings>
+    
+</jxb:bindings>
\ No newline at end of file
diff --git a/services/pom.xml b/services/pom.xml
index 58890af75..09bfc6657 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -180,10 +180,17 @@
 							</goals>
 							<configuration>
 								<extension>true</extension>
+								<schemaDirectory>src/main/resources</schemaDirectory>
+								<schemaIncludes>
+									<include>*.xsd</include>
+								</schemaIncludes>
+								<bindingDirectory>src/main/resources</bindingDirectory>
 								<bindingIncludes>
-                					<include>xbindings.xjb</include>
+                					<include>bindings.xml</include>
               					</bindingIncludes>
 								<args>
+									<arg>-extension</arg>
+									<arg>-Xnamespace-prefix</arg>
 								 	<arg>-Xannotate</arg> 
 								 	<arg>-verbose</arg> 
 									<!-- <arg>-XtoString</arg> -->
@@ -211,6 +218,13 @@
 							</configuration>
 						</execution>
 					</executions>
+					<dependencies>
+						<dependency>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-namespace-prefix</artifactId> <!-- Used to force a specific namespace prefix specified in src/main/resource/bindings.xml -->
+							<version>1.4-snapshot</version>
+						</dependency>
+					</dependencies>
 				</plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>