Skip to content

Commit

Permalink
Revert part of 1fb222b
Browse files Browse the repository at this point in the history
Related to PETALSSTUD-327: we don't deprecate address yet actually.
  • Loading branch information
victornoel committed Oct 27, 2016
1 parent 1fb222b commit f138d97
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 510 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@
<details key="kind" value="element"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="wsaTo" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"
unsettable="true" derived="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#group:0"/>
<details key="namespace" value="##targetNamespace"/>
<details key="kind" value="element"/>
<details key="name" value="wsa-to"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="wsaReplyTo" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#group:0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute soap.ecore#//SoapProvides/httpsTruststorePassword"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute soap.ecore#//SoapProvides/httpsKeystoreFile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute soap.ecore#//SoapProvides/httpsKeystorePassword"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute soap.ecore#//SoapProvides/wsaTo"/>
</genClasses>
<genClasses ecoreClass="soap.ecore#//SoapConsumes">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute soap.ecore#//SoapConsumes/soapServiceName"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/******************************************************************************
* Copyright (c) 2011-2016, Linagora
* Copyright (c) 2011-2013, Linagora
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand All @@ -9,7 +9,7 @@
* Contributors:
* Linagora - initial API and implementation
*******************************************************************************/


package com.ebmwebsourcing.petals.services.soap.soap;

