[jsoar] 3 new revisions pushed by voigtjr@gmail.com on 2013-04-03 01:38 GMT

0 views

Skip to first unread message

js...@googlecode.com

unread,

Apr 2, 2013, 9:51:04 PM4/2/13

to jsoa...@googlegroups.com

3 new revisions:

Revision: 9fd7e7f36021
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Apr 2 17:45:50 2013
Log: Added support for long values in qmemory
http://code.google.com/p/jsoar/source/detail?r=9fd7e7f36021

Revision: 7e85e9511bd2
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Apr 2 17:51:56 2013
Log: updated slf4j, included logback binding for testing
http://code.google.com/p/jsoar/source/detail?r=7e85e9511bd2

Revision: 763d94243dc2
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 2 18:17:53 2013
Log: Merge branch 'master' into maven...
http://code.google.com/p/jsoar/source/detail?r=763d94243dc2

==============================================================================
Revision: 9fd7e7f36021
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Apr 2 17:45:50 2013
Log: Added support for long values in qmemory

http://code.google.com/p/jsoar/source/detail?r=9fd7e7f36021

Modified:
/jsoar-core/src/main/java/org/jsoar/kernel/io/quick/DefaultQMemory.java
/jsoar-core/src/main/java/org/jsoar/kernel/io/quick/MemoryNode.java
/jsoar-core/src/main/java/org/jsoar/kernel/io/quick/QMemory.java
/jsoar-core/src/main/java/org/jsoar/kernel/io/quick/SubQMemory.java
/jsoar-core/src/test/java/org/jsoar/kernel/io/quick/DefaultQMemoryTest.java

