Merge branch 'development'

Repast · Jun 27, 2024 · ebac489 · ebac489
2 parents 6e55124 + 3562bd3
commit ebac489
Show file tree

Hide file tree

Showing 153 changed files with 342 additions and 414 deletions.
diff --git a/libs.bsf/META-INF/MANIFEST.MF b/libs.bsf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs bsf
 Bundle-SymbolicName: libs.bsf
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: lib/bsf.jar,
  lib/bsh-2.0b4.jar
 Export-Package: bsh,

diff --git a/libs.bsf/plugin_jpf.xml b/libs.bsf/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.bsf" version="">
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<runtime>

diff --git a/libs.ext/META-INF/MANIFEST.MF b/libs.ext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs ext
 Bundle-SymbolicName: libs.ext
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: lib/clibwrapper_jiio.jar,
  lib/gluegen-rt.jar,
  lib/jai_codec.jar,

diff --git a/libs.ext/plugin_jpf.xml b/libs.ext/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.ext" version="">
 	<attributes>
-		<attribute id="simphony" value="2.10.0"/>
+		<attribute id="simphony" value="2.11.0"/>
 	</attributes>
 
 	<runtime>

diff --git a/libs.piccolo/META-INF/MANIFEST.MF b/libs.piccolo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs piccolo
 Bundle-SymbolicName: libs.piccolo
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: lib/piccolo2d-core-3.0.jar,
  lib/piccolo2d-extras-3.0.jar
 Export-Package: org.piccolo2d,

diff --git a/libs.piccolo/plugin_jpf.xml b/libs.piccolo/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.piccolo" version="">
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<runtime>

diff --git a/repast.simphony.R/META-INF/MANIFEST.MF b/repast.simphony.R/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast R
 Bundle-SymbolicName: repast.simphony.R
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Require-Bundle: repast.simphony.gui,
  repast.simphony.data,
  repast.simphony.core,

diff --git a/repast.simphony.R/licenses/repast-license.txt b/repast.simphony.R/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.R/plugin_jpf.xml b/repast.simphony.R/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.R" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.batch/META-INF/MANIFEST.MF b/repast.simphony.batch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast batch
 Bundle-SymbolicName: repast.simphony.batch;singleton:=true
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Require-Bundle: libs.bsf,
  repast.simphony.dataLoader,
  repast.simphony.data,

diff --git a/repast.simphony.batch/licenses/repast-license.txt b/repast.simphony.batch/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.batch/plugin_jpf.xml b/repast.simphony.batch/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.batch" version="">
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.bin_and_src/META-INF/MANIFEST.MF b/repast.simphony.bin_and_src/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast bin and src
 Bundle-SymbolicName: repast.simphony.bin_and_src
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-Vendor: Argonne National Laboratory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/repast.simphony.bin_and_src/repast.simphony.bin_and_src.jar b/repast.simphony.bin_and_src/repast.simphony.bin_and_src.jar
diff --git a/repast.simphony.chart/META-INF/MANIFEST.MF b/repast.simphony.chart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast chart
 Bundle-SymbolicName: repast.simphony.chart
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: lib/jcommon-1.0.23.jar,
  lib/jfreechart-1.0.19.jar
 Export-Package: com.keypoint,

diff --git a/repast.simphony.chart/licenses/repast-license.txt b/repast.simphony.chart/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.chart/plugin_jpf.xml b/repast.simphony.chart/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.chart" version="">
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.core/META-INF/MANIFEST.MF b/repast.simphony.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast core
 Bundle-SymbolicName: repast.simphony.core
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: lib/jsr108-0.01.jar,
  lib/concurrent-1.3.4.jar,
  lib/collections-generic-4.01.jar,

diff --git a/repast.simphony.core/licenses/repast-license.txt b/repast.simphony.core/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.core/plugin_jpf.xml b/repast.simphony.core/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.core" version="">
 	<attributes>
-		<attribute id="simphony" value="2.10.0"/>
+		<attribute id="simphony" value="2.11.0"/>
 	</attributes>
 
 	<requires>

diff --git a/repast.simphony.data.ui/META-INF/MANIFEST.MF b/repast.simphony.data.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast ui
 Bundle-SymbolicName: repast.simphony.data.ui
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Require-Bundle: saf.core.ui,
  repast.simphony.data,
  repast.simphony.gui,
  repast.simphony.plugin.util,
  repast.simphony.core,
  repast.simphony.runtime,
  repast.simphony.scenario,
- repast.simphony.eclipse;bundle-version="2.10.0"
+ repast.simphony.eclipse;bundle-version="2.11.0"
 Export-Package: repast.simphony.data.analysis,
  repast.simphony.data2.gui,
  repast.simphony.data2.wizard

diff --git a/repast.simphony.data.ui/licenses/repast-license.txt b/repast.simphony.data.ui/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.data.ui/plugin_jpf.xml b/repast.simphony.data.ui/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.data.ui" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.data/META-INF/MANIFEST.MF b/repast.simphony.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast data
 Bundle-SymbolicName: repast.simphony.data
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: bin/
 Export-Package: repast.simphony.data2,
  repast.simphony.data2.builder,

