I update the pom of the demo application to match the new structure. Also replace "module" with "plugin" in places we refer to the Jemo app, rather than the modules that comprise the app. Also I add the target "_blank" to the url pointing to the github repo.
diff --git a/_projectCommon.php b/_projectCommon.php
index df068ae..230fe4b 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -22,5 +22,5 @@
$Nav->addCustomNav("Setup - Microsoft Azure", "/jemo/setup_azure.php", "_self", NULL);
$Nav->addCustomNav("Setup - Google Cloud", "/jemo/setup_gcp.php", "_self", NULL);
$Nav->addCustomNav("Arcitecture", "/jemo/docs.php", "_self", NULL);
- $Nav->addCustomNav("Source code", "https://github.com/eclipse/jemo", "_self", NULL);
+ $Nav->addCustomNav("Source code", "https://github.com/eclipse/jemo", "_blank", NULL);
// $Nav->addCustomNav("Using Phoenix", "http://wiki.eclipse.org/Using_Phoenix", "_self", NULL);
diff --git a/content/en_docs.php b/content/en_docs.php
index 1df067d..1bac07f 100644
--- a/content/en_docs.php
+++ b/content/en_docs.php
@@ -59,21 +59,22 @@
</tbody>
</table>
- <p>When your app code is ready you have to deploy the module to a running Jemo instance.
- Jemo on this instance receives the jar file for this module, extracts metadata about it and stores both the jar
+ <p>When your app code is ready you have to deploy the plugin to a running Jemo instance.
+ Jemo on this instance receives the jar file for this plugin, extracts metadata about it and stores both the jar
and the metadata
to the cloud via the selected CloudRuntime implementation.
- All the Jemo instances are notified about the new module.</p>
+ All the Jemo instances are notified about the new plugin.</p>
<h3 id="the-webservicemodule"><a class="anchor" href="#the-webservicemodule"></a>1.1. The WebServiceModule</h3>
<p>Every time an HTTP request is received by a Jemo instance for a module implementing the web service pattern,
Jemo looks at the modules metadata to match the current endpoint with an existing module.
- If a match is found, Jemo downloads the module jar from the cloud and deploys it locally to serve the request.
- After the request is served and after a period of inactivity the Jemo instance unloads the application.</p>
+ If a match is found, Jemo downloads the jar of the plugin that contains the module
+ from the cloud and deploys it locally to serve the request.
+ After the request is served and after a period of inactivity the Jemo instance unloads the plugin.</p>
<div class="listingblock">
- <div class="title">web service pattern</div>
+ <div class="title">Web service pattern</div>
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">String getBasePath();
@@ -93,7 +94,7 @@
with all other parameters needed to carry out the computation by the consumer.</p>
<div class="listingblock">
- <div class="title">event processing pattern</div>
+ <div class="title">Event processing pattern</div>
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">JemoMessage process(JemoMessage message) throws Throwable;</code></pre>
</div>
@@ -112,7 +113,7 @@
</div>
<p>The <code>processBatch</code> method provides the code for the batch calculation to be run by Jemo.
- Optionally the developer can override the <code>getLimits</code> method of the <code>Module</code>
+ Optionally, the developer can override the <code>getLimits</code> method of the <code>Module</code>
interface,
in order to control where and when the batch process run.
The following table displays how you can control how many module instances run and where.</p>
@@ -202,7 +203,7 @@
</table>
<div class="listingblock">
- <div class="title">event processing pattern</div>
+ <div class="title">Fixed processing pattern</div>
<div class="content">
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">void processFixed(final String location, final String instanceId) throws Throwable;</code></pre>
</div>
@@ -226,85 +227,98 @@
<div class="listingblock">
<div class="title">pom.xml</div>
<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml"><?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.jemo</groupId>
- <artifactId>jemo-tutorial</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
+<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml"><?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.jemo</groupId>
+ <artifactId>jemo-trader-app</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
+ <name>Jemo Trader App</name>
+ <description>This is a demo project showing how to use Eclipse Jemo development patterns to create an application.
+ As an example we model a Market with traders and stocks.
+ </description>
- <repositories>
- <repository>
- <id>jemo-local</id>
- <url>http://localhost/jemo</url>
- </repository>
- </repositories>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <jemo.username>[JEMO_USER]</jemo.username>
+ <jemo.password>[JEMO_PASSWORD]</jemo.password>
+ <jemo.id>1</jemo.id>
+ <jemo.endpoint>https://localhost</jemo.endpoint>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jemo</groupId>
- <artifactId>module-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <repositories>
+ <repository>
+ <id>jemo-local</id>
+ <url>${jemo.endpoint}/jemo</url>
+ </repository>
+ </repositories>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>eclipse-jemo-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>deploy</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <outputJar>${project.build.finalName}-jar-with-dependencies</outputJar>
- <id>1</id>
- <username>[JEMO_USER]@jemo.eclipse.org</username>
- <password>[JEMO_PASSWORD]</password>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project></code></pre>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jemo</groupId>
+ <artifactId>module-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.jemo</groupId>
+ <artifactId>eclipse-jemo-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <outputJar>${project.build.finalName}-jar-with-dependencies</outputJar>
+ <!-- Set the Jemo plugin id to upload here -->
+ <id>${jemo.id}</id>
+ <username>${jemo.username}</username>
+ <password>${jemo.password}</password>
+ <endpoint>${jemo.endpoint}</endpoint>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+</code></pre>
</div>
</div>
@@ -872,4 +886,4 @@
<!-- ./end #midcolumn -->
<!-- Start of the right column -->
-<!-- ./end #rightcolumn -->
\ No newline at end of file
+<!-- ./end #rightcolumn -->