=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/DefaultQMemory.java
Thu Sep 9 19:54:51 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/DefaultQMemory.java
Tue Apr 2 17:45:50 2013
@@ -200,7 +200,15 @@
*/
public synchronized void setInteger(String path, int intVal)
{
- if(getNode(path).setIntValue(intVal))
+ setInteger(path, (long)intVal);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jsoar.kernel.io.quick.QMemory#setInteger(java.lang.String,
int)
+ */
+ public synchronized void setInteger(String path, long longVal)
+ {
+ if(getNode(path).setIntValue(longVal))
{
fireChangeEvent();
}
=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/MemoryNode.java Thu
Sep 9 19:54:51 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/MemoryNode.java Tue
Apr 2 17:45:50 2013
@@ -97,7 +97,7 @@
{
if(value instanceof Number)
{
- return ((Number) value).intValue();
+ return ((Number) value).longValue();
}
else if(value != null)
{
=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/QMemory.java Thu
Sep 9 19:54:51 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/QMemory.java Tue
Apr 2 17:45:50 2013
@@ -123,13 +123,21 @@
void setDouble(String path, double doubleVal);

/**
- * Set a path to an int value. Any previous value will be removed
+ * Set a path to an int value. Any previous value will be removed.
*
* @param path path to set
* @param intVal Integer value
*/
void setInteger(String path, int intVal);

+ /**
+ * Set a path to a long value. Any previous value will be removed.
+ *
+ * @param path path to set
+ * @param longVal Long value
+ */
+ void setInteger(String path, long longVal);
+
/**
* Set a path to a string value. Any previous value will be removed.
*
@@ -156,4 +164,5 @@

void addListener(QMemoryListener listener);
void removeListener(QMemoryListener listener);
+
}
=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/SubQMemory.java Thu
Sep 9 19:54:51 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/io/quick/SubQMemory.java Tue
Apr 2 17:45:50 2013
@@ -125,6 +125,15 @@
{
source.setInteger(getPath(path), intVal);
}
+
+ /* (non-Javadoc)
+ * @see org.jsoar.kernel.io.quick.QMemory#setInteger(java.lang.String,
int)
+ */
+ @Override
+ public void setInteger(String path, long longVal)
+ {
+ source.setInteger(getPath(path), longVal);
+ }

/* (non-Javadoc)
* @see org.jsoar.kernel.io.quick.QMemory#setString(java.lang.String,
java.lang.String)
=======================================
---
/jsoar-core/src/test/java/org/jsoar/kernel/io/quick/DefaultQMemoryTest.java
Wed Oct 14 10:56:07 2009
+++
/jsoar-core/src/test/java/org/jsoar/kernel/io/quick/DefaultQMemoryTest.java
Tue Apr 2 17:45:50 2013
@@ -161,5 +161,21 @@
q.setInteger("A", 2);
assertEquals(2, count.intValue());
}
+
+ /**
+ * Check support for 64-bit integers
+ */
+ @Test
+ public void testSupportsLong()
+ {
+ QMemory q = DefaultQMemory.create();
+ q.setInteger("long", Long.MAX_VALUE);
+ assertEquals(Long.MAX_VALUE, q.getInteger("long"));
+
+ q.setInteger("integer", Integer.MAX_VALUE);
+ assertEquals(Integer.MAX_VALUE, q.getInteger("integer"));
+ }
+
+

}

==============================================================================
Revision: 7e85e9511bd2
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Apr 2 17:51:56 2013
Log: updated slf4j, included logback binding for testing

http://code.google.com/p/jsoar/source/detail?r=7e85e9511bd2

Added:
/jsoar-build/.gitignore
/jsoar-build/lib/build/logback-classic-1.0.11.jar
/jsoar-build/lib/build/logback-core-1.0.11.jar
/jsoar-core/lib/logback-license.txt
/jsoar-core/lib/slf4j-1.7.5-license.txt
/jsoar-core/lib/slf4j-api-1.7.5.jar
/jsoar-core/src/test/resources/logback-test.xml
Deleted:
/jsoar-core/lib/build-only/slf4j-1.6.1-license.txt
/jsoar-core/lib/build-only/slf4j-api-1.6.1.jar
/jsoar-core/lib/build-only/slf4j-jdk14-1.6.1.jar
Modified:
/jsoar-build/.classpath
/jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra dbs).launch
/jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch
/jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
/jsoar-build/tools/launches/jsoar - SoarUnit on selection (with Tcl).launch
/jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch
/jsoar-build/tools/launches/jsoar - soar2soar.launch
/jsoar-build/tools/launches/sml - SoarUnit on selection.launch
/jsoar-core/.classpath
/jsoar-core/tools/launches/PerformanceTimer on selection.launch
/jsoar-core/tools/launches/jsoar-core - All unit tests.launch
/jsoar-legilimens/tools/launches/jsoar-legilimens - All unit tests.launch
/jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch
/jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch

=======================================
--- /dev/null
+++ /jsoar-build/.gitignore Tue Apr 2 17:51:56 2013
@@ -0,0 +1,1 @@
+/bin
=======================================
--- /dev/null
+++ /jsoar-build/lib/build/logback-classic-1.0.11.jar Tue Apr 2 17:51:56
2013
Binary file, no diff available.
=======================================
--- /dev/null
+++ /jsoar-build/lib/build/logback-core-1.0.11.jar Tue Apr 2 17:51:56 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++ /jsoar-core/lib/logback-license.txt Tue Apr 2 17:51:56 2013
@@ -0,0 +1,15 @@
+Logback LICENSE
+---------------
+
+Logback: the reliable, generic, fast and flexible logging framework.
+Copyright (C) 1999-2012, QOS.ch. All rights reserved.
+
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
+
+ or (per the licensee's choosing)
+
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
+
=======================================
--- /dev/null
+++ /jsoar-core/lib/slf4j-1.7.5-license.txt Tue Apr 2 17:51:56 2013
@@ -0,0 +1,24 @@
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
=======================================
--- /dev/null
+++ /jsoar-core/lib/slf4j-api-1.7.5.jar Tue Apr 2 17:51:56 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++ /jsoar-core/src/test/resources/logback-test.xml Tue Apr 2 17:51:56 2013
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} %-5level %36.36logger{36}: %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="warn">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
=======================================
--- /jsoar-core/lib/build-only/slf4j-1.6.1-license.txt Sat Jul 31 15:41:21
2010
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
=======================================
--- /jsoar-core/lib/build-only/slf4j-api-1.6.1.jar Sat Jul 31 15:41:21 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /jsoar-core/lib/build-only/slf4j-jdk14-1.6.1.jar Sat Jul 31 15:41:21
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /jsoar-build/.classpath Wed Jul 28 20:52:00 2010
+++ /jsoar-build/.classpath Tue Apr 2 17:51:56 2013
@@ -5,9 +5,9 @@
<classpathentry combineaccessrules="false" kind="src"
path="/jsoar-debugger"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jsoar-demos"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jsoar-legilimens"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jsoar-tcl"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jsoar-sml"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jsoar-soar2soar"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jsoar-soarunit"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jsoar-sml"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jsoar-tcl"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Mon Jul 12 18:49:12 2010
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Tue Apr 2 17:51:56 2013
@@ -11,10 +11,12 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/db/mysql-connector-java-5.0.4-bin.jar"
path="3" type="2"/>
"/>
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/db/postgresql-8.4-701.jdbc4.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
externalArchive="/jsoar-build/lib/db/mysql-connector-java-5.0.4-bin.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
externalArchive="/jsoar-build/lib/db/postgresql-8.4-701.jdbc4.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.debugger.JSoarDebugger"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch Sat
May 15 19:56:06 2010
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch Tue
Apr 2 17:51:56 2013
@@ -10,6 +10,13 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.debugger.JSoarDebugger"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Xmx1024m"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
Sun May 23 18:41:30 2010
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
Tue Apr 2 17:51:56 2013
@@ -10,6 +10,13 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.debugger.JSoarDebugger"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value=""${resource_loc}""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - SoarUnit on selection (with
Tcl).launch Thu Mar 28 12:15:14 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection (with
Tcl).launch Tue Apr 2 17:51:56 2013
@@ -6,6 +6,13 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.soarunit.SoarUnit"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-R --ui --threads cached"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch Thu
Mar 28 12:15:14 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch Tue
Apr 2 17:51:56 2013
@@ -6,6 +6,15 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
externalArchive="/jsoar-core/lib/build-only/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
externalArchive="/jsoar-core/lib/build-only/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.soarunit.SoarUnit"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-R --ui "${selected_resource_loc}""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - soar2soar.launch Sat May 22
19:37:55 2010
+++ /jsoar-build/tools/launches/jsoar - soar2soar.launch Tue Apr 2
17:51:56 2013
@@ -10,6 +10,13 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-build" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-build"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.soar2soar.Soar2Soar"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="5
http://soar.googlecode.com/svn/trunk/SoarSuite/Soar2Soar/environments/blocks-world.soar
http://soar.googlecode.com/svn/trunk/SoarSuite/Soar2Soar/agents/blocks-world.soar"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
=======================================
--- /jsoar-build/tools/launches/sml - SoarUnit on selection.launch Mon Nov
12 12:10:57 2012
+++ /jsoar-build/tools/launches/sml - SoarUnit on selection.launch Tue Apr
2 17:51:56 2013
@@ -12,9 +12,11 @@
<mapEntry key="Path" value="${env_var:SOAR_HOME}"/>
</mapAttribute>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-soarunit" path="1"
type="4"/>
"/>
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry">
<memento
path="3"
variableString="${env_var:SOAR_HOME}/java/sml.jar"/>
</runtimeClasspathEntry>
"/>
-<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-soarunit"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-soarunit" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry">
<memento
path="3"
variableString="${env_var:SOAR_HOME}/java/sml.jar"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-soarunit"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.soarunit.SoarUnit"/>
=======================================
--- /jsoar-core/.classpath Wed Mar 6 09:45:21 2013
+++ /jsoar-core/.classpath Tue Apr 2 17:51:56 2013
@@ -8,9 +8,7 @@
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/commons-beanutils-1.8.0.jar"
sourcepath="C:/Documents and
Settings/ray/home/mine/projects/my-project-dl/jsoar-dl/commons-beanutils-1.8.0/commons-beanutils-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="lib/db/sqlite-jdbc-3.6.20.1.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/build-only/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/build-only/slf4j-jdk14-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-14.0.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /jsoar-core/tools/launches/PerformanceTimer on selection.launch Tue
Feb 5 06:59:55 2013
+++ /jsoar-core/tools/launches/PerformanceTimer on selection.launch Tue
Apr 2 17:51:56 2013
@@ -6,6 +6,13 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-core" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-core"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jsoar.kernel.PerformanceTimer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value=""${resource_loc}" --runs 1 --decisions 100"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-core"/>
=======================================
--- /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Wed Mar
6 09:42:36 2013
+++ /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Apr
2 17:51:56 2013
@@ -14,6 +14,14 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR"
value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND"
value="org.eclipse.jdt.junit.loader.junit4"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-core" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-core"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-core/lib/commons-logging-1.1.1.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-core"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea
-Xmx1536m"/>
=======================================
--- /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Sun Oct 25 20:36:45 2009
+++ /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Tue Apr 2 17:51:56 2013
@@ -14,6 +14,13 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR"
value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND"
value="org.eclipse.jdt.junit.loader.junit4"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
javaProject="jsoar-legilimens" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-legilimens"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-legilimens"/>
</launchConfiguration>
=======================================
--- /jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch Tue Jun 30
19:09:12 2009
+++ /jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch Tue Apr 2
17:51:56 2013
@@ -15,6 +15,13 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR"
value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND"
value="org.eclipse.jdt.junit.loader.junit4"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-sml" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-sml"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-sml"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea
-Xmx1024m"/>
=======================================
--- /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Sat May 15
21:13:08 2010
+++ /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Tue Apr 2
17:51:56 2013
@@ -15,6 +15,13 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR"
value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND"
value="org.eclipse.jdt.junit.loader.junit4"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jsoar-tcl" path="1"
type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento
exportedEntriesOnly="false"
project="jsoar-tcl"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-classic-1.0.11.jar"
path="3" type="2"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/build/logback-core-1.0.11.jar"
path="3" type="2"/>
"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-tcl"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea
-Xmx1024m"/>

==============================================================================
Revision: 763d94243dc2
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 2 18:17:53 2013
Log: Merge branch 'master' into maven

Conflicts:
jsoar-build/.classpath
jsoar-build/.gitignore
jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra dbs).launch
jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch
jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
jsoar-build/tools/launches/jsoar - SoarUnit on selection (with Tcl).launch
jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch
jsoar-build/tools/launches/jsoar - soar2soar.launch
jsoar-build/tools/launches/sml - SoarUnit on selection.launch
jsoar-core/.classpath
jsoar-core/lib/slf4j-1.7.5-license.txt
jsoar-core/tools/launches/PerformanceTimer on selection.launch
jsoar-core/tools/launches/jsoar-core - All unit tests.launch
jsoar-legilimens/tools/launches/jsoar-legilimens - All unit tests.launch
jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch
jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch

http://code.google.com/p/jsoar/source/detail?r=763d94243dc2

Reply all

Reply to author

Forward

0 new messages