[jsoar] 10 new revisions pushed by voigtjr@gmail.com on 2013-06-11 15:40 GMT

2 views

Skip to first unread message

js...@googlecode.com

unread,

Jun 11, 2013, 11:41:34 AM6/11/13

to jsoa...@googlegroups.com

10 new revisions:

Revision: 7fe1699340e9
Author: Patrick DeHaan <patrick...@soartech.com>
Date: Thu May 23 12:20:04 2013
Log: avoiding possible NPEs...
http://code.google.com/p/jsoar/source/detail?r=7fe1699340e9

Revision: eef3ad8fefe0
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 12:16:10 2013
Log: Synchronoize do_preference_phase() and other functions called
from the...
http://code.google.com/p/jsoar/source/detail?r=eef3ad8fefe0

Revision: 3f4202a13e30
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:13:58 2013
Log: Removed commons-logging from jsoar-core junit launcher
http://code.google.com/p/jsoar/source/detail?r=3f4202a13e30

Revision: f32711df7201
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 13:12:31 2013
Log: Merge branch 'master' into maven
http://code.google.com/p/jsoar/source/detail?r=f32711df7201

Revision: 04cb19cf487d
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:42:27 2013
Log: Added logback configuration file to folder in jsoar-build, added
this ...
http://code.google.com/p/jsoar/source/detail?r=04cb19cf487d

Revision: c19027d342cc
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 13:18:56 2013
Log: Merge remote-tracking branch 'origin/maven' into maven
http://code.google.com/p/jsoar/source/detail?r=c19027d342cc

Revision: d26999eef34f
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:42:55 2013
Log: Added legacy bindings for commons-logging because apache
beanutils ref...
http://code.google.com/p/jsoar/source/detail?r=d26999eef34f

Revision: 2d48f5a1c4cb
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:00:52 2013
Log: Merge branch 'master' into maven...
http://code.google.com/p/jsoar/source/detail?r=2d48f5a1c4cb

Revision: 8a980eddd784
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:37:32 2013
Log: Removed unused ant build cruft
http://code.google.com/p/jsoar/source/detail?r=8a980eddd784

Revision: 28d6fdfc64e3
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:39:53 2013
Log: Added top-level project ignores
http://code.google.com/p/jsoar/source/detail?r=28d6fdfc64e3

==============================================================================
Revision: 7fe1699340e9
Author: Patrick DeHaan <patrick...@soartech.com>
Date: Thu May 23 12:20:04 2013
Log: avoiding possible NPEs

- getTagName() shouldn't return null according to documentation but has
been observed to do so
- getTextContent() is documented as returning null under certain
circumstances and has been observed to do so

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

Modified:
/jsoar-core/src/main/java/org/jsoar/kernel/io/xml/SoarTechXmlToWme.java

=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/io/xml/SoarTechXmlToWme.java
Mon Sep 13 07:30:50 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/io/xml/SoarTechXmlToWme.java
Thu May 23 12:20:04 2013
@@ -121,7 +121,13 @@

final Element kid = (Element) node;
final String linkTo = kid.getAttribute(SoarTechWmeToXml.LINK);
- final Symbol attribute = syms.createString(kid.getTagName());
+ final String tagName = kid.getTagName();
+ if (null == tagName)
+ {
+ logger.warn("null tagName on node " + node);
+ continue;
+ }
+ final Symbol attribute = syms.createString(tagName);
if(linkTo.length() == 0)
{
final Symbol value = getValue(kid);
@@ -160,7 +166,11 @@
value = element.getTextContent();
}

- if(SoarTechWmeToXml.DOUBLE.equals(type))
+ if (null == value)
+ {
+ return syms.createString("");
+ }
+ else if(SoarTechWmeToXml.DOUBLE.equals(type))
{
return syms.createDouble(Double.valueOf(value));
}

==============================================================================
Revision: eef3ad8fefe0
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 12:16:10 2013
Log: Synchronoize do_preference_phase() and other functions called
from there with csoar

* it is not illegal to have no goal sometimes -- replaced assert check and
try/catch with if block like csoar
* top_goal param is not needed by create_instantiation

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