import com.ebmwebsourcing.petals.services.cdk.cdk5.Cdk5Package;
Expand Down Expand Up @@ -196,23 +196,14 @@ public interface SoapPackage extends EPackage {
*/
int SOAP_PROVIDES__ADDRESS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 0;

/**
* The feature id for the '<em><b>Wsa To</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int SOAP_PROVIDES__WSA_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 1;

/**
* The feature id for the '<em><b>Wsa Reply To</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int SOAP_PROVIDES__WSA_REPLY_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 2;
int SOAP_PROVIDES__WSA_REPLY_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 1;

/**
* The feature id for the '<em><b>Wsa From</b></em>' attribute.
Expand All @@ -221,7 +212,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__WSA_FROM = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 3;
int SOAP_PROVIDES__WSA_FROM = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 2;

/**
* The feature id for the '<em><b>Wsa Fault To</b></em>' attribute.
Expand All @@ -230,7 +221,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__WSA_FAULT_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 4;
int SOAP_PROVIDES__WSA_FAULT_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 3;

/**
* The feature id for the '<em><b>Soap Version</b></em>' attribute.
Expand All @@ -239,7 +230,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__SOAP_VERSION = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 5;
int SOAP_PROVIDES__SOAP_VERSION = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 4;

/**
* The feature id for the '<em><b>Chunked Mode</b></em>' attribute.
Expand All @@ -248,7 +239,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__CHUNKED_MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 6;
int SOAP_PROVIDES__CHUNKED_MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 5;

/**
* The feature id for the '<em><b>Synchonous Timeout</b></em>' attribute.
Expand All @@ -257,7 +248,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__SYNCHONOUS_TIMEOUT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 7;
int SOAP_PROVIDES__SYNCHONOUS_TIMEOUT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 6;

/**
* The feature id for the '<em><b>Cleanup Transport</b></em>' attribute.
Expand All @@ -266,7 +257,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__CLEANUP_TRANSPORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 8;
int SOAP_PROVIDES__CLEANUP_TRANSPORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 7;

/**
* The feature id for the '<em><b>Mode</b></em>' attribute.
Expand All @@ -275,7 +266,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 9;
int SOAP_PROVIDES__MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 8;

/**
* The feature id for the '<em><b>Proxy Host</b></em>' attribute.
Expand All @@ -284,7 +275,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__PROXY_HOST = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 10;
int SOAP_PROVIDES__PROXY_HOST = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 9;

/**
* The feature id for the '<em><b>Proxy Port</b></em>' attribute.
Expand All @@ -293,7 +284,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__PROXY_PORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 11;
int SOAP_PROVIDES__PROXY_PORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 10;

/**
* The feature id for the '<em><b>Proxy User</b></em>' attribute.
Expand All @@ -302,7 +293,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__PROXY_USER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 12;
int SOAP_PROVIDES__PROXY_USER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 11;

/**
* The feature id for the '<em><b>Proxy Password</b></em>' attribute.
Expand All @@ -311,7 +302,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__PROXY_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 13;
int SOAP_PROVIDES__PROXY_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 12;

/**
* The feature id for the '<em><b>Proxy Domain</b></em>' attribute.
Expand All @@ -320,7 +311,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__PROXY_DOMAIN = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 14;
int SOAP_PROVIDES__PROXY_DOMAIN = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 13;

/**
* The feature id for the '<em><b>Headers Filter</b></em>' attribute.
Expand All @@ -329,7 +320,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HEADERS_FILTER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 15;
int SOAP_PROVIDES__HEADERS_FILTER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 14;

/**
* The feature id for the '<em><b>Inject Headers</b></em>' attribute.
Expand All @@ -338,7 +329,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__INJECT_HEADERS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 16;
int SOAP_PROVIDES__INJECT_HEADERS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 15;

/**
* The feature id for the '<em><b>Headers To Inject</b></em>' attribute.
Expand All @@ -347,7 +338,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HEADERS_TO_INJECT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 17;
int SOAP_PROVIDES__HEADERS_TO_INJECT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 16;

/**
* The feature id for the '<em><b>Http Basic Auth Username</b></em>' attribute.
Expand All @@ -356,7 +347,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTP_BASIC_AUTH_USERNAME = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 18;
int SOAP_PROVIDES__HTTP_BASIC_AUTH_USERNAME = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 17;

/**
* The feature id for the '<em><b>Http Basic Auth Password</b></em>' attribute.
Expand All @@ -365,7 +356,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTP_BASIC_AUTH_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 19;
int SOAP_PROVIDES__HTTP_BASIC_AUTH_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 18;

/**
* The feature id for the '<em><b>Enable Compatibility For</b></em>' attribute.
Expand All @@ -374,7 +365,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__ENABLE_COMPATIBILITY_FOR = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 20;
int SOAP_PROVIDES__ENABLE_COMPATIBILITY_FOR = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 19;

/**
* The feature id for the '<em><b>Enable Wsa</b></em>' attribute.
Expand All @@ -383,7 +374,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__ENABLE_WSA = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 21;
int SOAP_PROVIDES__ENABLE_WSA = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 20;

/**
* The feature id for the '<em><b>Https Truststore File</b></em>' attribute.
Expand All @@ -392,7 +383,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTPS_TRUSTSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 22;
int SOAP_PROVIDES__HTTPS_TRUSTSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 21;

/**
* The feature id for the '<em><b>Https Truststore Password</b></em>' attribute.
Expand All @@ -401,7 +392,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTPS_TRUSTSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 23;
int SOAP_PROVIDES__HTTPS_TRUSTSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 22;

/**
* The feature id for the '<em><b>Https Keystore File</b></em>' attribute.
Expand All @@ -410,7 +401,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTPS_KEYSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 24;
int SOAP_PROVIDES__HTTPS_KEYSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 23;

/**
* The feature id for the '<em><b>Https Keystore Password</b></em>' attribute.
Expand All @@ -419,7 +410,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 25;
int SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 24;

/**
* The number of structural features of the '<em>Provides</em>' class.
Expand All @@ -428,7 +419,7 @@ public interface SoapPackage extends EPackage {
* @generated
* @ordered
*/
int SOAP_PROVIDES_FEATURE_COUNT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 26;
int SOAP_PROVIDES_FEATURE_COUNT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 25;

/**
* The meta object id for the '{@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapConsumesImpl <em>Consumes</em>}' class.
Expand Down Expand Up @@ -1171,17 +1162,6 @@ public interface SoapPackage extends EPackage {
*/
EAttribute getSoapProvides_HttpsKeystorePassword();

/**
* Returns the meta object for the attribute '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo <em>Wsa To</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Wsa To</em>'.
* @see com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo()
* @see #getSoapProvides()
* @generated
*/
EAttribute getSoapProvides_WsaTo();

/**
* Returns the meta object for class '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapConsumes <em>Consumes</em>}'.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -1695,14 +1675,6 @@ interface Literals {
*/
EAttribute SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = eINSTANCE.getSoapProvides_HttpsKeystorePassword();

/**
* The meta object literal for the '<em><b>Wsa To</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EAttribute SOAP_PROVIDES__WSA_TO = eINSTANCE.getSoapProvides_WsaTo();

/**
* The meta object literal for the '{@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapConsumesImpl <em>Consumes</em>}' class.
* <!-- begin-user-doc -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/******************************************************************************
* Copyright (c) 2011-2016, Linagora
* Copyright (c) 2011-2013, Linagora
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand All @@ -9,7 +9,7 @@
* Contributors:
* Linagora - initial API and implementation
*******************************************************************************/


package com.ebmwebsourcing.petals.services.soap.soap;

import com.ebmwebsourcing.petals.services.cdk.cdk5.CDK5Provides;
Expand All @@ -23,7 +23,6 @@
* The following features are supported:
* <ul>
* <li>{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getAddress <em>Address</em>}</li>
* <li>{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo <em>Wsa To</em>}</li>
* <li>{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaReplyTo <em>Wsa Reply To</em>}</li>
* <li>{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaFrom <em>Wsa From</em>}</li>
* <li>{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaFaultTo <em>Wsa Fault To</em>}</li>
Expand Down Expand Up @@ -874,58 +873,4 @@ public interface SoapProvides extends CDK5Provides {
*/
void setHttpsKeystorePassword(String value);

/**
* Returns the value of the '<em><b>Wsa To</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Wsa To</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Wsa To</em>' attribute.
* @see #isSetWsaTo()
* @see #unsetWsaTo()
* @see #setWsaTo(String)
* @see com.ebmwebsourcing.petals.services.soap.soap.SoapPackage#getSoapProvides_WsaTo()
* @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" derived="true"
* extendedMetaData="group='#group:0' namespace='##targetNamespace' kind='element'"
* @generated
*/
String getWsaTo();

/**
* Sets the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo <em>Wsa To</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Wsa To</em>' attribute.
* @see #isSetWsaTo()
* @see #unsetWsaTo()
* @see #getWsaTo()
* @generated
*/
void setWsaTo(String value);

/**
* Unsets the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo <em>Wsa To</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetWsaTo()
* @see #getWsaTo()
* @see #setWsaTo(String)
* @generated
*/
void unsetWsaTo();

/**
* Returns whether the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo <em>Wsa To</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Wsa To</em>' attribute is set.
* @see #unsetWsaTo()
* @see #getWsaTo()
* @see #setWsaTo(String)
* @generated
*/
boolean isSetWsaTo();

} // SoapProvides
Loading

0 comments on commit f138d97

Please sign in to comment.