Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

Commit

Permalink
Rename a few things from MONDO to Hawk
Browse files Browse the repository at this point in the history
  • Loading branch information
agarciadom committed Apr 14, 2017
1 parent 13e758d commit 919649a
Show file tree
Hide file tree
Showing 27 changed files with 176 additions and 289 deletions.
4 changes: 2 additions & 2 deletions plugins-server/org.hawk.service.api.dt/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse UI for MONDO API
Bundle-Name: Eclipse UI for Hawk API
Bundle-SymbolicName: org.hawk.service.api.dt;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.hawk.service.api.dt.Activator
Bundle-Vendor: University of York
Bundle-Vendor: University of York, Aston University
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.equinox.security,
Expand Down
4 changes: 2 additions & 2 deletions plugins-server/org.hawk.service.api.dt/plugin.xml
Expand Up @@ -4,9 +4,9 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
class="org.hawk.service.api.dt.ui.MONDOServersPreferencePage"
class="org.hawk.service.api.dt.ui.HawkServersPreferencePage"
id="org.hawk.service.api.dt.page"
name="MONDO Servers">
name="Hawk Servers">
</page>
</extension>

Expand Down
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.jface.preference.IPreferenceStore;

public class ServerStore {
private static final String MONDO_SERVERS_PREFERENCE = "serverURLs";
private static final String HAWK_SERVERS_PREFERENCE = "hawkServerURLs";
private static final String URL_SEPARATOR = ",";

private final IPreferenceStore prefStore;
Expand All @@ -26,7 +26,7 @@ public ServerStore(IPreferenceStore prefStore) {
}

public List<Server> readAllServers() {
final String sValue = prefStore.getString(MONDO_SERVERS_PREFERENCE);
final String sValue = prefStore.getString(HAWK_SERVERS_PREFERENCE);

final ArrayList<Server> servers = new ArrayList<>();
if (!IPreferenceStore.STRING_DEFAULT_DEFAULT.equals(sValue)) {
Expand All @@ -50,6 +50,6 @@ public void saveAllServers(List<Server> servers) {
}
sbuf.append(server.getBaseURL());
}
prefStore.putValue(MONDO_SERVERS_PREFERENCE, sbuf.toString());
prefStore.putValue(HAWK_SERVERS_PREFERENCE, sbuf.toString());
}
}
Expand Up @@ -42,7 +42,7 @@
import org.hawk.service.api.dt.prefs.ServerStore;
import org.hawk.service.api.dt.prefs.CredentialsStore.Credentials;

public class MONDOServersPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
public class HawkServersPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

private static final class ServerLabelProvider extends LabelProvider {
@Override
Expand Down Expand Up @@ -76,15 +76,15 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
private List<Server> servers;
private CredentialsStore credsStore;

public MONDOServersPreferencePage() {
public HawkServersPreferencePage() {
// nothing to do
}

public MONDOServersPreferencePage(String title) {
public HawkServersPreferencePage(String title) {
super(title);
}

public MONDOServersPreferencePage(String title, ImageDescriptor image) {
public HawkServersPreferencePage(String title, ImageDescriptor image) {
super(title, image);
}

Expand Down
4 changes: 2 additions & 2 deletions plugins-server/org.hawk.service.api/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MONDO Integration API
Bundle-Name: Hawk Server API
Bundle-SymbolicName: org.hawk.service.api
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: University of York
Bundle-Vendor: University of York, Aston University
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.apache.thrift;bundle-version="0.9.2",
org.slf4j.api;bundle-version="1.7.2",
Expand Down
14 changes: 2 additions & 12 deletions plugins-server/org.hawk.service.api/src/api.ecore
Expand Up @@ -6,7 +6,7 @@
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="Users">
<eAnnotations source="doc">
<details key="d" value="The majority of service operations provided by the MONDO&#xA;&#x9;&#x9;platform require user authentication (indicated in the top-left&#xA;&#x9;&#x9;cell of each operation table) to prevent unaccountable use.&#xA;&#x9;&#x9;As such, the platform needs to provide basic user management service operations&#xA;&#x9;&#x9;for creating, updating and deleting user accounts."/>
<details key="d" value="The majority of service operations provided by the server&#xA; require user authentication (indicated in the top-left&#xA;&#x9;&#x9;cell of each operation table) to prevent unaccountable use.&#xA;&#x9;&#x9;As such, the platform needs to provide basic user management service operations&#xA;&#x9;&#x9;for creating, updating and deleting user accounts."/>
</eAnnotations>
<eOperations name="createUser" eExceptions="#//UserExists">
<eAnnotations source="doc">
Expand Down Expand Up @@ -1701,16 +1701,6 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TransformationTokenNotFound">
<eAnnotations source="doc">
<details key="d" value="The specified transformation token does not exist within the invokved MONDO instance."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="token" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="doc">
<details key="d" value="Transformation token which was not found within the invoked MONDO instance."/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Subscription">
<eAnnotations source="doc">
<details key="d" value="Details about a subscription to a topic queue"/>
Expand Down Expand Up @@ -1835,7 +1825,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IFCExport">
<eAnnotations source="doc">
<details key="d" value="IFC export facility for getting IFC models from MONDO server"/>
<details key="d" value="IFC export facility for getting IFC models from the Hawk server"/>
</eAnnotations>
<eOperations name="exportAsSTEP" eType="#//IFCExportJob">
<eAnnotations source="doc">
Expand Down
15 changes: 5 additions & 10 deletions plugins-server/org.hawk.service.api/src/api.emf
Expand Up @@ -2,14 +2,14 @@
@namespace(uri="hawk_api", prefix="")
package hawk_api;

// MONDO credentials (Hawk/ReactiveATL/CloudATL): implied in the "auth" @doc attribute.
// VCSAuthenticationFailed, VCSAuthorizationFailed: for VCS credentials (Hawk/Collaboration).
// Credentials: implied in the "auth" @doc attribute.
// VCSAuthenticationFailed, VCSAuthorizationFailed: for VCS credentials.
//
// AG: to simplify the API, auth="true" (the default) should imply that both authorization
// and authentication exceptions could happen.

@doc(d="The majority of service operations provided by the MONDO
platform require user authentication (indicated in the top-left
@doc(d="The majority of service operations provided by the server
require user authentication (indicated in the top-left
cell of each operation table) to prevent unaccountable use.
As such, the platform needs to provide basic user management service operations
for creating, updating and deleting user accounts.")
Expand Down Expand Up @@ -700,11 +700,6 @@ class InvalidModelSpec {
@doc(d="Reason for the spec not being valid.") attr String reason;
}

@doc(d="The specified transformation token does not exist within the invokved MONDO instance.")
class TransformationTokenNotFound {
@doc(d="Transformation token which was not found within the invoked MONDO instance.") attr String token;
}

@doc(d="Details about a subscription to a topic queue")
class Subscription {
@doc(d="Host name of the message queue server") attr String host;
Expand Down Expand Up @@ -754,7 +749,7 @@ class IFCExportJob {
attr String message;
}

@doc(d="IFC export facility for getting IFC models from MONDO server")
@doc(d="IFC export facility for getting IFC models from the Hawk server")
class IFCExport {
@doc(d="Export part of a Hawk index in IFC STEP format")
op IFCExportJob exportAsSTEP(String hawkInstance, IFCExportOptions options);
Expand Down

0 comments on commit 919649a

Please sign in to comment.