remove domain from security model

Security-filter-gen/POIService.security

 <?xml version="1.0" encoding="UTF-8"?>
 <security:SecurityModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:security="http://www.thalesgroup.com/chorevolution/spec/security">
-  <securitypolicyset name="SecurityPolicy" domainName="domain2"  serviceName="POI">
+  <securitypolicyset name="SecurityPolicy" serviceName="POI">
     <authentication name="authentication"/>
     <communication name="communication" SecuredCommunication="false"/>
   </securitypolicyset>

Security-filter-gen/SecModelGenAccountWithCred.security

 <?xml version="1.0" encoding="UTF-8"?>
 <security:SecurityModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:security="http://www.thalesgroup.com/chorevolution/spec/security">
-  <securitypolicyset name="SecurityPolicy"  domainName="domain2" serviceName="service1">
+  <securitypolicyset name="SecurityPolicy" serviceName="service1">
     <authentication name="authentication" AuthNTypeForwarded="GenericAccount"  genericAccount="account" genericCredential="password"/>
     <communication name="communication" SecuredCommunication="true"/>
   </securitypolicyset>

Security-filter-gen/SecModelGenAccountWithoutCred.security

 <?xml version="1.0" encoding="UTF-8"?>
 <security:SecurityModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:security="http://www.thalesgroup.com/chorevolution/spec/security">
-  <securitypolicyset name="SecurityPolicy"  domainName="domain2"  serviceName="service1">
+  <securitypolicyset name="SecurityPolicy" serviceName="service1">
     <authentication name="authentication" AuthNTypeForwarded="GenericAccount"/>
     <communication name="communication" SecuredCommunication="true"/>
   </securitypolicyset>

Security-filter-gen/SecModelUserAccount.security

 <?xml version="1.0" encoding="UTF-8"?>
 <security:SecurityModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:security="http://www.thalesgroup.com/chorevolution/spec/security">
-  <securitypolicyset name="SecurityPolicy" domainName="domain2"  serviceName="sc3">
+  <securitypolicyset name="SecurityPolicy"  serviceName="sc3">
     <authentication name="authentication"/>
     <communication name="communication" SecuredCommunication="false"/>
   </securitypolicyset>

Security-filter-gen/TrafficInformationService.security

 <?xml version="1.0" encoding="UTF-8"?>
 <security:SecurityModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:security="http://www.thalesgroup.com/chorevolution/spec/security">
-  <securitypolicyset name="SecurityPolicy"  domainName="domain2"  serviceName="TrafficInformation">
+  <securitypolicyset name="SecurityPolicy"  serviceName="TrafficInformation">
     <authentication name="authentication" AuthNTypeForwarded="GenericAccount"/>
     <communication name="communication" SecuredCommunication="true"/>
   </securitypolicyset>

Security-filter-impl/src/main/webapp/WEB-INF/policy.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Policy PolicyId="policyID" Version="2.0" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-unless-permit" xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17">
-    <Description>description</Description>
-    <Target/>
-    <Rule RuleId="ruleID" Effect="Permit">
-        <Description>description</Description>
-        <Target>
-            <AnyOf>
-                <AllOf>
-                    <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
-                        <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">test1</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="group" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
-                    </Match>
-                 </AllOf>
-                <AllOf>
-                     <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
-                        <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">test2</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="group" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
-                    </Match>
-                 </AllOf>
-                <AllOf>
-                     <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
-                        <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">group2</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="group" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
-                    </Match>
-                 </AllOf>
-            </AnyOf>
-        </Target>
-    </Rule>
-</Policy>
\ No newline at end of file