Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 558616 - [Passage] put .setup target platform definition in order #152

Merged
merged 2 commits into from
Feb 29, 2020
Merged

Bug 558616 - [Passage] put .setup target platform definition in order #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc9a16d
Bug 558616 - [Passage] put .setup target platform definition in order
ruspl-afed Feb 29, 2020
b350866
Bug 558616 - [Passage] put .setup target platform definition in order
ruspl-afed Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions bundles/org.eclipse.passage.lic.api/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.lic.api" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Bug 552819 - [Passage] org.eclipse.passage.lic.api.access.AccessManager#examinePermissons method name contains typo" id="926941240">
<message_arguments>
<message_argument value="0.7.0"/>
<message_argument value="0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/passage/lic/api/access/AccessManager.java" type="org.eclipse.passage.lic.api.access.AccessManager">
<filter comment="Bug 552819 - [Passage] org.eclipse.passage.lic.api.access.AccessManager#examinePermissons method name contains typo" id="403804204">
<message_arguments>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/access/AccessEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private AccessEvents() {
/**
* Sent when {@link FeaturePermission}s are expired
*
* @since 0.6
* @since 0.7
*/
public static final String PERMISSIONS_EXPIRED = TOPIC + TOPIC_SEP + "permissionsExpired"; //$NON-NLS-1$

Expand Down
11 changes: 11 additions & 0 deletions bundles/org.eclipse.passage.loc.api/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.api" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.0"/>
</message_arguments>
</filter>
</resource>
</component>
51 changes: 51 additions & 0 deletions bundles/org.eclipse.passage.loc.dashboard.ui/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.dashboard.ui" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.LocWorkbenchEmfforms">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.LocWorkbenchEmfforms"/>
<message_argument value="org.eclipse.passage.loc.dashboard.ui_0.5.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizard">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizard"/>
<message_argument value="org.eclipse.passage.loc.dashboard.ui_0.5.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizardPage">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizardPage"/>
<message_argument value="org.eclipse.passage.loc.dashboard.ui_0.5.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard"/>
<message_argument value="org.eclipse.passage.loc.dashboard.ui_0.5.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage"/>
<message_argument value="org.eclipse.passage.loc.dashboard.ui_0.5.100"/>
</message_arguments>
</filter>
</resource>
</component>
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.dashboard.ui
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.dashboard.ui;singleton:=true
Bundle-Version: 0.5.200.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down
2 changes: 1 addition & 1 deletion ...oc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicenseMailJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected IStatus run(IProgressMonitor monitor) {
}

if (createEml) {
String licenseOut = (String) licensinResult.getAttachment(Licenses.LICENSE_OUT);
String licenseOut = (String) licensinResult.getAttachment(Licenses.DOMAIN_NAME);
if (licenseOut != null && !licenseOut.isEmpty()) {
optEmlFile = processingToMailEml(new File(licenseOut));
}
Expand Down
2 changes: 1 addition & 1 deletion ...s.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseOperatorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public LicensingResult issueLicensePack(LicensingRequest request, LicensePackDes
eventAdmin.postEvent(OperatorLicenseEvents.encodedIssued(licenseOut));
String format = LicensesCoreMessages.LicenseOperatorServiceImpl_export_success;
String message = String.format(format, licenseOut);
attachments.put(Licenses.LICENSE_OUT, licenseOut);
attachments.put(Licenses.DOMAIN_NAME, licenseOut);
return LicensingResults.createOK(message, pluginId, attachments);
} catch (Exception e) {
return LicensingResults.createError(LicensesCoreMessages.LicenseOperatorServiceImpl_export_error, pluginId,
Expand Down
1 change: 0 additions & 1 deletion ...eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/licenses/core/Licenses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ public class Licenses {

public static final String DOMAIN_NAME = "licenses"; //$NON-NLS-1$
public static final String FILE_EXTENSION_XMI = "licenses_xmi"; //$NON-NLS-1$
public static final String LICENSE_OUT = "licenses_out"; //$NON-NLS-1$ ;

}
19 changes: 19 additions & 0 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.licenses.emfforms" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.licenses.emfforms.handlers.CreateLicensePackHandler">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.licenses.emfforms.handlers.CreateLicensePackHandler"/>
<message_argument value="org.eclipse.passage.loc.licenses.emfforms_0.6.0"/>
</message_arguments>
</filter>
</resource>
</component>
35 changes: 35 additions & 0 deletions bundles/org.eclipse.passage.loc.licenses.ui/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.licenses.ui" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.licenses.ui.handlers.LicenseExportHandler">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.licenses.ui.handlers.LicenseExportHandler"/>
<message_argument value="org.eclipse.passage.loc.licenses.ui_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.licenses.ui.handlers.LicenseOpenHandler">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.licenses.ui.handlers.LicenseOpenHandler"/>
<message_argument value="org.eclipse.passage.loc.licenses.ui_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/passage/loc/licenses/ui/LicensesUi.java" type="org.eclipse.passage.loc.licenses.ui.LicensesUi">
<filter comment="Was not intended for API" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.licenses.ui.LicensesUi"/>
<message_argument value="selectLicensePlanDescriptor(Shell, ComposedAdapterFactoryProvider, LicenseRegistry, LicensePlanDescriptor)"/>
</message_arguments>
</filter>
</resource>
</component>
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.licenses.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Bundle-SymbolicName: org.eclipse.passage.loc.licenses.ui;singleton:=true
Bundle-Version: 0.7.0.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="0.0.0",
Expand Down
27 changes: 27 additions & 0 deletions bundles/org.eclipse.passage.loc.operator/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.operator" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard"/>
<message_argument value="org.eclipse.passage.loc.operator_0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage"/>
<message_argument value="org.eclipse.passage.loc.operator_0.5.0"/>
</message_arguments>
</filter>
</resource>
</component>
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.operator/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.operator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.operator;singleton:=true
Bundle-Version: 0.5.0.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.users.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Bundle-SymbolicName: org.eclipse.passage.loc.users.ui;singleton:=true
Bundle-Version: 0.5.100.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
Expand Down
51 changes: 51 additions & 0 deletions bundles/org.eclipse.passage.loc.workbench.emfforms/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.workbench.emfforms" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Increased because of non-API types removed" id="926941240">
<message_arguments>
<message_argument value="0.6.0"/>
<message_argument value="0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.LocWorkbenchEmfforms">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.LocWorkbenchEmfforms"/>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizard">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizard"/>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizardPage">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms.wizards.CreateFormWizardPage"/>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard"/>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms_0.5.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage">
<filter comment="Was not intended for API" id="305422471">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage"/>
<message_argument value="org.eclipse.passage.loc.workbench.emfforms_0.5.0"/>
</message_arguments>
</filter>
</resource>
</component>
27 changes: 27 additions & 0 deletions bundles/org.eclipse.passage.loc.workbench/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.workbench" version="2">
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizard"/>
<message_argument value="org.eclipse.passage.loc.workbench_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage">
<filter comment="Was not intended for API" id="305324134">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.wizards.CreateFileWizardPage"/>
<message_argument value="org.eclipse.passage.loc.workbench_0.6.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/passage/loc/workbench/LocWokbench.java" type="org.eclipse.passage.loc.workbench.LocWokbench">
<filter comment="Was not intended for API" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.passage.loc.workbench.LocWokbench"/>
<message_argument value="selectClassifier(IEclipseContext, String, String, Iterable&lt;C&gt;, C, Class&lt;C&gt;)"/>
</message_arguments>
</filter>
</resource>
</component>
3 changes: 1 addition & 2 deletions bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Export-Package: org.eclipse.passage.loc.internal.workbench;x-friends:="org.eclip
org.eclipse.passage.loc.workbench.dialogs,
org.eclipse.passage.loc.workbench.handlers,
org.eclipse.passage.loc.workbench.parts,
org.eclipse.passage.loc.workbench.viewers,
org.eclipse.passage.loc.workbench.wizards
org.eclipse.passage.loc.workbench.viewers
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/*.xml
Loading