[ohla-devel] SF.net SVN: ohla: [104] trunk
Status: Beta
Brought to you by:
mnewcomb
Menu
▾
▴
[ohla-devel] SF.net SVN: ohla: [104] trunk
|
From: <mne...@us...> - 2007-02-08 19:24:14
|
Revision: 104
http://svn.sourceforge.net/ohla/?rev=104&view=rev
Author: mnewcomb
Date: 2007-02-08 11:24:14 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
- all but 1 time management test passes
Modified Paths:
--------------
trunk/build/build.xml
trunk/build/intellij/HLA 1.3.iml
trunk/build/intellij/IEEE 1516.iml
trunk/build/intellij/OHLA.iml
trunk/build/intellij/OHLA.ipr
trunk/build/intellij/OHLA.iws
trunk/build/intellij/RTI.iml
trunk/build/intellij/Testsuite.iml
trunk/resources/testsuite/ieee-1516-testng.xml
trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/time/TimeManager.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/Federate.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/time/TimeKeeper.java
trunk/testsuite/src/java/net/sf/ohla/rti1516/FederationManagementTestNG.java
trunk/testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java
trunk/testsuite/src/java/net/sf/ohla/rti1516/OwnershipManagementTestNG.java
trunk/testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java
Added Paths:
-----------
trunk/resources/logback-test.xml
trunk/thirdparty/logback/
trunk/thirdparty/logback/LICENSE.txt
trunk/thirdparty/logback/lib/
trunk/thirdparty/logback/lib/logback-classic-0.9.jar
trunk/thirdparty/logback/lib/logback-core-0.9.jar
Removed Paths:
-------------
trunk/resources/properties/log4j.properties
trunk/rti/src/java/net/sf/ohla/rti1516/federation/time/TimeConstrainedFederate.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/time/TimeRegulatingFederate.java
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/build.xml 2007-02-08 19:24:14 UTC (rev 104)
@@ -41,14 +41,6 @@
<!-- Libraries -->
<!-- ================================================================ -->
- <!-- Log4J -->
- <property name="apache.log4j.root"
- location="${project.thirdparty}/apache/log4j"/>
- <property name="apache.log4j.lib" location="${apache.log4j.root}/lib"/>
- <path id="apache.log4j.classpath">
- <fileset dir="${apache.log4j.lib}" includes="*.jar"/>
- </path>
-
<!-- MINA -->
<property name="apache.mina.root"
location="${project.thirdparty}/apache/mina"/>
@@ -68,9 +60,16 @@
<property name="slf4j.root" location="${project.thirdparty}/slf4j"/>
<property name="slf4j.lib" location="${slf4j.root}/lib"/>
<path id="slf4j.classpath">
- <pathelement location="${slf4j.lib}/slf4j-log4j12.jar"/>
+ <fileset dir="${slf4j.lib}" includes="*.jar"/>
</path>
+ <!-- Logback -->
+ <property name="logback.root" location="${project.thirdparty}/logback"/>
+ <property name="logback.lib" location="${logback.root}/lib"/>
+ <path id="logback.classpath">
+ <fileset dir="${logback.lib}" includes="*.jar"/>
+ </path>
+
<!-- JavaCC -->
<property name="javacc.root" location="${project.thirdparty}/javacc"/>
<property name="javacc.bin" location="${javacc.root}/bin"/>
@@ -85,9 +84,9 @@
<!-- The combined library classpath. -->
<path id="library.classpath">
- <path refid="apache.log4j.classpath"/>
<path refid="apache.mina.classpath"/>
<path refid="slf4j.classpath"/>
+ <path refid="logback.classpath"/>
<path refid="dom4j.classpath"/>
</path>
@@ -113,11 +112,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="">
- <!-- The build id (when was this thing built). -->
- <tstamp>
- <format property="build.id" pattern="yyyyMMddHHmm"/>
- </tstamp>
+ <target name="init">
</target>
@@ -320,7 +315,7 @@
<pathelement location="${output.lib}/${ieee-1516.jar}"/>
<pathelement location="${output.lib}/${rti.jar}"/>
<pathelement location="${output}/testsuite/classes"/>
- <pathelement location="${project.resources.properties}"/>
+ <pathelement location="${project.resources}"/>
<pathelement location="${project.resources.testsuite}"/>
</classpath>
<xmlfileset dir="${project.resources.testsuite}" includes="ieee-1516-testng.xml"/>
@@ -353,7 +348,7 @@
<pathelement location="${output.lib}/${ieee-1516.jar}"/>
<pathelement location="${output.lib}/${rti.jar}"/>
<pathelement location="${output}/testsuite/classes"/>
- <pathelement location="${project.resources.properties}"/>
+ <pathelement location="${project.resources}"/>
<pathelement location="${project.resources.testsuite}"/>
</classpath>
<xmlfileset dir="${project.resources.testsuite}"
@@ -411,7 +406,7 @@
<pathelement location="${output.lib}/${ieee-1516.jar}"/>
<pathelement location="${output.lib}/${hla-1.3.jar}"/>
<pathelement location="${output.lib}/${rti.jar}"/>
- <pathelement location="${project.resources.properties}"/>
+ <pathelement location="${project.resources}"/>
</classpath>
<jvmarg value="-server"/>
@@ -425,8 +420,7 @@
<!-- Cleaning -->
<!-- ================================================================== -->
- <target name="clean-light" depends=""
- description="Cleans any editor backup files.">
+ <target name="clean-light" description="Cleans any editor backup files.">
<delete>
<fileset dir="${project.root}" includes="**/*~" defaultexcludes="no"/>
</delete>
Modified: trunk/build/intellij/HLA 1.3.iml
===================================================================
--- trunk/build/intellij/HLA 1.3.iml 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/intellij/HLA 1.3.iml 2007-02-08 19:24:14 UTC (rev 104)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../output/hla-1.3/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../hla-1.3">
@@ -9,6 +9,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="logback" level="project" />
+ <orderEntry type="library" name="slf4j" level="project" />
<orderEntryProperties />
</component>
<component name="copyright">
Modified: trunk/build/intellij/IEEE 1516.iml
===================================================================
--- trunk/build/intellij/IEEE 1516.iml 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/intellij/IEEE 1516.iml 2007-02-08 19:24:14 UTC (rev 104)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../output/ieee-1516/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../ieee-1516">
Modified: trunk/build/intellij/OHLA.iml
===================================================================
--- trunk/build/intellij/OHLA.iml 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/intellij/OHLA.iml 2007-02-08 19:24:14 UTC (rev 104)
@@ -1,22 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/../../resources/properties" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
<component name="copyright">
Modified: trunk/build/intellij/OHLA.ipr
===================================================================
--- trunk/build/intellij/OHLA.ipr 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/intellij/OHLA.ipr 2007-02-08 19:24:14 UTC (rev 104)
@@ -96,7 +96,6 @@
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
<option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -202,6 +201,7 @@
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" value="" />
<option name="HEAP_SIZE" />
+ <option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="JikesSettings">
@@ -220,121 +220,121 @@
</component>
<component name="Palette2">
<group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false">
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false">
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false">
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false">
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false">
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false">
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false">
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false">
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false">
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false">
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false">
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false">
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false">
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false">
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false">
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false">
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false">
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false">
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false">
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false">
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false">
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false">
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false">
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false">
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false">
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
@@ -348,7 +348,7 @@
<module fileurl="file://$PROJECT_DIR$/Testsuite.iml" filepath="$PROJECT_DIR$/Testsuite.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
<component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
@@ -394,7 +394,7 @@
<option name="filler" value=" " />
</value>
</option>
- <option name="notice" value="Copyright (c) &#36;today.year, Michael Newcomb Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." />
+ <option name="notice" value="Copyright (c) 2006-2007, Michael Newcomb Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="4" />
<option name="relativeBefore" value="true" />
@@ -576,31 +576,26 @@
<root url="file://$PROJECT_DIR$/../../../mina-1.1/core/src/main/java" />
</SOURCES>
</library>
- <library name="slf4j-log4j12">
+ <library name="logback">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../thirdparty/slf4j/lib/slf4j-log4j12.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../thirdparty/logback/lib/logback-classic-0.9.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../thirdparty/logback/lib/logback-core-0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
- <library name="slf4j-nop">
+ <library name="slf4j">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../thirdparty/slf4j/lib/slf4j-nop.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../thirdparty/slf4j/lib/slf4j-api-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
- <library name="log4j-1.2.14">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../thirdparty/apache/log4j/lib/log4j-1.2.14.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
</component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+ <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
</component>
<UsedPathMacros />
</project>
Modified: trunk/build/intellij/OHLA.iws
===================================================================
--- trunk/build/intellij/OHLA.iws 2007-02-08 15:41:53 UTC (rev 103)
+++ trunk/build/intellij/OHLA.iws 2007-02-08 19:24:14 UTC (rev 104)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4" relativePaths="true">
<component name="AspectsView" />
- <component name="BookmarkManager" />
+ <component name="BookmarkManager">
+ <editor_bookmark url="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectInstance.java" line="211" />
+ </component>
<component name="ChangeBrowserSettings">
<option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
<option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
@@ -17,7 +19,35 @@
<option name="USER" value="" />
</component>
<component name="ChangeListManager">
- <list default="true" name="Default" comment="" />
+ <list default="true" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OHLA.iml" afterPath="$PROJECT_DIR$/OHLA.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/time/TimeKeeper.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/time/TimeKeeper.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../thirdparty/logback/LICENSE.txt" />
+ <change type="DELETED" beforePath="D:\projects\ohla-0.4\resources\properties\log4j.properties" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../resources/logback-test.xml" />
+ <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federation\time\TimeConstrainedFederate.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../thirdparty/logback/lib/logback-core-0.9.jar" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/RTI.iml" afterPath="$PROJECT_DIR$/RTI.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/IEEE 1516.iml" afterPath="$PROJECT_DIR$/IEEE 1516.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../build.xml" afterPath="$PROJECT_DIR$/../build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OHLA.iws" afterPath="$PROJECT_DIR$/OHLA.iws" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../thirdparty/logback" />
+ <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federation\time\TimeRegulatingFederate.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../thirdparty/logback/lib/logback-classic-0.9.jar" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/Federate.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/Federate.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/time/TimeManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/time/TimeManager.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml" afterPath="$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OHLA.ipr" afterPath="$PROJECT_DIR$/OHLA.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/OwnershipManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/OwnershipManagementTestNG.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/FederationManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/FederationManagementTestNG.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../thirdparty/logback/lib" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/HLA 1.3.iml" afterPath="$PROJECT_DIR$/HLA 1.3.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Testsuite.iml" afterPath="$PROJECT_DIR$/Testsuite.iml" />
+ </list>
+ <list name="Failed commit: Default" comment="- removed log4j" />
</component>
<component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="true" />
@@ -32,6 +62,8 @@
<option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
<option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
<option name="COMPILE_DEPENDENT_FILES" value="false" />
+ <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
+ <option name="ASSERT_NOT_NULL" value="true" />
</component>
<component name="CoverageDataManager" />
<component name="Cvs2Configuration">
@@ -85,6 +117,47 @@
<disable_hints />
</component>
<component name="DebuggerManager">
+ <line_breakpoints>
+ <breakpoint url="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectInstance.java" line="102" class="net.sf.ohla.rti1516.federation.objects.ObjectInstance" package="net.sf.ohla.rti1516.federation.objects">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/AttributeInstance.java" line="141" class="net.sf.ohla.rti1516.federation.objects.AttributeInstance" package="net.sf.ohla.rti1516.federation.objects">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectInstance.java" line="211" class="net.sf.ohla.rti1516.federation.objects.ObjectInstance" package="net.sf.ohla.rti1516.federation.objects">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -169,56 +242,87 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="FederationExecution.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java">
+ <file leaf-file-name="ObjectManagementTestNG.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="403" column="0" selection-start="14488" selection-end="14488" vertical-scroll-proportion="0.021197008">
+ <state line="481" column="39" selection-start="17964" selection-end="17964" vertical-scroll-proportion="0.021573603">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ObjectInstance.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectInstance.java">
+ <file leaf-file-name="OwnershipManagementTestNG.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/OwnershipManagementTestNG.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="13" selection-start="1932" selection-end="1932" vertical-scroll-proportion="0.021197008">
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1166728743453" expanded="true" signature="13916:13936" placeholder="{...}" />
- </folding>
+ <state line="550" column="0" selection-start="19642" selection-end="19642" vertical-scroll-proportion="0.021573603">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ObjectManager.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectManager.java">
+ <file leaf-file-name="SupportServicesTestNG.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/SupportServicesTestNG.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="74" column="14" selection-start="2434" selection-end="2434" vertical-scroll-proportion="0.70746636">
- <folding>
- <marker date="1166728740359" expanded="true" signature="2068:2178" placeholder="{...}" />
- </folding>
+ <state line="43" column="13" selection-start="1566" selection-end="1566" vertical-scroll-proportion="0.021573603">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AttributeInstance.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/AttributeInstance.java">
+ <file leaf-file-name="Federate.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/Federate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="0" selection-start="655" selection-end="655" vertical-scroll-proportion="0.08323134">
+ <state line="338" column="38" selection-start="9390" selection-end="9390" vertical-scroll-proportion="0.021573603">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AttributeInstance.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/AttributeInstance.java">
+ <file leaf-file-name="ieee-1516-testng.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1035" selection-end="1035" vertical-scroll-proportion="0.124847">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="TestObjectModel.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../resources/testsuite/TestObjectModel.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="TimeManagementTestNG.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="626" column="13" selection-start="23219" selection-end="23219" vertical-scroll-proportion="0.021573603">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="logback-test.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../resources/logback-test.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="20" column="54" selection-start="839" selection-end="839" vertical-scroll-proportion="0.4314721">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/../build.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="44" column="0" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.35406092">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -235,20 +339,15 @@
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SPLITTER_PROPORTION" value="0.5" />
<option name="GROUP_BY_SEVERITY" value="false" />
+ <option name="FILTER_RESOLVED_ITEMS" value="true" />
<option name="ANALYZE_TEST_SOURCES" value="true" />
+ <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
<option name="SCOPE_TYPE" value="3" />
<option name="CUSTOM_SCOPE_NAME" value="Project Files" />
- <profile name="Default" />
+ <option name="SHOW_ONLY_DIFF" value="false" />
+ <option name="myCurrentProfileName" value="Default" />
</component>
- <component name="J2EEProjectPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.j2ee.module.view.nodes.J2EEProjectNodeDescriptor" />
- </PATH_ELEMENT>
- </PATH>
- <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
- </component>
+ <component name="J2EEProjectPane" />
<component name="JspContextManager" />
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" value="OHLA" />
@@ -256,36 +355,14 @@
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hla.rti1516.jlc.omt" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
</component>
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
@@ -309,13 +386,9 @@
<option name="ENABLED" value="true" />
<option name="USE_LOGIN" value="false" />
<option name="LOGIN_SILENTLY" value="false" />
- <option name="INTEGRATE_BRANCH_NAME" />
- <option name="INTEGRATE_CHANGELIST_NUM" value="-1" />
<option name="INTEGRATE_RUN_RESOLVE" value="true" />
<option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
- <option name="INTEGRATE_CHANGE_LIST_NUMBER" value="" />
- <option name="INTEGRATE_CHANGE_LIST" value="false" />
- <option name="INTEGRATE_REVERSE" value="false" />
+ <option name="SERVER_TIMEOUT" value="20000" />
</component>
<component name="ProjectLevelVcsManager">
<OptionsSetting value="true" id="Add" />
@@ -332,257 +405,451 @@
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation\objects" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federate\objects" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src" />
+ <option name="myItemType" value="com.intell...
[truncated message content] |