Modified:
/jsoar-core/src/main/java/org/jsoar/kernel/Consistency.java
/jsoar-core/src/main/java/org/jsoar/kernel/learning/Chunker.java
/jsoar-core/src/main/java/org/jsoar/kernel/memory/OSupport.java
/jsoar-core/src/main/java/org/jsoar/kernel/memory/RecognitionMemory.java

=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/Consistency.java Thu Feb 7
06:28:52 2013
+++ /jsoar-core/src/main/java/org/jsoar/kernel/Consistency.java Tue May 28
12:16:10 2013
@@ -417,9 +417,10 @@
* consistency.cpp:420:highest_active_goal_propose
*
* @param start_goal The goal to start at
+ * @param noneOk true if no active goal is ok, false if not
* @return highest active goal in goal stack.
*/
- public IdentifierImpl highest_active_goal_propose(IdentifierImpl
start_goal)
+ public IdentifierImpl highest_active_goal_propose(IdentifierImpl
start_goal, boolean noneOk)
{
for (IdentifierImpl goal = start_goal; goal != null; goal =
goal.goalInfo.lower_goal)
{
@@ -449,8 +450,13 @@
if (!this.soarReteListener.nil_goal_retractions.isEmpty())
return null;

- context.getTrace().flush();
- throw new IllegalStateException("Unable to find an active goal
when not at quiescence.");
+ if(!noneOk)
+ {
+ context.getTrace().flush();
+ throw new IllegalStateException("Unable to find an active goal
when not at quiescence.");
+ }
+
+ return null;
}

/**
@@ -459,9 +465,10 @@
* <p>Preconditions: start_goal cannot be null, agent not at quiescence
*
* @param start_goal the goal to start at
+ * @param noneOk true if no active goal is ok, false if not
* @return highest active goal
*/
- public IdentifierImpl highest_active_goal_apply(IdentifierImpl
start_goal)
+ public IdentifierImpl highest_active_goal_apply(IdentifierImpl
start_goal, boolean noneOk)
{
for (IdentifierImpl goal = start_goal; goal != null; goal =
goal.goalInfo.lower_goal)
{
@@ -495,7 +502,12 @@
if (!this.soarReteListener.nil_goal_retractions.isEmpty())
return null;

- throw new IllegalStateException("Unable to find an active goal
when not at quiescence.");
+ if(!noneOk)
+ {
+ throw new IllegalStateException("Unable to find an active goal
when not at quiescence.");
+ }
+
+ return null;
}

/**
@@ -648,7 +660,7 @@
decider.previous_active_level = decider.active_level;

/* Determine the new highest level of activity */
- decider.active_goal = highest_active_goal_apply(decider.top_goal);
+ decider.active_goal = highest_active_goal_apply(decider.top_goal,
false);
if (decider.active_goal != null)
decider.active_level = decider.active_goal.level;
else
@@ -896,7 +908,7 @@
decider.previous_active_level = decider.active_level;

/* Determine the new highest level of activity */
- decider.active_goal =
highest_active_goal_propose(decider.top_goal);
+ decider.active_goal =
highest_active_goal_propose(decider.top_goal, false);
if (decider.active_goal != null)
decider.active_level = decider.active_goal.level;
else
=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/learning/Chunker.java Fri
Apr 5 18:51:42 2013
+++ /jsoar-core/src/main/java/org/jsoar/kernel/learning/Chunker.java Tue
May 28 12:16:10 2013
@@ -1370,7 +1370,7 @@

chunk_inst.in_ms = true; /* set TRUE for now, we'll find out
later... */
make_clones_of_results(results, chunk_inst);
- recMemory.fill_in_new_instantiation_stuff(chunk_inst, true,
decider.top_goal);
+ recMemory.fill_in_new_instantiation_stuff(chunk_inst, true);

} /* matches { condition *inst_lhs_top, *inst_lhs_bottom ... */

=======================================
--- /jsoar-core/src/main/java/org/jsoar/kernel/memory/OSupport.java Thu
Sep 9 17:40:11 2010
+++ /jsoar-core/src/main/java/org/jsoar/kernel/memory/OSupport.java Tue May
28 12:16:10 2013
@@ -178,7 +178,7 @@
* @param inst
* @param top_goal
*/
- public void
calculate_support_for_instantiation_preferences(Instantiation inst, final
IdentifierImpl top_goal)
+ public void
calculate_support_for_instantiation_preferences(Instantiation inst)
{
WmeImpl w;
Condition c;
=======================================
---
/jsoar-core/src/main/java/org/jsoar/kernel/memory/RecognitionMemory.java
Tue Feb 12 13:18:53 2013
+++
/jsoar-core/src/main/java/org/jsoar/kernel/memory/RecognitionMemory.java
Tue May 28 12:16:10 2013
@@ -583,8 +583,7 @@
* @param need_to_do_support_calculations
* @param top_goal
*/
- public void fill_in_new_instantiation_stuff(Instantiation inst,
boolean need_to_do_support_calculations,
- final IdentifierImpl top_goal)
+ public void fill_in_new_instantiation_stuff(Instantiation inst,
boolean need_to_do_support_calculations)
{
find_match_goal(inst);

@@ -667,7 +666,7 @@
// do calc's the normal Soar 6 way
if (need_to_do_support_calculations)
{
- osupport.calculate_support_for_instantiation_preferences(inst,
top_goal);
+ osupport.calculate_support_for_instantiation_preferences(inst);
}
}

@@ -683,7 +682,7 @@
* @param w
* @param top_goal
*/
- private void create_instantiation(Production prod, Token tok, WmeImpl
w, IdentifierImpl top_goal)
+ private void create_instantiation(Production prod, Token tok, WmeImpl
w)
{
final Trace trace = context.getTrace();

@@ -790,7 +789,7 @@
}

// fill in lots of other stuff
- fill_in_new_instantiation_stuff(inst,
need_to_do_support_calculations, top_goal);
+ fill_in_new_instantiation_stuff(inst,
need_to_do_support_calculations);

// print trace info: printing preferences
// Note: can't move this up, since fill_in_new_instantiation_stuff
gives
@@ -1639,7 +1638,7 @@
if (shouldCreateInstantiation(assertion.production,
assertion.token, assertion.wme))
{

this.soarReteListener.consume_last_postponed_assertion();
- create_instantiation(assertion.production,
assertion.token, assertion.wme, top_goal);
+ create_instantiation(assertion.production,
assertion.token, assertion.wme);
}
}

@@ -1673,29 +1672,27 @@
break;
}

- try
+
+ if (this.decisionCycle.current_phase.get() == Phase.APPLY)
{
- if (this.decisionCycle.current_phase.get() == Phase.APPLY)
- {
- decider.active_goal =
this.consistency.highest_active_goal_apply(decider.active_goal.goalInfo.lower_goal);
- }
- else if (this.decisionCycle.current_phase.get() ==
Phase.PROPOSE)
- {
- // PROPOSE
- decider.active_goal =
this.consistency.highest_active_goal_propose(decider.active_goal.goalInfo.lower_goal);
- }
- }
- catch (IllegalStateException e)
+ decider.active_goal =
this.consistency.highest_active_goal_apply(decider.active_goal.goalInfo.lower_goal,
true);
+ }
+ else if (this.decisionCycle.current_phase.get() ==
Phase.PROPOSE)
{
- // FIXME: highest_active_goal_x functions are intended to
be used only when it is
- // guaranteed that the agent is not at quiescence.
- decider.active_goal = null;
+ // PROPOSE
+ decider.active_goal =
this.consistency.highest_active_goal_propose(decider.active_goal.goalInfo.lower_goal,
true);
+ }
+
+ if(decider.active_goal != null)
+ {
+ decider.active_level = decider.active_goal.level;
+ }
+ else
+ {
trace.print(Category.WATERFALL, " inner preference loop
finished but not at quiescence.\n");
break;
}

- assert decider.active_goal != null;
- decider.active_level = decider.active_goal.level;
} // inner elaboration loop/cycle end

// Deallocate preferences delayed during inner elaboration loop.

==============================================================================
Revision: 3f4202a13e30
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:13:58 2013
Log: Removed commons-logging from jsoar-core junit launcher

http://code.google.com/p/jsoar/source/detail?r=3f4202a13e30

Modified:
/jsoar-core/tools/launches/jsoar-core - All unit tests.launch

=======================================
--- /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Apr
2 17:51:56 2013
+++ /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Jun
11 07:13:58 2013
@@ -17,7 +17,6 @@
<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>

==============================================================================
Revision: f32711df7201
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 13:12:31 2013
Log: Merge branch 'master' into maven

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

==============================================================================
Revision: 04cb19cf487d
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:42:27 2013
Log: Added logback configuration file to folder in jsoar-build, added
this folder to all launcher classpaths.

This change enables logback configuration of launchers which bind logback
to slf4j.

http://code.google.com/p/jsoar/source/detail?r=04cb19cf487d

Added:
/jsoar-build/lib/config/logback.xml
Modified:
/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/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/lib/config/logback.xml Tue Jun 11 07:42:27 2013
@@ -0,0 +1,24 @@
+<?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>
+
+ 
+ <logger name="org.jsoar.kernel.Agent" level="info" />
+
+ 
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Tue Apr 2 17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Tue Jun 11 07:42:27 2013
@@ -17,6 +17,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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 Tue
Apr 2 17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch Tue
Jun 11 07:42:27 2013
@@ -15,6 +15,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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 on selection.launch
Tue Apr 2 17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
Tue Jun 11 07:42:27 2013
@@ -15,6 +15,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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 - SoarUnit on selection (with
Tcl).launch Tue Apr 2 17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection (with
Tcl).launch Tue Jun 11 07:42:27 2013
@@ -11,6 +11,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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-build/tools/launches/jsoar - SoarUnit on selection.launch Tue
Apr 2 17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch Tue
Jun 11 07:42:27 2013
@@ -13,6 +13,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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-build/tools/launches/jsoar - soar2soar.launch Tue Apr 2
17:51:56 2013
+++ /jsoar-build/tools/launches/jsoar - soar2soar.launch Tue Jun 11
07:42:27 2013
@@ -15,6 +15,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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"/>
=======================================
--- /jsoar-build/tools/launches/sml - SoarUnit on selection.launch Tue Apr
2 17:51:56 2013
+++ /jsoar-build/tools/launches/sml - SoarUnit on selection.launch Tue Jun
11 07:42:27 2013
@@ -17,6 +17,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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/tools/launches/PerformanceTimer on selection.launch Tue
Apr 2 17:51:56 2013
+++ /jsoar-core/tools/launches/PerformanceTimer on selection.launch Tue Jun
11 07:42:27 2013
@@ -11,6 +11,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" 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"/>
=======================================
--- /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Jun
11 07:13:58 2013
+++ /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Jun
11 07:42:27 2013
@@ -19,6 +19,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
=======================================
--- /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Tue Apr 2 17:51:56 2013
+++ /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Tue Jun 11 07:42:27 2013
@@ -19,6 +19,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
=======================================
--- /jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch Tue Apr 2
17:51:56 2013
+++ /jsoar-sml/tools/launches/jsoar-sml - All unit tests.launch Tue Jun 11
07:42:27 2013
@@ -20,6 +20,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
=======================================
--- /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Tue Apr 2
17:51:56 2013
+++ /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Tue Jun 11
07:42:27 2013
@@ -20,6 +20,7 @@
<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"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>

==============================================================================
Revision: c19027d342cc
Author: bob.marinier <bob.ma...@soartech.com>
Date: Tue May 28 13:18:56 2013
Log: Merge remote-tracking branch 'origin/maven' into maven

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

==============================================================================
Revision: d26999eef34f
Author: Jonathan Voigt <voi...@gmail.com>
Date: Tue Jun 11 07:42:55 2013
Log: Added legacy bindings for commons-logging because apache
beanutils references it directly.

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

Added:
/jsoar-core/lib/jcl-over-slf4j-1.7.5.jar
Modified:
/jsoar-core/.classpath

=======================================
--- /dev/null
+++ /jsoar-core/lib/jcl-over-slf4j-1.7.5.jar Tue Jun 11 07:42:55 2013
Binary file, no diff available.
=======================================
--- /jsoar-core/.classpath Tue Apr 2 17:51:56 2013
+++ /jsoar-core/.classpath Tue Jun 11 07:42:55 2013
@@ -10,5 +10,6 @@
<classpathentry kind="lib" path="lib/db/sqlite-jdbc-3.6.20.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="lib" path="lib/jcl-over-slf4j-1.7.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

==============================================================================
Revision: 2d48f5a1c4cb
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:00:52 2013
Log: Merge branch 'master' into maven

Most changes here have a radically different solution than what is used on
master because of the maven system.

Conflicts:
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

http://code.google.com/p/jsoar/source/detail?r=2d48f5a1c4cb

Modified:
/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-core/pom.xml
/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-tcl/tools/launches/jsoar-tcl - All unit tests.launch
/pom.xml

=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Wed Nov 7 14:59:20 2012
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger (with extra
dbs).launch Tue Jun 11 08:00:52 2013
@@ -15,6 +15,7 @@
<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
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch Wed
Nov 7 14:59:20 2012
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger no args.launch Tue
Jun 11 08:00:52 2013
@@ -10,7 +10,14 @@
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-build"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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.SOURCE_PATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
=======================================
--- /jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
Wed Nov 7 14:59:20 2012
+++ /jsoar-build/tools/launches/jsoar - JSoarDebugger on selection.launch
Tue Jun 11 08:00:52 2013
@@ -10,7 +10,14 @@
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-build"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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:24:17 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection (with
Tcl).launch Tue Jun 11 08:00:52 2013
@@ -6,7 +6,14 @@
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-build"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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:24:17 2013
+++ /jsoar-build/tools/launches/jsoar - SoarUnit on selection.launch Tue
Jun 11 08:00:52 2013
@@ -6,7 +6,14 @@
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-build"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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 Wed Mar 27
08:10:35 2013
+++ /jsoar-build/tools/launches/jsoar - soar2soar.launch Tue Jun 11
08:00:52 2013
@@ -1,16 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jsoar-build"/>
+<listEntry
value="/jsoar-soar2soar/src/main/java/org/jsoar/soar2soar/Soar2Soar.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-build"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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-core/pom.xml Mon Apr 1 19:56:23 2013
+++ /jsoar-core/pom.xml Tue Jun 11 08:00:52 2013
@@ -34,12 +34,23 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.7.2</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.5</version>
+ </dependency>
</dependencies>

</project>
=======================================
--- /jsoar-core/tools/launches/PerformanceTimer on selection.launch Fri Mar
15 12:39:30 2013
+++ /jsoar-core/tools/launches/PerformanceTimer on selection.launch Tue Jun
11 08:00:52 2013
@@ -6,7 +6,14 @@
<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-core"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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 Fri Mar
15 12:39:12 2013
+++ /jsoar-core/tools/launches/jsoar-core - All unit tests.launch Tue Jun
11 08:00:52 2013
@@ -17,7 +17,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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-core"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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.SOURCE_PATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
=======================================
--- /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Sun Nov 11 09:17:47 2012
+++ /jsoar-legilimens/tools/launches/jsoar-legilimens - All unit
tests.launch Tue Jun 11 08:00:52 2013
@@ -17,7 +17,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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-legilimens"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
=======================================
--- /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Fri Mar 15
12:39:12 2013
+++ /jsoar-tcl/tools/launches/jsoar-tcl - All unit tests.launch Tue Jun 11
08:00:52 2013
@@ -18,7 +18,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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"
path="1" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
path="3" projectName="jsoar-tcl"
type="1"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"
path="3" type="4"/>
"/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?>
<runtimeClasspathEntry
internalArchive="/jsoar-build/lib/config" path="3"
type="2"/>
"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<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.SOURCE_PATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
=======================================
--- /pom.xml Tue Apr 2 18:17:53 2013
+++ /pom.xml Tue Jun 11 08:00:52 2013
@@ -19,8 +19,8 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.11</version>
- <scope>test</scope>
+ <version>1.0.13</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>

==============================================================================
Revision: 8a980eddd784
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:37:32 2013
Log: Removed unused ant build cruft

http://code.google.com/p/jsoar/source/detail?r=8a980eddd784

Deleted:
/jsoar-build/build-common.xml
/jsoar-build/build.xml
/jsoar-build/lib/build/junit-4.4.jar
/jsoar-build/tools/launches/jsoar-build - Build all.launch
/jsoar-build/tools/launches/jsoar-build - Clean all.launch

=======================================
--- /jsoar-build/build-common.xml Wed Mar 6 10:31:00 2013
+++ /dev/null
@@ -1,204 +0,0 @@
-<project name="jsoar-build-common" basedir=".">
- <description>jsoar-build-common</description>
-
- <property name="src" location="src/main/java" />
- <property name="lib" location="lib" />
- <property name="main.resources" location="src/main/resources" />
- <property name="test.resources" location="src/test/resources" />
- <property name="test.src" location="src/test/java" />
-
- <property name="target" location="target" />
- <property name="target.classes" location="${target}/classes" />
- <property name="test.classes" location="${target}/test-classes" />
- <property name="test.reports" value="${target}/test-results" />
-
- <property name="java.source.level" value="1.6"/>
- <property name="java.target.level" value="1.6"/>
-
- <property name="jar.name" value="${ant.project.name}-${version}.jar"/>
- <property name="jar.source.name"
value="${ant.project.name}-${version}.src.jar"/>
-
- <property name="manifest.classpath" value=""/>
-
- <property name="doc.packagenames" value="org.jsoar.*"/>
- <property name="doc.sourcepath" location="${src}"/>
- <property name="doc.excludepackagenames" value="org.jsoar.demos.*"/>
- <property name="doc.destdir"
location="${dist}/docs/${ant.project.name}/api"/>
- <property name="doc.windowtitle" value="${ant.project.name}
${version}"/>
-
-
- <target name="init" description="Create temporary build directories">
- <mkdir dir="${target}" />
- <mkdir dir="${target.classes}" />
- <mkdir dir="${test.classes}" />
- <mkdir dir="${test.reports}" />
-
- <path id="compile.libs.extra"/>
-
- 
- <path id="compile.libs">
- <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- 
- <fileset dir="${lib}/build-only" erroronmissingdir="false">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${dist.lib}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <path id="test.libs">
- <path refid="compile.libs" />
- <pathelement location="../jsoar-build/lib/build/junit-4.4.jar"
/>
-
- 
- <fileset dir="${lib}/db" erroronmissingdir="false">
- <include name="*.jar" />
- </fileset>
- </path>
-
- </target>
-
- <target name="clean" description="Delete all temporary build files">
- <delete dir="${target}" />
- </target>
-
- <target name="buildinfo">
- <touch
file="${target.classes}/${ant.project.name}.buildinfo.properties"/>
-
- 
- <propertyfile
file="${target.classes}/${ant.project.name}.buildinfo.properties"
- comment="Build information generated by build.xml">
- <entry key="${ant.project.name}.buildinfo.version"
value="${version}"/>
- <entry key="${ant.project.name}.buildinfo.soarVersion"
value="${soarVersion}"/>
- <entry key="${ant.project.name}.buildinfo.date"
- type="date"
- value="now"
- pattern="dd/MM/yyyy HH:mm"/>
- <entry key="${ant.project.name}.buildinfo.builtBy"
value="${user.name}"/>
- </propertyfile>
- </target>
-
- <target name="compile" depends="init" description="compile the
source ">
-
- <javac destdir="${target.classes}" debug="on" optimize="on"
- target="${java.target.level}" source="${java.source.level}"
- includeAntRuntime="no">
- <src path="${src}" />
- <classpath refid="compile.libs"/>
- </javac>
-
- <copy todir="${target.classes}">
- <fileset dir="${main.resources}">
- <exclude name="**/.svn"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile-tests" depends="compile" description="compile
the test sources" unless="notest">
-
- <javac destdir="${test.classes}" debug="on" optimize="on"
- target="${java.target.level}" source="${java.source.level}"
- includeAntRuntime="no">
- <src path="${test.src}" />
- <classpath>
- <pathelement path="${target.classes}" />
- <path refid="test.libs"/>
- </classpath>
- </javac>
-
- <copy todir="${test.classes}">
- <fileset dir="${test.resources}">
- <exclude name="**/.svn"/>
- </fileset>
- </copy>
- </target>
-
- <target name="test" depends="compile-tests" description="Run unit
tests" unless="notest">
- <junit printsummary="on" haltonfailure="yes" fork="yes"
forkmode="perBatch" showoutput="true">
- <jvmarg value="-Xmx1536M"/>
- <jvmarg value="-ea"/>
-
- <classpath>
- <pathelement path="${target.classes}" />
- <pathelement path="${test.classes}" />
- <path refid="test.libs" />
- </classpath>
-
- <formatter type="xml" />
-
- <batchtest todir="${test.reports}">
- <fileset dir="${test.src}">
- <include name="**/*Test.java" />
- <include name="**/*Tests.java" />
- <include name="**/Test*.java" />
- 
- <exclude name="org/jsoar/JSoarTest.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="jar" depends="test,buildinfo,licenses" description="Create
Jar with manifest">
- <jar destfile="${dist.lib}/${jar.name}">
- <fileset dir="${target.classes}"/>
- <zipgroupfileset dir="${lib}" includes="*.jar"/>
- <manifest>
- <attribute name="Title" value="${ant.project.name}
${version}" />
- <attribute name="Vendor" value="${manifest.vendor}" />
- <attribute name="Date" value="${TODAY} ${TSTAMP}" />
- <attribute name="Version" value="${version}" />
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Copyright" value="${copyright}" />
- <attribute name="Main-Class" value="${jar.main.class}" />
- <attribute name="Class-Path" value=".
${manifest.classpath}" />
- </manifest>
- </jar>
-
- 
- <jar destfile="${dist.lib}/${jar.source.name}">
- <fileset dir="${src}">
- <exclude name="**/.svn"/>
- </fileset>
- </jar>
-
- 
- <copy todir="${dist.lib}" >
- <fileset dir="${lib}/build-only" erroronmissingdir="false">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="licenses">
- 
- <mkdir dir="${dist}/licenses"/>
- <copy todir="${dist}/licenses">
- <fileset dir="${lib}">
- <include name="*.txt"/>
- <include name="*.htm"/>
- </fileset>
- </copy>
- </target>
-
- <target name="doc" depends="init" description="Generate API
documentation" unless="nodoc">
- <javadoc packagenames="${doc.packagenames}"
- sourcepath="${src}"
- classpathref="compile.libs"
- excludepackagenames="${doc.excludepackagenames}"
- defaultexcludes="yes"
- destdir="${doc.destdir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${doc.windowtitle}">
- <doctitle><![CDATA[<h1><a
href="http://jsoar.googlecode.com">JSoar</a> ${version}</h1>]]></doctitle>
- <bottom><![CDATA[<i>${copyright}</i>]]></bottom>
- <tag name="todo" scope="all" description="Todo:"/>
- </javadoc>
- </target>
-</project>
=======================================
--- /jsoar-build/build.xml Fri Jul 30 19:15:56 2010
+++ /dev/null
@@ -1,114 +0,0 @@
-<project name="jsoar" default="dist" basedir=".">
- 
- <property name="soarVersion" value="9.0.1" />
- <property name="copyright" value="(c) Dave Ray, 2010"/>
- <property name="manifest.vendor" value="Dave Ray"/>
-
- <property name="dist" location="dist" />
- <property name="dist.lib" location="${dist}/lib" />
- <property name="dist.bin" location="${dist}/bin" />
-
-
- <target name="init-props" description="Create temporary build
directories">
- <tstamp />
- 
- <property name="version" value="snapshot-${DSTAMP}" />
- <property name="dist.zip"
location="${ant.project.name}-${version}.zip"/>
-
- <filterset id="filters">
- <filter token="JSOAR_VERSION" value="${version}"/>
- <filter token="JSOAR_DEBUGGER_JAR"
value="lib/jsoar-debugger-${version}.jar"/>
- <filter token="JSOAR_DEMOS_JAR"
value="lib/jsoar-demos-${version}.jar"/>
- </filterset>
- </target>
-
- <target name="init" depends="init-props" description="Create output
directories">
- <mkdir dir="${dist}" />
- <mkdir dir="${dist.lib}" />
- <mkdir dir="${dist.bin}"/>
-
- <copy todir="${dist}" file="resources/license.txt"/>
- <copy todir="${dist}">
- <fileset file="resources/readme.txt"/>
- <fileset file="resources/license.txt"/>
- <filterset refid="filters"/>
- </copy>
- <copy todir="${dist.bin}">
- <fileset file="resources/bin/jsoar.bat"/>
- <fileset file="resources/bin/jsoar"/>
-
- <fileset file="resources/bin/soar2soar.bat"/>
-
- <fileset file="resources/bin/soarunit.bat"/>
- <fileset file="resources/bin/soarunit"/>
-
- <filterset refid="filters"/>
- </copy>
- <chmod file="${dist.bin}/jsoar" perm="+x"/>
- <chmod file="${dist.bin}/soarunit" perm="+x"/>
- </target>
-
- <target name="dist" depends="init">
- <ant dir="../jsoar-core" antfile="build.xml"/>
- <ant dir="../jsoar-debugger" antfile="build.xml"/>
- <ant dir="../jsoar-tcl" antfile="build.xml"/>
- <ant dir="../jsoar-legilimens" antfile="build.xml"/>
- <ant dir="../jsoar-soarunit" antfile="build.xml"/>
- <ant dir="../jsoar-sml" antfile="build.xml"/>
- <ant dir="../jsoar-demos" antfile="build.xml"/>
- <ant dir="../jsoar-ruby" antfile="build.xml"/>
- <ant dir="../jsoar-soar2soar" antfile="build.xml"/>
-
- <antcall target="zip"/>
- </target>
-
- <target name="zip" depends="init-props">
- <zip destfile="${dist.zip}" >
- <zipfileset dir="${dist}"
prefix="${ant.project.name}-${version}"/>
- </zip>
- </target>
-
- <target name="clean">
- <delete dir="${dist}" />
- <delete file="${dist.zip}"/>
-
- <ant dir="../jsoar-core" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-debugger" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-tcl" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-legilimens" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-soarunit" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-sml" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-demos" antfile="build.xml" target="clean"/>
- <ant dir="../jsoar-soar2soar" antfile="build.xml" target="clean"/>
- </target>
-
- <target name="doc">
- <ant dir="../jsoar-core" antfile="build.xml" target="doc"/>
- <ant dir="../jsoar-debugger" antfile="build.xml" target="doc"/>
- <ant dir="../jsoar-tcl" antfile="build.xml" target="doc"/>
- 
- </target>
-
- 
- <target name="sign" depends="init-props">
- <input message="Keystore password:" addproperty="storepass"/>
-
- <signjar alias="jsoar" storepass="${storepass}">
- <path>
- <fileset dir="${dist.lib}" includes="*.jar"/>
- </path>
- </signjar>
- </target>
-</project>
=======================================
--- /jsoar-build/lib/build/junit-4.4.jar Sun May 3 18:31:55 2009
+++ /dev/null
Binary file, no diff available.
=======================================
--- /jsoar-build/tools/launches/jsoar-build - Build all.launch Fri May 21
18:17:33 2010
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE"
value="${workspace}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jsoar-build/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"
value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME"
value="jdk1.6.0_16"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID"
value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${workspace_loc:/jsoar-build/build.xml}"/>
-<stringAttribute key="process_factory_id"
value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
=======================================
--- /jsoar-build/tools/launches/jsoar-build - Clean all.launch Fri May 21
18:17:33 2010
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE"
value="${workspace}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jsoar-build/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jsoar-build"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"
value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME"
value="jdk1.6.0_16"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID"
value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS"
value="clean,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${workspace_loc:/jsoar-build/build.xml}"/>
-<stringAttribute key="process_factory_id"
value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>

==============================================================================
Revision: 28d6fdfc64e3
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Jun 11 08:39:53 2013
Log: Added top-level project ignores

http://code.google.com/p/jsoar/source/detail?r=28d6fdfc64e3

Modified:
/.gitignore

=======================================
--- /.gitignore Thu Mar 28 10:39:46 2013
+++ /.gitignore Tue Jun 11 08:39:53 2013
@@ -1,2 +1,4 @@
# EGit never sees this file, please use subfolder .gitignore files
jsoar-*.zip
+.project
+org.eclipse.m2e.core.prefs

Reply all

Reply to author

Forward

0 new messages