This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 1f9fd5c Picking up XJC SNAPSHOT + adding a test for CXFXJC-17
1f9fd5c is described below
commit 1f9fd5c430f176941e86a0d6555cc138ed00af14
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Sep 14 12:00:58 2018 +0100
Picking up XJC SNAPSHOT + adding a test for CXFXJC-17
(cherry picked from commit 84c238e701131b6c265a1d6fbd8f691fd37d7a00)
---
pom.xml | 2 +-
rt/ws/security/pom.xml | 5 ++++-
rt/ws/security/src/main/model/binding.xjb | 5 -----
rt/ws/security/src/main/model/xmlsig.xjb | 33 +++++++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f6fbc1..5278946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>3.4.1</cxf.build-utils.version>
- <cxf.xjc-utils.version>3.2.2</cxf.xjc-utils.version>
+ <cxf.xjc-utils.version>3.2.3-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 015a37b..ec493e3 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -181,7 +181,10 @@
<xsdOption>
<extension>true</extension>
<xsd>${basedir}/src/main/model/ws-trust-1.3.xsd</xsd>
-
<bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile>
+ <bindingFiles>
+
<bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile>
+
<bindingFile>${basedir}/src/main/model/xmlsig.xjb</bindingFile>
+ </bindingFiles>
<extensionArgs>
<extensionArg>-Xdv</extensionArg>
</extensionArgs>
diff --git a/rt/ws/security/src/main/model/binding.xjb
b/rt/ws/security/src/main/model/binding.xjb
index 8572adf..d0b2e88 100644
--- a/rt/ws/security/src/main/model/binding.xjb
+++ b/rt/ws/security/src/main/model/binding.xjb
@@ -58,11 +58,6 @@
<jaxb:package
name="org.apache.cxf.ws.security.sts.provider.model.secext"/>
</jaxb:schemaBindings>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="xmldsig-core-schema.xsd" node="/xs:schema">
- <jaxb:schemaBindings>
- <jaxb:package
name="org.apache.cxf.ws.security.sts.provider.model.xmldsig"/>
- </jaxb:schemaBindings>
- </jaxb:bindings>
<jaxb:bindings schemaLocation="ws-policy.xsd" node="/xs:schema">
<jaxb:schemaBindings map="false">
</jaxb:schemaBindings>
diff --git a/rt/ws/security/src/main/model/xmlsig.xjb
b/rt/ws/security/src/main/model/xmlsig.xjb
new file mode 100644
index 0000000..e84479d
--- /dev/null
+++ b/rt/ws/security/src/main/model/xmlsig.xjb
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<jaxb:bindings version="2.1"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
+ xmlns:wsa="http://www.w3.org/2005/08/addressing";
+ jaxb:extensionBindingPrefixes="xjc">
+
+ <jaxb:bindings schemaLocation="xmldsig-core-schema.xsd" node="/xs:schema">
+ <jaxb:schemaBindings>
+ <jaxb:package
name="org.apache.cxf.ws.security.sts.provider.model.xmldsig"/>
+ </jaxb:schemaBindings>
+ </jaxb:bindings>
+
+</jaxb:bindings>
