You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jb...@apache.org on 2016/02/09 10:45:35 UTC
[1/7] cxf-fediz git commit: [FEDIZ-152] Enforce Cookies only for user
sessions tracking
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes 84088b202 -> 9c4189275
[FEDIZ-152] Enforce Cookies only for user sessions tracking
Conflicts:
services/idp/src/main/webapp/WEB-INF/web.xml
services/oidc/src/main/webapp/WEB-INF/web.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/af587f11
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/af587f11
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/af587f11
Branch: refs/heads/1.2.x-fixes
Commit: af587f112c59dbeedb4ecc5c2f26f885b3c98434
Parents: 84088b2
Author: Jan Bernhardt <jb...@talend.com>
Authored: Wed Feb 3 15:05:59 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:04:34 2016 +0100
----------------------------------------------------------------------
services/idp/src/main/webapp/WEB-INF/web.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/af587f11/services/idp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/web.xml b/services/idp/src/main/webapp/WEB-INF/web.xml
index a65068a..9c343d4 100644
--- a/services/idp/src/main/webapp/WEB-INF/web.xml
+++ b/services/idp/src/main/webapp/WEB-INF/web.xml
@@ -25,6 +25,10 @@ under the License.
<description>Fediz IDP</description>
<display-name>Fediz IDP</display-name>
+ <session-config>
+ <tracking-mode>COOKIE</tracking-mode>
+ </session-config>
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext.xml</param-value>
[4/7] cxf-fediz git commit: [FEDIZ-53] Fix whr parameter reading
Posted by jb...@apache.org.
[FEDIZ-53] Fix whr parameter reading
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b272bfa4
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b272bfa4
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b272bfa4
Branch: refs/heads/1.2.x-fixes
Commit: b272bfa49f4a465452d5ca02f734028a64ea0db0
Parents: 71a1c65
Author: Jan Bernhardt <jb...@talend.com>
Authored: Thu Jan 7 11:31:02 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:23:54 2016 +0100
----------------------------------------------------------------------
.../cxf/fediz/core/handler/HomeRealmCallbackHandler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b272bfa4/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java
index a87e2a0..1aa880a 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java
@@ -24,8 +24,8 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.core.spi.HomeRealmCallback;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,11 +39,11 @@ public class HomeRealmCallbackHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof HomeRealmCallback) {
HomeRealmCallback callback = (HomeRealmCallback) callbacks[i];
- String homeRealm = (String)callback.getRequest().getAttribute("whr");
+ String homeRealm = (String)callback.getRequest().getParameter(FederationConstants.PARAM_HOME_REALM);
if (homeRealm == null || homeRealm.length() == 0) {
LOG.debug("No home realm found in request");
} else {
- LOG.info("Home realm '" + homeRealm + "' found in request");
+ LOG.info("Home realm '{}' found in request", homeRealm);
callback.setHomeRealm(homeRealm);
}
[7/7] cxf-fediz git commit: Fix Import
Posted by jb...@apache.org.
Fix Import
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9c418927
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9c418927
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9c418927
Branch: refs/heads/1.2.x-fixes
Commit: 9c4189275d27fa3ab5a1df080cbc1ab2e15779b9
Parents: 2267bf1
Author: Jan Bernhardt <jb...@talend.com>
Authored: Tue Feb 9 09:20:54 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 09:20:54 2016 +0100
----------------------------------------------------------------------
services/idp/src/main/webapp/WEB-INF/idplist.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9c418927/services/idp/src/main/webapp/WEB-INF/idplist.jsp
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idplist.jsp b/services/idp/src/main/webapp/WEB-INF/idplist.jsp
index 5036a96..a6aa358 100644
--- a/services/idp/src/main/webapp/WEB-INF/idplist.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/idplist.jsp
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@page import="java.util.Map"%>
+<%@page import="java.util.List"%>
<%@page import="org.apache.cxf.fediz.service.idp.domain.Idp"%>
<%@page import="org.apache.cxf.fediz.service.idp.domain.TrustedIdp"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
[2/7] cxf-fediz git commit: [FEDIZ-147] Disable local IDP from home
realm selection if isUseCurrentIdp() is set to false
Posted by jb...@apache.org.
[FEDIZ-147] Disable local IDP from home realm selection if isUseCurrentIdp() is set to false
Conflicts:
services/idp/src/main/webapp/WEB-INF/idplist.jsp
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b6bc005f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b6bc005f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b6bc005f
Branch: refs/heads/1.2.x-fixes
Commit: b6bc005f41f91a82db43cf04dd4f217cb185574a
Parents: af587f1
Author: Jan Bernhardt <jb...@talend.com>
Authored: Thu Jan 21 10:28:09 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:12:33 2016 +0100
----------------------------------------------------------------------
services/idp/src/main/webapp/WEB-INF/idplist.jsp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b6bc005f/services/idp/src/main/webapp/WEB-INF/idplist.jsp
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idplist.jsp b/services/idp/src/main/webapp/WEB-INF/idplist.jsp
index dc87376..5036a96 100644
--- a/services/idp/src/main/webapp/WEB-INF/idplist.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/idplist.jsp
@@ -13,14 +13,13 @@
<i>Where are you from? Please, select one Identity Provider in the list which is able to authenticate you. </i>
<form:form method="POST" id="idplist" name="idplist">
<br />
- <%
- Idp idpConfig = (Idp)request.getAttribute("idpConfig");
- %>
+ <% Idp idp = (Idp)request.getAttribute("idpConfig");
+ List<TrustedIdp> trustedIDPs = idp.getTrustedIdps(); %>
<select name="whr">
- <option value="<%=idpConfig.getRealm()%>" selected="selected" ><%=idpConfig.getServiceDescription()%></option>
- <%
- for (TrustedIdp trustedIDP : idpConfig.getTrustedIdps()) {
- %>
+ <% if (idp.isUseCurrentIdp()) { %>
+ <option value="<%=idp.getRealm()%>" selected="selected" ><%=idp.getServiceDescription()%></option>
+ <% }
+ for (TrustedIdp trustedIDP : trustedIDPs) { %>
<option value="<%=trustedIDP.getRealm()%>"><%=trustedIDP.getDescription()%></option>
<% } %>
</select>
[3/7] cxf-fediz git commit: [Fediz-146] Disabling wtrealm check for
signin response
Posted by jb...@apache.org.
[Fediz-146] Disabling wtrealm check for signin response
Conflicts:
services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/71a1c653
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/71a1c653
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/71a1c653
Branch: refs/heads/1.2.x-fixes
Commit: 71a1c653c897447d70b23407ced38dfb067132db
Parents: b6bc005
Author: Jan Bernhardt <jb...@talend.com>
Authored: Wed Jan 20 14:50:54 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:19:37 2016 +0100
----------------------------------------------------------------------
.../main/webapp/WEB-INF/federation-validate-request.xml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/71a1c653/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
index 6970a39..ffded3a 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
@@ -47,12 +47,10 @@
</decision-state>
<decision-state id="selectWsFedProcess">
- <if
- test="requestParameters.wtrealm == null or requestParameters.wtrealm.length() == 0"
- then="viewBadRequest" />
- <if
- test="requestParameters.wresult == null or requestParameters.wresult.isEmpty()"
- then="signinRequest" else="signinResponse" />
+ <if test="requestParameters.wresult != null and !requestParameters.wresult.isEmpty()"
+ then="signinResponse" />
+ <if test="requestParameters.wtrealm != null and !requestParameters.wtrealm.isEmpty()"
+ then="signinRequest" else="viewBadRequest" />
</decision-state>
<decision-state id="selectSAMLProcess">
@@ -63,7 +61,7 @@
test="requestParameters.SAMLResponse == null or requestParameters.SAMLResponse.length() == 0"
then="viewBadRequest" else="signinResponse" />
</decision-state>
-
+
<decision-state id="selectSignOutProcess">
<on-entry>
<evaluate expression="@org.apache.cxf.fediz.service.idp.util.WebUtils@getHttpHeader(flowRequestContext, 'Referer')" result="flowScope.wreply"/>
[5/7] cxf-fediz git commit: [FEDIZ-144] Added Spring EL support for
HomeRealm Discovery
Posted by jb...@apache.org.
[FEDIZ-144] Added Spring EL support for HomeRealm Discovery
Conflicts:
services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6a6ffd0b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6a6ffd0b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6a6ffd0b
Branch: refs/heads/1.2.x-fixes
Commit: 6a6ffd0b9e97177b276a8dabf8c4aea7b345a3a3
Parents: b272bfa
Author: Jan Bernhardt <jb...@talend.com>
Authored: Tue Jan 19 12:19:48 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:26:42 2016 +0100
----------------------------------------------------------------------
.../idp/beans/ProcessHRDSExpressionAction.java | 46 +++++++++++++++-----
.../idp/src/main/resources/entities-realma.xml | 9 ++--
.../WEB-INF/federation-signin-request.xml | 44 +++++--------------
3 files changed, 51 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6a6ffd0b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java
index 5389247..088af6c 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/ProcessHRDSExpressionAction.java
@@ -18,31 +18,57 @@
*/
package org.apache.cxf.fediz.service.idp.beans;
+import javax.servlet.http.Cookie;
+
+import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.util.WebUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.stereotype.Component;
import org.springframework.webflow.execution.RequestContext;
/**
* This class is responsible to process Home Realm Discovery Service Expression.
*/
-
+@Component
public class ProcessHRDSExpressionAction {
private static final String IDP_CONFIG = "idpConfig";
- private static final Logger LOG = LoggerFactory
- .getLogger(ProcessHRDSExpressionAction.class);
+
+ private static final Logger LOG = LoggerFactory.getLogger(ProcessHRDSExpressionAction.class);
+
+ @Autowired
+ private HomeRealmReminder homeRealmReminder;
public String submit(RequestContext context) {
+ // Check if home realm is known already
+ Cookie whrCookie = homeRealmReminder.readCookie(context);
+ if (whrCookie != null) {
+ LOG.debug("WHR Cookie set: {}", whrCookie);
+ return whrCookie.getValue();
+ }
+
+ // Check if custom HRDS is defined
Idp idpConfig = (Idp)WebUtils.getAttributeFromFlowScope(context, IDP_CONFIG);
String hrds = idpConfig.getHrds();
- //TODO
- if (hrds == null) {
- LOG.info("HRDS is null (Mock).");
- return "";
+
+ if (hrds != null) {
+ LOG.debug("HomeRealmDiscoveryService EL: {}", hrds);
+ ExpressionParser parser = new SpelExpressionParser();
+ Expression exp = parser.parseExpression(hrds);
+ String result = exp.getValue(context, String.class);
+ LOG.info("Realm resolved by HomeRealmDiscoveryService: {}", result);
+ return result;
}
- LOG.info("HRDS is not null (Mock).");
- return "some-whr-value";
+
+ // Return whr parameter unchanged
+ String whr = (String)WebUtils.getAttributeFromFlowScope(context, FederationConstants.PARAM_HOME_REALM);
+ LOG.debug("No custom homeRealm handling, using whr parameter as provided in request: {}", whr);
+ return whr;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6a6ffd0b/services/idp/src/main/resources/entities-realma.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/entities-realma.xml b/services/idp/src/main/resources/entities-realma.xml
index 995b92d..2ccb07f 100644
--- a/services/idp/src/main/resources/entities-realma.xml
+++ b/services/idp/src/main/resources/entities-realma.xml
@@ -38,10 +38,8 @@
<property name="rpSingleSignOutConfirmation" value="true"/>
<property name="supportedProtocols">
<util:list>
- <value>http://docs.oasis-open.org/wsfed/federation/200706
- </value>
- <value>http://docs.oasis-open.org/ws-sx/ws-trust/200512
- </value>
+ <value>http://docs.oasis-open.org/wsfed/federation/200706</value>
+ <value>http://docs.oasis-open.org/ws-sx/ws-trust/200512</value>
</util:list>
</property>
<property name="tokenTypesOffered">
@@ -52,7 +50,8 @@
</property>
<property name="authenticationURIs">
<util:map>
- <entry key="default" value="federation/up" />
+ <entry key="default"
+ value="federation/up" />
<entry key="http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/SslAndKey"
value="federation/krb" />
<entry key="http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/default"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6a6ffd0b/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml b/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
index 1231444..08e1d2b 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
@@ -32,51 +32,29 @@
<input name="whr" />
<decision-state id="checkHRDSEnabled">
- <if test="true" then="checkWhrInSigninRequest" else="checkDefaultToThisIDP" />
+ <if test="true" then="processHRDSExpression" else="checkDefaultToThisIDP" />
</decision-state>
- <decision-state id="checkWhrInSigninRequest">
- <if test="flowScope.whr == null or flowScope.whr.trim().isEmpty()"
- then="checkHomeRealm" else="checkIsThisIDP" />
+ <decision-state id="checkDefaultToThisIDP">
+ <if test="flowScope.idpConfig.isUseCurrentIdp()" then="checkWauthTypeSupported"
+ else="viewBadRequest" />
</decision-state>
- <decision-state id="checkHomeRealm">
- <if test="homeRealmReminder.readCookie(flowRequestContext) == null"
- then="processHRDSExpression" else="restoreHomeRealm" />
+ <decision-state id="processHRDSExpression">
+ <on-entry>
+ <evaluate expression="processHRDSExpressionAction.submit(flowRequestContext)" result="flowScope.whr" />
+ </on-entry>
+ <if test="flowScope.whr == null or flowScope.whr.trim().isEmpty()"
+ then="provideIDPListForUser" else="checkIsThisIDP" />
</decision-state>
- <action-state id="restoreHomeRealm">
- <evaluate
- expression="homeRealmReminder.readCookie(flowRequestContext).value"
- result="flowScope.whr" />
- <transition to="checkIsThisIDP" />
- </action-state>
-
- <action-state id="processHRDSExpression">
- <!-- TODO -->
- <evaluate
- expression="processHRDSExpressionAction.submit(flowRequestContext)"
- result="flowScope.whr" />
- <transition on="" to="provideIDPListForUser" />
- <transition to="checkIsThisIDP">
- <evaluate
- expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.whr)" />
- </transition>
- </action-state>
-
<decision-state id="provideIDPListForUser">
- <if
- test="flowScope.idpConfig.trustedIdps == null or idpConfig.trustedIdps.isEmpty()"
+ <if test="flowScope.idpConfig.trustedIdps == null or idpConfig.trustedIdps.isEmpty()"
then="checkDefaultToThisIDP" />
<if test="flowScope.idpConfig.isProvideIdpList() == false"
then="checkDefaultToThisIDP" else="showIDPList" />
</decision-state>
- <decision-state id="checkDefaultToThisIDP">
- <if test="flowScope.idpConfig.isUseCurrentIdp()" then="checkWauthTypeSupported"
- else="viewBadRequest" />
- </decision-state>
-
<view-state id="showIDPList" view="idplist" model="trustedIDPSelection">
<var name="trustedIDPSelection"
class="org.apache.cxf.fediz.service.idp.model.TrustedIDPSelection" />
[6/7] cxf-fediz git commit: Ensure correct encoding of generated jaxb
files
Posted by jb...@apache.org.
Ensure correct encoding of generated jaxb files
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/2267bf19
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2267bf19
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2267bf19
Branch: refs/heads/1.2.x-fixes
Commit: 2267bf196b3eacca83c43df763fd474f981c7f11
Parents: 6a6ffd0
Author: Jan Bernhardt <jb...@talend.com>
Authored: Tue Feb 9 08:39:57 2016 +0100
Committer: Jan Bernhardt <jb...@talend.com>
Committed: Tue Feb 9 08:39:57 2016 +0100
----------------------------------------------------------------------
plugins/core/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2267bf19/plugins/core/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml
index ca4beb7..7564fbb 100644
--- a/plugins/core/pom.xml
+++ b/plugins/core/pom.xml
@@ -95,6 +95,8 @@
<packagename>org.apache.cxf.fediz.core.config.jaxb</packagename>
<extensionArgs>
<arg>-Xdv</arg>
+ <arg>-encoding</arg>
+ <arg>UTF-8</arg>
</extensionArgs>
</xsdOption>
</xsdOptions>