Moving eventdispatching from io.sarl.util to sre to facilitate merge …

…with janus v3
sarl · Jan 16, 2020 · 36a2cfd · 36a2cfd
1 parent 2431587
commit 36a2cfd
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/sre/io.janusproject/io.janusproject.plugin/pom.xml b/sre/io.janusproject/io.janusproject.plugin/pom.xml
@@ -91,7 +91,47 @@
 					</execution>
 				</executions>
 			</plugin>
-
+			<plugin>
+				<groupId>io.sarl.maven</groupId>
+				<artifactId>sarl-maven-plugin</artifactId>
+				<!-- Maven extension mechanism seems not working because the plugin is defined in the same project.
+				     The different goals must be explicitly provided. -->
+				<executions>
+					<execution>
+						<id>sarl-compiler-init</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>initialize</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>sarl-compiler-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>sarl-compiler-clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<tycho>true</tycho>
+					<source>${sarl-dsl.min.jdk.version}</source>
+					<target>${sarl-dsl.min.jdk.version}</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<input>src/</input>
+					<output>src-gen/</output>
+					<runJavaCompiler>true</runJavaCompiler>
+					<generateInlines>true</generateInlines>
+					<generateStorageFiles>true</generateStorageFiles>
+					<generateTraceFiles>true</generateTraceFiles>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/...rc/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java b/...rc/io/janusproject/kernel/bic/internaleventdispatching/AgentInternalEventsDispatcher.java
@@ -36,8 +36,8 @@
 import io.janusproject.services.executor.EarlyExitException;
 import io.janusproject.services.executor.ExecutorService;
 import io.janusproject.services.executor.JanusRunnable;
-import io.sarl.eventdispatching.BehaviorGuardEvaluator;
-import io.sarl.eventdispatching.BehaviorGuardEvaluatorRegistry;
+import io.sarl.revision.BehaviorGuardEvaluator;
+import io.sarl.revision.BehaviorGuardEvaluatorRegistry;
 import io.sarl.lang.core.Event;
 
 /**

diff --git a/...ntdispatching/BehaviorGuardEvaluator.sarl → ...sarl/revision/BehaviorGuardEvaluator.sarl b/...ntdispatching/BehaviorGuardEvaluator.sarl → ...sarl/revision/BehaviorGuardEvaluator.sarl
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package io.sarl.eventdispatching
+package io.sarl.revision
 
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method

diff --git a/...ching/BehaviorGuardEvaluatorRegistry.sarl → ...ision/BehaviorGuardEvaluatorRegistry.sarl b/...ching/BehaviorGuardEvaluatorRegistry.sarl → ...ision/BehaviorGuardEvaluatorRegistry.sarl
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package io.sarl.eventdispatching
+package io.sarl.revision
 
 import com.google.common.base.Objects
 import com.google.common.base.Throwables

diff --git a/...rc/io/sarl/eventdispatching/Messages.sarl → ...plugin/src/io/sarl/revision/Messages.sarl b/...rc/io/sarl/eventdispatching/Messages.sarl → ...plugin/src/io/sarl/revision/Messages.sarl
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package io.sarl.eventdispatching
+package io.sarl.revision
 
 import org.eclipse.osgi.util.NLS
 

diff --git a/...sarl/eventdispatching/messages.properties → .../src/io/sarl/revision/messages.properties b/...sarl/eventdispatching/messages.properties → .../src/io/sarl/revision/messages.properties