diff --git a/repast.simphony.data/licenses/repast-license.txt b/repast.simphony.data/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.data/plugin_jpf.xml b/repast.simphony.data/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.data" version="">
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.dataLoader.ui/META-INF/MANIFEST.MF b/repast.simphony.dataLoader.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast dataloader ui
 Bundle-SymbolicName: repast.simphony.dataLoader.ui
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Export-Package: repast.simphony.dataLoader.ui,
  repast.simphony.dataLoader.ui.wizard,
  repast.simphony.dataLoader.ui.wizard.builder

diff --git a/repast.simphony.dataLoader.ui/licenses/repast-license.txt b/repast.simphony.dataLoader.ui/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.dataLoader.ui/plugin_jpf.xml b/repast.simphony.dataLoader.ui/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.dataloader.ui" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
   <requires>

diff --git a/repast.simphony.dataLoader/META-INF/MANIFEST.MF b/repast.simphony.dataLoader/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast dataloader
 Bundle-SymbolicName: repast.simphony.dataLoader
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Require-Bundle: repast.simphony.core,
  repast.simphony.plugin.util,
  repast.simphony.scenario,

diff --git a/repast.simphony.dataLoader/licenses/repast-license.txt b/repast.simphony.dataLoader/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2022 Argonne National Laboratory
+   Copyright (c) 2024 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.dataLoader/plugin_jpf.xml b/repast.simphony.dataLoader/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.dataloader" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.10.0"/>
+         <attribute id="simphony" value="2.11.0"/>
      </attributes>
 
   <requires>

diff --git a/repast.simphony.deployment/Building Javadoc.txt b/repast.simphony.deployment/Building Javadoc.txt
@@ -1,11 +1,7 @@
 Building Repast Javadoc
 
-1. Run the Ant javadoc.xml.  You may need to modify or create a launch config
-   that provides the javadoc executable if not on the system path.
-
-   **** NOTE! Requires JDK 11 to generate the proper stylesheet that is compatible
-        with the groovydocs!
-
+1. Run the Ant javadoc.xml using the Eclipse launch.  
+
    	- Update the javadoc title in javadoc.xml
    	- Check the link href to online Java API in javadoc.xml
    	- Make sure that links to Java base classes work in the generated javadoc.
@@ -22,20 +18,16 @@ Building Repast Javadoc
       These will be the "groovy-...jar" files and one or two of the other jars
       in the groovy /lib folder (see existing launch config).
 
-        * Note that building groovy docs with Groovy 3.x fails and we have used 2.5 to
-          build the docs for RS release 2.9 (Oct 2021).  Using the Groovy 2.5 SDK for
-          groovy doc building does not interfere with the groovy 3.x distributed with
-          Repast.
+        * Requires building with Groovy 2.5.x SDK since the generated doc HTML
+        with version 3.x isn't compatible with the ReLogoReferenceCreator that 
+        creates the RelogoPrimiatves.html.
 
     - The buildGroovyDocs.xml launch configuration JRE settings should be 
        "Separate JRE" not "Run in same JRE as workspace" since using the later
        causes issues (on Windows) even though they are the same JRE!
 
     - The version number in buildGroovyDocs.xml should be updated.
 
-    - Last, just run the buildGroovyDocs.xml as an ant script.  This can take
-      several minutes to run.  If the Terminate process button is red then it
-      is still running.
 
 3.  Merge the results of the Groovydoc as described in the 
     r.s.relogo.runtime/docs/Readme.txt
diff --git a/repast.simphony.deployment/Generate javadoc Win.launch b/repast.simphony.deployment/Generate javadoc Win.launch
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
     <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
         <listEntry value="/repast.simphony.deployment/javadoc.xml"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
     <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="ANT_HOME" value="C:\eclipse-committers-2020-06-R-win32-x86_64\eclipse\plugins\org.apache.ant_1.10.8.v20200515-1239"/>
+        <mapEntry key="ANT_HOME" value="C:\eclipse-committers-2024-03-R-win32-x86_64\eclipse\plugins\org.apache.ant_1.10.14.v20230922-1200"/>
         <mapEntry key="path" value="jdk11/bin"/>
     </mapAttribute>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-11.0.17+8/"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="repast.simphony.deployment"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/repast.simphony.deployment/javadoc.xml}"/>

diff --git a/repast.simphony.deployment/deploy.xml b/repast.simphony.deployment/deploy.xml
@@ -245,15 +245,6 @@
 				<include name="**/*.class" />
 			</fileset>
 
-			<fileset dir="../repast.simphony.groovy/src" casesensitive="no">
-				<include name="**/*.java" />
-				<include name="**/*.groovy" />
-			</fileset>
-
-			<fileset dir="../repast.simphony.groovy/bin" casesensitive="no">
-				<include name="**/*.class" />
-			</fileset>
-
 			<fileset dir="../repast.simphony.gui/src" casesensitive="no">
 				<include name="**/*.java" />
 				<include name="**/*.groovy" />