You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(97) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(127) |
Feb
(34) |
Mar
(16) |
Apr
(26) |
May
(55) |
Jun
(107) |
Jul
(36) |
Aug
(72) |
Sep
(90) |
Oct
(41) |
Nov
(27) |
Dec
(13) |
2008 |
Jan
(37) |
Feb
(39) |
Mar
(98) |
Apr
(115) |
May
(134) |
Jun
(120) |
Jul
(86) |
Aug
(149) |
Sep
(68) |
Oct
(66) |
Nov
(104) |
Dec
(49) |
2009 |
Jan
(131) |
Feb
(132) |
Mar
(125) |
Apr
(172) |
May
(161) |
Jun
(43) |
Jul
(47) |
Aug
(38) |
Sep
(18) |
Oct
(6) |
Nov
(1) |
Dec
(15) |
2010 |
Jan
(21) |
Feb
(8) |
Mar
(10) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(4) |
2011 |
Jan
(23) |
Feb
(10) |
Mar
(13) |
Apr
(3) |
May
|
Jun
(19) |
Jul
(11) |
Aug
(22) |
Sep
|
Oct
(4) |
Nov
(2) |
Dec
(12) |
2012 |
Jan
(3) |
Feb
(4) |
Mar
(7) |
Apr
(3) |
May
|
Jun
(1) |
Jul
(1) |
Aug
(30) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(8) |
2013 |
Jan
(3) |
Feb
(40) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(12) |
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <cr...@us...> - 2009-09-10 12:53:35
|
Revision: 5676 http://jnode.svn.sourceforge.net/jnode/?rev=5676&view=rev Author: crawley Date: 2009-09-10 12:23:51 +0000 (Thu, 10 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (the rest) Modified Paths: -------------- branches/jikesRVM/JNode.ipr branches/jikesRVM/build.bat branches/jikesRVM/build.sh branches/jikesRVM/docs/.project branches/jikesRVM/jnode.iml branches/jikesRVM/jnode.properties.dist branches/jikesRVM/udpreceiver.bat branches/jikesRVM/udpreceiver.sh Added Paths: ----------- branches/jikesRVM/docs/.checkstyle branches/jikesRVM/docs/presentations/TheWayAhead.odp branches/jikesRVM/docs/presentations/TheWayAhead.pdf branches/jikesRVM/docs/presentations/fosdem09/ branches/jikesRVM/docs/presentations/fosdem09/slides.pdf branches/jikesRVM/jnode-eclipse-formatter-settings.xml branches/jikesRVM/test.sh Removed Paths: ------------- branches/jikesRVM/JNode.iws branches/jikesRVM/docs/presentations/fosdem09/slides.pdf Property Changed: ---------------- branches/jikesRVM/build.bat branches/jikesRVM/build.sh branches/jikesRVM/docs/ Modified: branches/jikesRVM/JNode.ipr =================================================================== --- branches/jikesRVM/JNode.ipr 2009-09-10 11:00:11 UTC (rev 5675) +++ branches/jikesRVM/JNode.ipr 2009-09-10 12:23:51 UTC (rev 5676) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project version="4" relativePaths="true"> +<project relativePaths="true" version="4"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> <buildFile url="file://$PROJECT_DIR$/all/build.xml"> @@ -7,16 +7,131 @@ <antReference projectDefault="true" /> <customJdkName value="" /> <maximumHeapSize value="128" /> + <maximumStackSize value="32" /> <properties /> </buildFile> </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CheckStyle-IDEA"> + <option name="configuration"> + <map> + <entry key="check-test-classes" value="true" /> + <entry key="config-file" value="$PROJECT_DIR$/all/jnode_checks.xml" /> + </map> + </option> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> <component name="CodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS" /> - <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + <option name="PER_PROJECT_SETTINGS"> + <value> + <option name="JAVA_INDENT_OPTIONS"> + <value> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="-4" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </value> + </option> + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" /> + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" /> + <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> + <value /> + </option> + <option name="IMPORT_LAYOUT_TABLE"> + <value> + <package name="" withSubpackages="true" /> + <emptyLine /> + <package name="javax" withSubpackages="false" /> + <package name="java" withSubpackages="false" /> + </value> + </option> + <option name="CALL_PARAMETERS_WRAP" value="1" /> + <option name="METHOD_PARAMETERS_WRAP" value="1" /> + <option name="THROWS_LIST_WRAP" value="1" /> + <option name="EXTENDS_KEYWORD_WRAP" value="1" /> + <option name="THROWS_KEYWORD_WRAP" value="1" /> + <option name="METHOD_CALL_CHAIN_WRAP" value="1" /> + <option name="BINARY_OPERATION_WRAP" value="1" /> + <option name="TERNARY_OPERATION_WRAP" value="1" /> + <option name="ARRAY_INITIALIZER_WRAP" value="1" /> + <option name="ASSIGNMENT_WRAP" value="1" /> + <ADDITIONAL_INDENT_OPTIONS fileType=""> + <option name="INDENT_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="2" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="groovy"> + <option name="INDENT_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="gsp"> + <option name="INDENT_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="java"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="-4" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="js"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="jsp"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="xml"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> + </value> + </option> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> </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)" /> @@ -34,26 +149,57 @@ <entry name="?*.jpg" /> </wildcardResourcePatterns> </component> - <component name="DataSourceManagerImpl" /> + <component name="CopyrightManager" default=""> + <module2copyright /> + </component> <component name="DependenciesAnalyzeManager"> <option name="myForwardDirection" value="false" /> </component> - <component name="DependencyValidationManager" /> + <component name="DependencyValidationManager"> + <option name="SKIP_IMPORT_STATEMENTS" value="false" /> + </component> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="EntryPointsManager"> - <entry_points /> + <entry_points version="2.0" /> </component> <component name="ExportToHTMLSettings"> <option name="PRINT_LINE_NUMBERS" value="false" /> <option name="OPEN_IN_BROWSER" value="false" /> <option name="OUTPUT_DIRECTORY" /> </component> - <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="435AAC2234C36B0F2257FA7F02C447FB" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + </profile> + </profiles> + <list size="0" /> + </component> <component name="JavacSettings"> <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="false" /> <option name="DEPRECATION" value="true" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> + <option name="MAXIMUM_HEAP_SIZE" value="1024" /> </component> <component name="JavadocGenerationManager"> <option name="OUTPUT_DIRECTORY" /> @@ -69,6 +215,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"> @@ -81,112 +228,137 @@ </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" 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" 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" 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" 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" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> </group> </component> + <component name="ProjectDetails"> + <option name="projectName" value="JNode" /> + </component> + <component name="ProjectFileVersion" converted="true" /> + <component name="ProjectKey"> + <option name="state" value="https://jnode.svn.sourceforge.net/svnroot/jnode/trunk/JNode.ipr" /> + </component> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/all/all.iml" filepath="$PROJECT_DIR$/all/all.iml" /> <module fileurl="file://$PROJECT_DIR$/builder/builder.iml" filepath="$PROJECT_DIR$/builder/builder.iml" /> + <module fileurl="file://$PROJECT_DIR$/cli/cli.iml" filepath="$PROJECT_DIR$/cli/cli.iml" /> <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" /> <module fileurl="file://$PROJECT_DIR$/distr/distr.iml" filepath="$PROJECT_DIR$/distr/distr.iml" /> <module fileurl="file://$PROJECT_DIR$/fs/fs.iml" filepath="$PROJECT_DIR$/fs/fs.iml" /> @@ -194,10 +366,18 @@ <module fileurl="file://$PROJECT_DIR$/jnode.iml" filepath="$PROJECT_DIR$/jnode.iml" /> <module fileurl="file://$PROJECT_DIR$/net/net.iml" filepath="$PROJECT_DIR$/net/net.iml" /> <module fileurl="file://$PROJECT_DIR$/shell/shell.iml" filepath="$PROJECT_DIR$/shell/shell.iml" /> + <module fileurl="file://$PROJECT_DIR$/sound/sound.iml" filepath="$PROJECT_DIR$/sound/sound.iml" /> <module fileurl="file://$PROJECT_DIR$/textui/textui.iml" filepath="$PROJECT_DIR$/textui/textui.iml" /> </modules> </component> - <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="java version "1.5.0_02"" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 - jnode" project-jdk-type="JavaSDK" /> + <component name="ResourceManagerContainer"> + <option name="myResourceBundles"> + <value> + <list size="0" /> + </value> + </option> + </component> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> <option name="DEBUGGING_INFO" value="true" /> @@ -205,7 +385,31 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> - <component name="WebServicesPlugin" /> + <component name="SvnBranchConfigurationManager"> + <option name="myConfigurationMap"> + <map> + <entry key="$PROJECT_DIR$"> + <value> + <SvnBranchConfiguration> + <option name="branchUrls"> + <list> + <option value="https://jnode.svn.sourceforge.net/svnroot/jnode/branches" /> + <option value="https://jnode.svn.sourceforge.net/svnroot/jnode/tags" /> + </list> + </option> + <option name="trunkUrl" value="https://jnode.svn.sourceforge.net/svnroot/jnode/trunk" /> + </SvnBranchConfiguration> + </value> + </entry> + </map> + </option> + <option name="myVersion" value="124" /> + <option name="mySupportsUserInfoFilter" value="true" /> + </component> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="svn" /> + </component> + <component name="WebServicesPlugin" addRequiredLibraries="true" /> <component name="libraryTable"> <library name="core"> <CLASSES> @@ -236,11 +440,19 @@ <JAVADOC /> <SOURCES /> </library> + <library name="distr"> + <CLASSES> + <root url="file://$PROJECT_DIR$/distr/lib" /> + <root url="file://$PROJECT_DIR$/distr/lib" /> + <root url="file://$PROJECT_DIR$/distr/lib" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="file://$PROJECT_DIR$/decompiled" /> + <root url="file://$PROJECT_DIR$/distr/decompiled" /> + </SOURCES> + <jarDirectory url="file://$PROJECT_DIR$/distr/lib" recursive="false" /> + </library> </component> - <component name="uidesigner-configuration"> - <option name="INSTRUMENT_CLASSES" value="true" /> - <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> - </component> - <UsedPathMacros /> </project> Deleted: branches/jikesRVM/JNode.iws =================================================================== --- branches/jikesRVM/JNode.iws 2009-09-10 11:00:11 UTC (rev 5675) +++ branches/jikesRVM/JNode.iws 2009-09-10 12:23:51 UTC (rev 5676) @@ -1,658 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4" relativePaths="true"> - <component name="AspectsView" /> - <component name="BookmarkManager" /> - <component name="ChangeBrowserSettings"> - <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> - <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> - <option name="USE_DATE_BEFORE_FILTER" value="false" /> - <option name="USE_DATE_AFTER_FILTER" value="false" /> - <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> - <option name="USE_CHANGE_AFTER_FILTER" value="false" /> - <option name="DATE_BEFORE" value="" /> - <option name="DATE_AFTER" value="" /> - <option name="CHANGE_BEFORE" value="" /> - <option name="CHANGE_AFTER" value="" /> - <option name="USE_USER_FILTER" value="false" /> - <option name="USER" value="" /> - </component> - <component name="CheckinPanelState" /> - <component name="Commander"> - <leftPanel /> - <rightPanel /> - <splitter proportion="0.5" /> - </component> - <component name="CompilerWorkspaceConfiguration"> - <option name="COMPILE_IN_BACKGROUND" value="false" /> - <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" /> - </component> - <component name="Cvs2Configuration"> - <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> - <option name="MERGING_MODE" value="0" /> - <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> - <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> - <option name="RESET_STICKY" value="false" /> - <option name="CREATE_NEW_DIRECTORIES" value="true" /> - <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> - <option name="PROCESS_UNKNOWN_FILES" value="false" /> - <option name="PROCESS_DELETED_FILES" value="false" /> - <option name="PROCESS_IGNORED_FILES" value="false" /> - <option name="RESERVED_EDIT" value="false" /> - <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_CHANGES_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_OUTPUT" value="false" /> - <option name="ADD_WATCH_INDEX" value="0" /> - <option name="REMOVE_WATCH_INDEX" value="0" /> - <option name="UPDATE_KEYWORD_SUBSTITUTION" value="NONE" /> - <option name="MAKE_NEW_FILES_READONLY" value="false" /> - <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> - <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> - <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> - <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> - <option name="CLEAN_COPY" value="false" /> - </component> - <component name="CvsTabbedWindow" /> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> - <component name="DebuggerManager"> - <breakpoint_any> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <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> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <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_any> - <breakpoint_rules /> - <ui_properties /> - </component> - <component name="ErrorTreeViewConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="HIDE_WARNINGS" value="false" /> - </component> - <component name="FavoritesViewImpl"> - <favorites_list name="JNode"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="IS_SHOW_MEMBERS" value="false" /> - <option name="IS_STRUCTURE_VIEW" value="false" /> - <option name="IS_SHOW_MODULES" value="true" /> - <option name="IS_FLATTEN_PACKAGES" value="false" /> - <option name="IS_ABBREVIATION_PACKAGE_NAMES" value="false" /> - <option name="IS_HIDE_EMPTY_MIDDLE_PACKAGES" value="false" /> - <option name="IS_SHOW_LIBRARY_CONTENTS" value="true" /> - </favorites_list> - <option name="myCurrentFavoritesList" value="JNode" /> - </component> - <component name="FileEditorManager" /> - <component name="FindManager"> - <FindUsagesManager> - <setting name="OPEN_NEW_TAB" value="false" /> - </FindUsagesManager> - </component> - <component name="HierarchyBrowserManager"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SORT_ALPHABETICALLY" value="false" /> - <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> - </component> - <component name="InspectionManager"> - <option name="AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SPLITTER_PROPORTION" value="0.5" /> - <option name="GROUP_BY_SEVERITY" value="false" /> - <option name="ANALYZE_TEST_SOURCES" value="true" /> - <option name="SCOPE_TYPE" value="1" /> - <option name="CUSTOM_SCOPE_NAME" value="" /> - <profile name="Default" /> - </component> - <component name="J2EEProjectPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JNode.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="KiwiScrap"> - <confirmations /> - <scraps /> - </component> - <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="jnode" /> - <option name="LAST_EDITED_TAB_NAME" value="Paths" /> - </component> - <component name="NamedScopeManager" /> - <component name="PackagesPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JNode.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - </component> - <component name="PerforceChangeBrowserSettings"> - <option name="USE_CLIENT_FILTER" value="true" /> - <option name="CLIENT" value="" /> - </component> - <component name="PerforceDirect.Settings"> - <option name="useP4CONFIG" value="true" /> - <option name="port" value="<perforce_server>:1666" /> - <option name="client" value="" /> - <option name="user" value="" /> - <option name="passwd" value="" /> - <option name="showCmds" value="false" /> - <option name="useNativeApi" value="true" /> - <option name="pathToExec" value="p4" /> - <option name="useCustomPathToExec" value="false" /> - <option name="SYNC_FORCE" value="false" /> - <option name="SYNC_RUN_RESOLVE" value="true" /> - <option name="REVERT_UNCHANGED_FILES" value="true" /> - <option name="CHARSET" value="none" /> - <option name="SHOW_BRANCHES_HISTORY" value="true" /> - <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" /> - </component> - <component name="ProjectLevelVcsManager"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkin" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <OptionsSetting value="true" id="Undo Check Out" /> - <OptionsSetting value="true" id="Compare with SourceSafe Version" /> - <OptionsSetting value="true" id="Get Latest Version" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JNode.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JNode.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jnode" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JNode.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jnode" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:C:\opensource\jnode" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </component> - <component name="ProjectReloadState"> - <option name="STATE" value="0" /> - </component> - <component name="ProjectView"> - <navigator currentView="ProjectPane" splitterProportion="0.5"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - </navigator> - </component> - <component name="PropertiesComponent"> - <property name="vcs_file_view_treeWidth2" value="77" /> - <property name="vcs_file_view_treeOrder4" value="4" /> - <property name="cvs_file_history_treeWidth0" value="171" /> - <property name="cvs_file_history_treeOrder4" value="4" /> - <property name="cvs_file_history_flatWidth2" value="171" /> - <property name="cvs_file_history_flatOrder4" value="4" /> - <property name="cvs_file_history_flatOrder1" value="1" /> - <property name="vcs_file_view_flatWidth2" value="47" /> - <property name="cvs_file_history_flatWidth1" value="171" /> - <property name="vcs_file_view_flatWidth5" value="50" /> - <property name="vcs_file_view_flatOrder3" value="3" /> - <property name="cvs_file_history_flatOrder2" value="2" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="cvs_file_history_flatWidth4" value="170" /> - <property name="vcs_file_view_treeWidth0" value="77" /> - <property name="vcs_file_view_treeOrder0" value="0" /> - <property name="cvs_file_history_treeOrder5" value="5" /> - <property name="vcs_file_view_flatOrder4" value="4" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="cvs_file_history_flatOrder0" value="0" /> - <property name="cvs_file_history_treeWidth4" value="170" /> - <property name="cvs_file_history_treeOrder3" value="3" /> - <property name="vcs_file_view_flatWidth4" value="51" /> - <property name="cvs_file_history_treeWidth6" value="170" /> - <property name="vcs_file_view_flatOrder2" value="2" /> - <property name="cvs_file_history_treeWidth3" value="171" /> - <property name="vcs_file_view_treeWidth4" value="77" /> - <property name="cvs_file_history_flatOrder6" value="6" /> - <property name="vcs_file_view_treeWidth3" value="78" /> - <property name="cvs_file_history_flatWidth3" value="171" /> - <property name="vcs_file_view_flatOrder0" value="0" /> - <property name="vcs_file_view_flatWidth0" value="147" /> - <property name="vcs_file_view_flatWidth1" value="45" /> - <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="vcs_file_view_flatOrder1" value="1" /> - <property name="cvs_file_history_treeOrder1" value="1" /> - <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="cvs_file_history_treeWidth1" value="171" /> - <property name="cvs_file_history_treeOrder6" value="6" /> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="cvs_file_history_treeWidth2" value="171" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="cvs_file_history_flatOrder3" value="3" /> - <property name="cvs_file_history_flatWidth6" value="170" /> - <property name="vcs_file_view_flatOrder5" value="5" /> - <property name="vcs_file_view_treeOrder3" value="3" /> - <property name="vcs_file_view_treeWidth1" value="78" /> - <property name="cvs_file_history_flatOrder5" value="5" /> - <property name="cvs_file_history_flatWidth5" value="171" /> - <property name="cvs_file_history_treeOrder2" value="2" /> - <property name="vcs_file_view_treeOrder2" value="2" /> - <property name="cvs_file_history_treeWidth5" value="171" /> - <property name="vcs_file_view_flatWidth3" value="47" /> - <property name="cvs_file_history_flatWidth0" value="171" /> - <property name="vcs_file_view_treeOrder1" value="1" /> - <property name="cvs_file_history_treeOrder0" value="0" /> - </component> - <component name="ReadonlyStatusHandler"> - <option name="SHOW_DIALOG" value="true" /> - </component> - <component name="RecentsManager" /> - <component name="RestoreUpdateTree" /> - <component name="RunManager"> - <activeType name="Application" /> - <configuration selected="false" default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration selected="false" default="true" type="Application" factoryName="Application"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <module name="" /> - </configuration> - <configuration selected="false" default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local"> - <option name="WORKING_DIRECTORY" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="7001" /> - <option name="LOCAL" value="true" /> - <option name="OPEN_IN_BROWSER" value="true" /> - <option name="OPEN_IN_BROWSER_URL" value="/" /> - <option name="COMMON_VM_ARGUMENTS" value="" /> - <option name="DOMAIN_PATH" value="" /> - <option name="USER" value="weblogic" /> - <option name="PASSWORD" value="weblogic" /> - <option name="SERVER_NAME" value="myserver" /> - <option name="DOMAIN_NAME" value="mydomain" /> - </configuration> - <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - </configuration> - </component> - <component name="SQL"> - <general /> - <databases savePasswords="false" encodePasswords="true" /> - <queries projectClassLoader="false" save="false" /> - <results primaryKeyCols="true" saveTableConfig="false"> - <rowLimit enabled="true" value="1000" /> - <resizeColumns toHeader="true" toContent="true" /> - </results> - </component> - <component name="SelectInManager" /> - <component name="StarteamConfiguration"> - <option name="SERVER" value="" /> - <option name="PORT" value="49201" /> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="PROJECT" value="" /> - <option name="VIEW" value="" /> - <option name="ALTERNATIVE_WORKING_PATH" value="" /> - </component> - <component name="StructuralSearchPlugin" /> - <component name="StructureViewFactory"> - <option name="AUTOSCROLL_MODE" value="true" /> - <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> - <option name="ACTIVE_ACTIONS" value="" /> - </component> - <component name="SvnChangesBrowserSettings"> - <option name="USE_AUTHOR_FIELD" value="true" /> - <option name="AUTHOR" value="" /> - <option name="LOCATION" value="" /> - <option name="USE_PROJECT_SETTINGS" value="true" /> - <option name="USE_ALTERNATE_LOCATION" value="false" /> - </component> - <component name="SvnConfiguration"> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="PROCESS_UNRESOLVED" value="false" /> - <configuration useDefault="false">C:\Documents and Settings\mh\Application Data\Subversion</configuration> - </component> - <component name="TodoView" selected-index="0"> - <todo-panel id="selected-file"> - <are-packages-shown value="false" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - <todo-panel id="all"> - <are-packages-shown value="true" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - </component> - <component name="ToolWindowManager"> - <frame x="1280" y="95" width="1278" height="764" extended-state="0" /> - <editor active="false" /> - <layout> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3291536" order="8" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33523655" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.17752443" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32970452" order="8" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.32952693" order="1" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> - <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> - <window_info id="Sequence" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - <window_info id="IDE talk" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" /> - <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32980457" order="3" /> - <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32927817" order="3" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - </layout> - </component> - <component name="VCS.FileViewConfiguration"> - <option name="SELECTED_STATUSES" value="DEFAULT" /> - <option name="SELECTED_COLUMNS" value="DEFAULT" /> - <option name="SHOW_FILTERS" value="true" /> - <option name="CUSTOMIZE_VIEW" value="true" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> - </component> - <component name="VcsManagerConfiguration"> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> - <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> - <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" /> - <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> - <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> - <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> - <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> - <option name="ERROR_OCCURED" value="false" /> - <option name="ACTIVE_VCS_NAME" value="svn" /> - <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> - <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - </component> - <component name="VssConfiguration"> - <option name="CLIENT_PATH" value="" /> - <option name="SRCSAFEINI_PATH" value="" /> - <option name="USER_NAME" value="" /> - <option name="PWD" value="" /> - <option name="VSS_IS_INITIALIZED" value="true" /> - <CheckoutOptions> - <option name="COMMENT" value="" /> - <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> - <option name="REPLACE_WRITABLE" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckoutOptions> - <CheckinOptions> - <option name="COMMENT" value="" /> - <option name="KEEP_CHECKED_OUT" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckinOptions> - <AddOptions> - <option name="COMMENT" value="" /> - <option name="STORE_ONLY_LATEST_VERSION" value="false" /> - <option name="CHECK_OUT_IMMEDIATELY" value="false" /> - <option name="FILE_TYPE" value="0" /> - </AddOptions> - <UndocheckoutOptions> - <option name="MAKE_WRITABLE" value="false" /> - <option name="REPLACE_LOCAL_COPY" value="0" /> - <option name="RECURSIVE" value="false" /> - </UndocheckoutOptions> - <GetOptions> - <option name="REPLACE_WRITABLE" value="0" /> - <option name="MAKE_WRITABLE" value="false" /> - <option name="RECURSIVE" value="false" /> - </GetOptions> - </component> - <component name="antWorkspaceConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="FILTER_TARGETS" value="false" /> - <buildFile url="file://$PROJECT_DIR$/all/build.xml"> - <antCommandLine value="" /> - <runInBackground value="false" /> - <targetFilters /> - <treeView value="true" /> - <verbose value="true" /> - <viewClosedWhenNoErrors value="false" /> - </buildFile> - </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/all/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="196" column="2" selection-start="9398" selection-end="9398" vertical-scroll-proportion="0.3327674"> - <folding /> - </state> - </provider> - </entry> - </component> - <component name="ideajad"> - <property name="annotate" value="false" /> - <property name="annotateFully" value="false" /> - <property name="braces" value="false" /> - <property name="clear" value="false" /> - <property name="confirmNavigationTriggeredDecompile" value="true" /> - <property name="dead" value="true" /> - <property name="defaultInitializers" value="false" /> - <property name="dissassemblerOnly" value="false" /> - <property name="fieldsFirst" value="true" /> - <property name="fileExtension" value="java" /> - <property name="fullyQualifiedNames" value="false" /> - <property name="indentation" value="4" /> - <property name="intRadix" value="10" /> - <property name="lineNumbersAsComments" value="true" /> - <property name="longRadix" value="10" /> - <property name="maxStringLength" value="64" /> - <property name="nocast" value="false" /> - <property name="noclass" value="false" /> - <property name="nocode" value="false" /> - <property name="noconv" value="false" /> - <property name="noctor" value="false" /> - <property name="nodos" value="false" /> - <property name="nofd" value="false" /> - <property name="noinner" value="false" /> - <property name="nolvt" value="false" /> - <property name="nonlb" value="false" /> - <property name="outputDirectory" value="" /> - <property name="packFields" value="3" /> - <property name="packImports" value="7" /> - <property name="prefixNumericalClasses" value="_cls" /> - <property name="prefixNumericalFields" value="_fld" /> - <property name="prefixNumericalLocals" value="_lcl" /> - <property name="prefixNumericalMethods" value="_mth" /> - <property name="prefixNumericalParameters" value="_prm" /> - <property name="prefixUnusedExceptions" value="_ex" /> - <property name="readonly" value="false" /> - <property name="safe" value="false" /> - <property name="sort" value="false" /> - <property name="spaceAfterKeyword" value="false" /> - <property name="splitStringsAtNewline" value="false" /> - <property name="useTabs" value="false" /> - </component> - <component name="simpleUML.DiagramSettingsWorkspace" /> - <component name="simpleUML.UMLToolWindowPlugin"> - <General> - <option name="birdViewUpdateDelay" value="2000" /> - <option name="defaultFileLocation" value="file://$PROJECT_DIR$" /> - </General> - <Classdiagram> - <option name="diagramTitleFont" value="SansSerif,1,12" /> - <option name="diagramFont" value="SansSerif,0,10" /> - <option name="defaultFieldsExpanded" value="false" /> - <option name="defaultContructorsExpanded" value="false" /> - <option name="defaultMethodsExpanded" value="false" /> - <option name="showParameters" value="true" /> - <option name="showTooltip" value="true" /> - <option name="showReturnValues" value="true" /> - <option name="longModifier" value="true" /> - <option name="implementsBehaviour" value="1" /> - <option name="extendsBehaviour" value="1" /> - <option name="compartmentBehaviour" value="1" /> - <option name="interfaceBackgroundColor" value="-6494306" /> - <option name="abstractClassBackgroundColor" value="-1580132" /> - <option name="classBackgroundColor" value="-6508057" /> - <option name="diagramBackgroundColor" value="-1" /> - <option name="useAntialiasedConnectors" value="true" /> - <option name="quickSourceLinkColor" value="-16776961" /> - <option name="quickDiagramLinkColor" value="-8454144" /> - <option name="drawDecorations" value="false" /> - <option name="hideFieldList" value="" /> - <option name="showFieldList" value="" /> - <option name="hideConstructorList" value="" /> - <option name="showConstructorList" value="" /> - <option name="hideMethodList" value="" /> - <option name="showMethodList" value="" /> - <option name="minimumFigureSize" value="0,0" /> - </Classdiagram> - <Dependencydiagram> - <option name="diagramTitleFont" value="SansSerif,1,12" /> - <option name="diagramFont" value="SansSerif,0,10" /> - <option name="diagramBackgroundColor" value="-1" /> - <option name="useAntialiasedConnectors" value="true" /> - <option name="packageNameCompressionLevel" value="0" /> - </Dependencydiagram> - <Packagediagram> - <option name="diagramTitleFont" value="SansSerif,0,12" /> - <option name="diagramFont" value="SansSerif,0,10" /> - <option name="packageBackgroundColor" value="-4144960" /... [truncated message content] |
From: <cr...@us...> - 2009-09-10 11:00:24
|
Revision: 5675 http://jnode.svn.sourceforge.net/jnode/?rev=5675&view=rev Author: crawley Date: 2009-09-10 11:00:11 +0000 (Thu, 10 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (distr) Modified Paths: -------------- branches/jikesRVM/distr/.classpath branches/jikesRVM/distr/.project branches/jikesRVM/distr/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/distr/build.xml branches/jikesRVM/distr/descriptors/org.jnode.apps.edit.xml branches/jikesRVM/distr/descriptors/org.jnode.apps.editor.xml branches/jikesRVM/distr/descriptors/org.jnode.apps.httpd.xml branches/jikesRVM/distr/distr.iml branches/jikesRVM/distr/src/apps/fi/iki/elonen/NanoHTTPD.java branches/jikesRVM/distr/src/apps/org/jnode/apps/charvabsh/CharvaBsh.java branches/jikesRVM/distr/src/apps/org/jnode/apps/console/SwingConsole.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/ListElement.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/ListPanel.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/ObjectFieldPair.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/ObjectMethodPair.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/PropertiesPanel.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/RootObjectPanel.java branches/jikesRVM/distr/src/apps/org/jnode/apps/debug/TC.java branches/jikesRVM/distr/src/apps/org/jnode/apps/edit/EditCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/edit/Editor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/editor/LeedCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/editor/TextEditor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/httpd/NanoHTTPDCommand.java branches/jikesRVM/distr/src/install/org/jnode/install/Main.java Added Paths: ----------- branches/jikesRVM/distr/.checkstyle branches/jikesRVM/distr/descriptors/derby.xml branches/jikesRVM/distr/descriptors/jetty.xml branches/jikesRVM/distr/descriptors/net.wimpi.telnetd.xml branches/jikesRVM/distr/descriptors/org.apache.jakarta.commons.logging.xml branches/jikesRVM/distr/descriptors/org.jawk.xml branches/jikesRVM/distr/descriptors/org.jnode.apps.commander.xml branches/jikesRVM/distr/descriptors/org.jnode.apps.jpartition.xml branches/jikesRVM/distr/descriptors/org.jnode.games.xml branches/jikesRVM/distr/lib/ branches/jikesRVM/distr/lib/commons-logging.jar branches/jikesRVM/distr/lib/derby.jar branches/jikesRVM/distr/lib/derbynet.jar branches/jikesRVM/distr/lib/derbytools.jar branches/jikesRVM/distr/lib/jawk-1.02.jar branches/jikesRVM/distr/lib/jetty-6.1.5.jar branches/jikesRVM/distr/lib/jetty-util-6.1.5.jar branches/jikesRVM/distr/lib/jsp-2.1.jar branches/jikesRVM/distr/lib/jsp-api-2.1.jar branches/jikesRVM/distr/lib/servlet-api-2.5-6.1.5.jar branches/jikesRVM/distr/lib/telnetd.jar branches/jikesRVM/distr/src/apps/log4j.properties branches/jikesRVM/distr/src/apps/org/jawk/ branches/jikesRVM/distr/src/apps/org/jawk/JawkMain.java branches/jikesRVM/distr/src/apps/org/jnode/apps/commander/ branches/jikesRVM/distr/src/apps/org/jnode/apps/commander/CharvaCommander.java branches/jikesRVM/distr/src/apps/org/jnode/apps/derby/ branches/jikesRVM/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/editor/LeviCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jetty/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jetty/JettyCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/Context.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/ErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/JPartition.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/ViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/BasePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/CreatePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/BaseCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/Command.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessorListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandStatus.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/DeviceLabelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/PartitionLabelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Component.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Labelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/NumberField.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Options.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/YesNo.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Bounded.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Device.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/DeviceException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSFacade.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSFacadeException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Partition.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/UserFacade.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/UserListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/Constants.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/AbstractAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/AddPartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/FormatPartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/InitMbrAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/RemovePartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/ branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/JNodeCommandShell.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/JNodeShell.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleInputStream.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleOutputStream.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteKeyboardHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreenManager.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/TelnetServerCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/TelnetUtils.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/telnetd.properties branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/RandomAccessFileReader.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/AdapterType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/CreateType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DiskDatabase.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Header.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/Access.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/ExtentType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/UnsupportedFormatException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/test/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskFactory.java branches/jikesRVM/distr/src/apps/org/jnode/games/ branches/jikesRVM/distr/src/apps/org/jnode/games/boxworld/ branches/jikesRVM/distr/src/apps/org/jnode/games/boxworld/BoxWorld.java branches/jikesRVM/distr/src/apps/org/jnode/games/rubik/ branches/jikesRVM/distr/src/apps/org/jnode/games/rubik/Rubik.java branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/ branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/Tetris.java branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/package-info.java branches/jikesRVM/distr/src/emu/ branches/jikesRVM/distr/src/emu/org/ branches/jikesRVM/distr/src/emu/org/jnode/ branches/jikesRVM/distr/src/emu/org/jnode/emu/ branches/jikesRVM/distr/src/emu/org/jnode/emu/EditEmu.java branches/jikesRVM/distr/src/emu/org/jnode/emu/ShellEmu.java branches/jikesRVM/distr/src/install/org/jnode/install/AbstractInstaller.java branches/jikesRVM/distr/src/install/org/jnode/install/ActionInput.java branches/jikesRVM/distr/src/install/org/jnode/install/ActionOutput.java branches/jikesRVM/distr/src/install/org/jnode/install/CopyFile.java branches/jikesRVM/distr/src/install/org/jnode/install/InputContext.java branches/jikesRVM/distr/src/install/org/jnode/install/InstallerAction.java branches/jikesRVM/distr/src/install/org/jnode/install/OutputContext.java branches/jikesRVM/distr/src/install/org/jnode/install/ProgressAware.java branches/jikesRVM/distr/src/install/org/jnode/install/ProgressEvent.java branches/jikesRVM/distr/src/install/org/jnode/install/ProgressListener.java branches/jikesRVM/distr/src/install/org/jnode/install/ProgressSupport.java branches/jikesRVM/distr/src/install/org/jnode/install/ProgressiveAction.java branches/jikesRVM/distr/src/install/org/jnode/install/action/ branches/jikesRVM/distr/src/install/org/jnode/install/action/ActionConstants.java branches/jikesRVM/distr/src/install/org/jnode/install/action/CopyFilesAction.java branches/jikesRVM/distr/src/install/org/jnode/install/action/GrubInstallerAction.java branches/jikesRVM/distr/src/install/org/jnode/install/cmdline/ branches/jikesRVM/distr/src/install/org/jnode/install/cmdline/CommandLineInstaller.java branches/jikesRVM/distr/src/test/ branches/jikesRVM/distr/src/test/org/ branches/jikesRVM/distr/src/test/org/jnode/ branches/jikesRVM/distr/src/test/org/jnode/apps/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/AbstractTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/AbstractTestDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/CustomDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestEmptyDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestNonEmptyDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestOSFacade.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestRemovePartitionFromDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/swingview/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/swingview/FileDeviceView.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/VMWareIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/BaseTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/TestCreation.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/Utils.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java Removed Paths: ------------- branches/jikesRVM/distr/lib/commons-logging.jar branches/jikesRVM/distr/lib/derby.jar branches/jikesRVM/distr/lib/derbynet.jar branches/jikesRVM/distr/lib/derbytools.jar branches/jikesRVM/distr/lib/jawk-1.02.jar branches/jikesRVM/distr/lib/jetty-6.1.5.jar branches/jikesRVM/distr/lib/jetty-util-6.1.5.jar branches/jikesRVM/distr/lib/jsp-2.1.jar branches/jikesRVM/distr/lib/jsp-api-2.1.jar branches/jikesRVM/distr/lib/servlet-api-2.5-6.1.5.jar branches/jikesRVM/distr/lib/telnetd.jar branches/jikesRVM/distr/src/apps/org/jawk/JawkMain.java branches/jikesRVM/distr/src/apps/org/jnode/apps/commander/CharvaCommander.java branches/jikesRVM/distr/src/apps/org/jnode/apps/console/ShellEmu.java branches/jikesRVM/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/editor/EditEmu.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jetty/JettyCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/Context.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/ErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/JPartition.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/ViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/BaseDeviceCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/BasePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/CreatePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/InitMbrCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/BaseCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/Command.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandProcessorListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/commands/framework/CommandStatus.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/ConsoleViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/DeviceLabelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/PartitionLabelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Component.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Labelizer.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/NumberField.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/Options.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/consoleview/components/YesNo.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Bounded.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Device.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/DeviceException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSFacade.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSFacadeException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/OSListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/Partition.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/UserFacade.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/model/UserListener.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/CommandProcessorView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/Constants.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/DeviceView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/DiskAreaView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/MainView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/PartitionView.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingErrorReporter.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/SwingViewFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/ branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/AbstractAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/AddPartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/FormatPartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/InitMbrAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/jpartition/swingview/actions/RemovePartitionAction.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/JNodeCommandShell.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/JNodeShell.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleInputStream.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleOutputStream.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteKeyboardHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreenManager.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/TelnetServerCommand.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/TelnetUtils.java branches/jikesRVM/distr/src/apps/org/jnode/apps/telnetd/telnetd.properties branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/ExtentDeclaration.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/IOUtils.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/RandomAccessFileReader.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/VMWareDisk.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/AdapterType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/CreateType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Descriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/DiskDatabase.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/descriptor/Header.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/Access.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/Extent.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/extent/ExtentType.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/ExtentIO.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/FileDescriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/IOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/UnsupportedFormatException.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleDescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/simple/SimpleIOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTable.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/AllocationTableRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/EntryArray.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainDirectory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/GrainTable.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDescriptorRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseDiskFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtent.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentFactory.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeader.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentHeaderRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentIO.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseExtentRW.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseFileDescriptor.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/handler/sparse/SparseIOHandler.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/test/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/ branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskCopier.java branches/jikesRVM/distr/src/apps/org/jnode/apps/vmware/disk/tools/DiskFactory.java branches/jikesRVM/distr/src/apps/org/jnode/games/boxworld/ branches/jikesRVM/distr/src/apps/org/jnode/games/boxworld/BoxWorld.java branches/jikesRVM/distr/src/apps/org/jnode/games/rubik/ branches/jikesRVM/distr/src/apps/org/jnode/games/rubik/Rubik.java branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/ branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/Tetris.java branches/jikesRVM/distr/src/apps/org/jnode/games/tetris/package-info.java branches/jikesRVM/distr/src/emu/org/ branches/jikesRVM/distr/src/emu/org/jnode/ branches/jikesRVM/distr/src/emu/org/jnode/emu/ branches/jikesRVM/distr/src/emu/org/jnode/emu/EditEmu.java branches/jikesRVM/distr/src/emu/org/jnode/emu/ShellEmu.java branches/jikesRVM/distr/src/install/org/jnode/install/action/ActionConstants.java branches/jikesRVM/distr/src/install/org/jnode/install/action/CopyFilesAction.java branches/jikesRVM/distr/src/install/org/jnode/install/action/GrubInstallerAction.java branches/jikesRVM/distr/src/install/org/jnode/install/cmdline/CommandLineInstaller.java branches/jikesRVM/distr/src/test/org/ branches/jikesRVM/distr/src/test/org/jnode/ branches/jikesRVM/distr/src/test/org/jnode/apps/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/JPartitionTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/AbstractTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/AbstractTestDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/CustomDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestEmptyDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestNonEmptyDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestOSFacade.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/model/TestRemovePartitionFromDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/swingview/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/swingview/FileDeviceView.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/ branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/AbstractIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FakeIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FileIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/FileIDEDeviceDriver.java branches/jikesRVM/distr/src/test/org/jnode/apps/jpartition/utils/device/VMWareIDEDevice.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/BaseTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/TestCreation.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/Utils.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/ branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/BaseReadWriteTest.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/TestHeader.java branches/jikesRVM/distr/src/test/org/jnode/apps/vmware/disk/test/readwrite/TestVMWareDisk.java Property Changed: ---------------- branches/jikesRVM/distr/ Property changes on: branches/jikesRVM/distr ___________________________________________________________________ Added: svn:mergeinfo + /trunk/distr:2906-5663 Copied: branches/jikesRVM/distr/.checkstyle (from rev 5663, trunk/distr/.checkstyle) =================================================================== --- branches/jikesRVM/distr/.checkstyle (rev 0) +++ branches/jikesRVM/distr/.checkstyle 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <local-check-config name="JNode checkstyle - javadoc" location="/all/new_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle - javadoc" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/distr/.classpath =================================================================== --- branches/jikesRVM/distr/.classpath 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/.classpath 2009-09-10 11:00:11 UTC (rev 5675) @@ -1,11 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/install"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="src" path="src/apps"/> - <classpathentry kind="src" path="/JNode-GUI"/> - <classpathentry kind="lib" path="/JNode-Shell/lib/bsh-2.0b1.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> - <classpathentry kind="src" path="/JNode-TextUI"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/install"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/emu"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry kind="src" path="/core"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/apps"/> + <classpathentry kind="src" path="/gui"/> + <classpathentry kind="lib" path="lib/telnetd.jar"/> + <classpathentry kind="lib" path="lib/jetty-6.1.5.jar"/> + <classpathentry kind="lib" path="lib/jetty-util-6.1.5.jar"/> + <classpathentry kind="lib" path="lib/jsp-2.1.jar"/> + <classpathentry kind="lib" path="lib/jsp-api-2.1.jar"/> + <classpathentry kind="lib" path="lib/servlet-api-2.5-6.1.5.jar"/> + <classpathentry kind="src" path="/shell"/> + <classpathentry kind="src" path="/textui"/> + <classpathentry combineaccessrules="false" kind="src" path="/fs"/> + <classpathentry kind="lib" path="/shell/lib/bsh-2.0b5.jar"/> + <classpathentry kind="lib" path="lib/commons-logging.jar"/> + <classpathentry kind="lib" path="lib/derby.jar"/> + <classpathentry kind="lib" path="lib/derbynet.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/core/lib/junit-4.5.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> + <classpathentry kind="lib" path="lib/jawk-1.02.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/distr/.project =================================================================== --- branches/jikesRVM/distr/.project 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/.project 2009-09-10 11:00:11 UTC (rev 5675) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-Distr</name> + <name>distr</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-GUI</project> <project>JNode-Shell</project> @@ -13,8 +14,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/distr/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/distr/.settings/org.eclipse.jdt.core.prefs 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/.settings/org.eclipse.jdt.core.prefs 2009-09-10 11:00:11 UTC (rev 5675) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:12:11 CEST 2005 +#Mon Jul 14 11:34:24 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/distr/build.xml =================================================================== --- branches/jikesRVM/distr/build.xml 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/build.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -6,19 +6,30 @@ <property name="my-classes.dir" value="${my-build.dir}/classes"/> <property name="my-src.dir" value="${basedir}/src"/> <property name="my.jar" value="${jnode-distr.jar}"/> - + <!-- Subproject specific classpath --> <path id="my-cp"> <pathelement location="${jnode-core.jar}"/> <pathelement location="${jnode-gui.jar}"/> <pathelement location="${jnode-textui.jar}"/> <pathelement location="${jnode-shell.jar}"/> + <pathelement location="${jnode-fs.jar}"/> + + <pathelement location="${junit.jar}"/> + <pathelement location="${telnetd.jar}"/> + + <pathelement location="${jetty.jar}"/> + <pathelement location="${jetty-util.jar}"/> + + <pathelement location="${jawk.jar}"/> + <path refid="cp"/> </path> <!-- Initialize all subproject directories --> <target name="prepare"> <mkdir dir="${my-classes.dir}"/> + <mkdir dir="${my-build.dir}"/> <jnode.copy-descriptors/> </target> @@ -26,13 +37,23 @@ <target name="compile" depends="prepare"> <jnode.compile> <src path="${my-src.dir}/apps"/> + <src path="${my-src.dir}/emu"/> <src path="${my-src.dir}/install"/> + <src path="${my-src.dir}/test"/> <classpath refid="my-cp"/> </jnode.compile> + + <!-- copy properties files --> + <copy todir="${my-classes.dir}/org/jnode/apps/telnetd"> + <fileset dir="${my-src.dir}/apps/org/jnode/apps/telnetd"> + <include name="**/*.properties" /> + </fileset> + </copy> </target> -<!-- Assemble the jarfile --> - <target name="assemble" depends="compile"/> +<!-- Assemble the jarfile(s) --> + <target name="assemble" depends="compile"> + </target> <!-- Do it all --> <target name="all" depends="assemble"/> Copied: branches/jikesRVM/distr/descriptors/derby.xml (from rev 5663, trunk/distr/descriptors/derby.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/derby.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/derby.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="derby" + name="Derby" + version="10.3.2.1" + license-name="apache2.0" + provider-name="apache DB" + provider-url="http://db.apache.org/derby/"> + + + <requires> + <import plugin="org.jnode.shell"/> + </requires> + + <runtime> + <library name="derby.jar"> + <export name="*"/> + </library> + <library name="derbynet.jar"> + <export name="org.apache.derby.drda.*"/> + <export name="org.apache.derby.impl.drda.*"/> + <export name="org.apache.derby.info.net*"/> + <export name="org.apache.derby.loc.drda.*"/> + </library> + <library name="derbytools.jar"> + <export name="org.apache.derby.tools.*"/> + <export name="org.apache.derby.impl.tools.*"/> + <export name="org.apache.derby.iapi.reference.*"/> + <export name="org.apache.derby.info.tools*"/> + <export name="org.apache.derby.loc.toolsmessages*"/> + </library> + <library name="jnode-distr.jar"> + <export name="org.jnode.apps.derby.*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="derby" class="org.jnode.apps.derby.DerbyCommand"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="derby"> + <sequence description="Start or stop the derby db server"> + <alternatives> + <option argLabel="start" longName="start"/> + <option argLabel="stop" longName="stop"/> + </alternatives> + <optionSet> + <option argLabel="home" longName="home" shortName="h"/> + <option argLabel="port" longName="port" shortName="p"/> + </optionSet> + </sequence> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.util.PropertyPermission" name="*" actions="read"/> + <permission class="java.lang.RuntimePermission" name="exitVM" actions="*" /> + <permission class="java.lang.RuntimePermission" name="writeFileDescriptor" actions="*" /> + <permission class="java.lang.RuntimePermission" name="readFileDescriptor" actions="*" /> + <permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" /> + <permission class="java.net.SocketPermission" name="*:1527" actions="accept,connect,listen"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + </extension> + +</plugin> Copied: branches/jikesRVM/distr/descriptors/jetty.xml (from rev 5663, trunk/distr/descriptors/jetty.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/jetty.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/jetty.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="jetty" + name="jetty" + version="6.1.5" + license-name="asl" + provider-name="mortbay.com" + provider-url="http://jetty.mortbay.com/"> + + <runtime> + + <library name="jetty.jar"> + <export name="*"/> + </library> + + <library name="jetty-util.jar"> + <export name="*"/> + </library> + + <library name="jsp.jar"> + <export name="*"/> + </library> + + <library name="jsp-api.jar"> + <export name="*"/> + </library> + + <library name="servlet.jar"> + <export name="*"/> + </library> + + <library name="jnode-distr.jar"> + <export name="org.jnode.apps.jetty.*"/> + </library> + + </runtime> + + <requires> + <import plugin="com.sun.tools.javac"/> + <import plugin="org.apache.jakarta.commons.logging"/> + <import plugin="org.apache.jakarta.log4j"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.syntax"/> + <import plugin="org.apache.tools.ant"/> + </requires> + + <extension point="org.jnode.shell.aliases"> + <alias name="jetty" class="org.jnode.apps.jetty.JettyCommand"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="jetty"> + <sequence description="Run a jetty server"> + <optionSet> + <option argLabel="port" longName="port" shortName="p"/> + </optionSet> + <argument argLabel="webapp"/> + </sequence> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + <permission class="java.util.PropertyPermission" name="org.mortbay.*" actions="read"/> + <permission class="java.lang.RuntimePermission" name="createClassLoader"/> + <permission class="java.lang.RuntimePermission" name="setContextClassLoader"/> + <permission class="java.lang.RuntimePermission" name="readFileDescriptor"/> + <permission class="java.lang.RuntimePermission" name="modifyThread"/> + <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/> + <permission class="java.lang.RuntimePermission" name="setIO"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.net.SocketPermission" name="*" actions="resolve"/> + <permission class="java.net.SocketPermission" name="*:1-" actions="resolve,listen"/> + <permission class="java.security.SecurityPermission" name="getPolicy"/> + </extension> + +</plugin> Copied: branches/jikesRVM/distr/descriptors/net.wimpi.telnetd.xml (from rev 5663, trunk/distr/descriptors/net.wimpi.telnetd.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/net.wimpi.telnetd.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/net.wimpi.telnetd.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="net.wimpi.telnetd" + name="telnetd" + version="2" + license-name="bsd" + provider-name="wimpi.net" + provider-url="http://telnetd.sourceforge.net/"> + + <runtime> + <library name="telnetd.jar"> + <export name="*"/> + </library> + + <library name="jnode-distr.jar"> + <export name="org.jnode.apps.telnetd.*"/> + </library> + </runtime> + + <requires> + <import plugin="org.apache.jakarta.commons.logging"/> + <import plugin="org.apache.jakarta.log4j"/> + <import plugin="org.jnode.shell"/> + </requires> + + <extension point="org.jnode.security.permissions"> + <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/> + <permission class="java.lang.RuntimePermission" name="exitVM"/> + + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/> + <permission class="java.lang.RuntimePermission" name="modifyThread"/> + <permission class="java.lang.RuntimePermission" name="setIO"/> + <permission class="java.net.SocketPermission" name="*" actions="resolve,listen,connect"/> + <permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve,listen"/> + <permission class="java.util.PropertyPermission" name="jnode.cmdline" actions="read"/> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + <permission class="java.util.PropertyPermission" name="user.dir" actions="read"/> + </extension> + + <extension point="org.jnode.shell.aliases"> + <alias name="telnetd" class="org.jnode.apps.telnetd.TelnetServerCommand"/> + </extension> +</plugin> Copied: branches/jikesRVM/distr/descriptors/org.apache.jakarta.commons.logging.xml (from rev 5663, trunk/distr/descriptors/org.apache.jakarta.commons.logging.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/org.apache.jakarta.commons.logging.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/org.apache.jakarta.commons.logging.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.apache.jakarta.commons.logging" + name="commons-logging" + version="1.1.1" + license-name="apache2.0" + provider-name="apache commons" + provider-url="http://commons.apache.org/logging/"> + + <runtime> + <library name="commons-logging.jar"> + <export name="*"/> + </library> + </runtime> +</plugin> Copied: branches/jikesRVM/distr/descriptors/org.jawk.xml (from rev 5663, trunk/distr/descriptors/org.jawk.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/org.jawk.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/org.jawk.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jawk" + name="jawk" + version="1.02" + license-name="???" + provider-name="jawk.org" + provider-url="http://jawk.sourceforge.net"> + + <runtime> + <library name="jawk.jar"> + <export name="*"/> + </library> + <library name="jnode-distr.jar"> + <export name="org.jawk.*"/> + </library> + </runtime> + + <requires> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.syntax"/> + </requires> + + <extension point="org.jnode.shell.aliases"> + <alias name="awk" class="org.jawk.JawkMain"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <argument-bundle alias="awk"> + <typedefs> + <typedef name="StringArgument" value="org.jnode.shell.syntax.StringArgument"/> + <typedef name="FileArgument" value="org.jnode.shell.syntax.FileArgument"/> + <typedef name="FlagArgument" value="org.jnode.shell.syntax.FlagArgument"/> + </typedefs> + <argument label="vars" type="StringArgument"> + <param type="flags" value="MULTIPLE"/> + </argument> + <argument label="script" type="FileArgument"> + <param type="flags" value="EXISTING"/> + </argument> + <argument label="files" type="FileArgument"> + <param type="flags" value="MULTIPLE,EXISTING"/> + </argument> + <argument label="compile-dir" type="FileArgument"> + <param type="flags" value="EXISTING"/> + </argument> + <argument label="interm-file" type="FileArgument"> + <param type="flags" value="NONEXISTENT"/> + </argument> + <argument label="field-sep" type="StringArgument"/> + <argument label="program" type="StringArgument"/> + <argument label="interm-out" type="FlagArgument"/> + <argument label="compile" type="FlagArgument"/> + <argument label="compile-exec" type="FlagArgument"/> + <argument label="dump-interm" type="FlagArgument"/> + <argument label="dump-ast" type="FlagArgument"/> + <argument label="xfuncs" type="FlagArgument"/> + <argument label="xtypes" type="FlagArgument"/> + <argument label="sort-arrays" type="FlagArgument"/> + <argument label="no-fmt-trap" type="FlagArgument"/> + </argument-bundle> + <syntax alias="awk"> + <sequence> + <optionSet> + <option argLabel="vars" shortName="v"/> + <option argLabel="field-sep" shortName="F"/> + <option argLabel="interm-out" shortName="c"/> + <option argLabel="interm-file" shortName="o"/> + <option argLabel="compile" shortName="z"/> + <option argLabel="compile-exec" shortName="Z"/> + <option argLabel="compile-dir" shortName="d"/> + <option argLabel="dump-interm" shortName="s"/> + <option argLabel="dump-ast" shortName="S"/> + <option argLabel="xfuncs" shortName="x"/> + <option argLabel="xtypes" shortName="y"/> + <option argLabel="sort-arrays" shortName="t"/> + <option argLabel="no-fmt-trap" shortName="r"/> + </optionSet> + <alternatives> + <option argLabel="script" shortName="f"/> + <argument argLabel="program"/> + </alternatives> + <repeat> + <argument argLabel="files"/> + </repeat> + </sequence> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="modifyThread"/> + <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/> + <permission class="java.lang.RuntimePermission" name="createClassLoader"/> + <permission class="java.lang.RuntimePermission" name="getenv.*"/> + <permission class="java.lang.RuntimePermission" name="setContextClassLoader"/> + <permission class="java.lang.RuntimePermission" name="exitVM"/> + </extension> +</plugin> Copied: branches/jikesRVM/distr/descriptors/org.jnode.apps.commander.xml (from rev 5663, trunk/distr/descriptors/org.jnode.apps.commander.xml) =================================================================== --- branches/jikesRVM/distr/descriptors/org.jnode.apps.commander.xml (rev 0) +++ branches/jikesRVM/distr/descriptors/org.jnode.apps.commander.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.apps.commander" + name="A simple file manager for JNode OS" + version="@VERSION@" + provider-name="JNode.org" + license-name="lgpl"> + + <runtime> + <library name="jnode-distr.jar"> + <export name="org.jnode.apps.commander.*"/> + </library> + </runtime> + + <requires> + <import plugin="charva"/> + <import plugin="org.jnode.apps.editor"/> + <import plugin="org.jnode.shell.help"/> + </requires> + + <extension point="org.jnode.security.permissions"> + <permission class="java.security.AllPermission"/> + </extension> + + <extension point="org.jnode.shell.aliases"> + <alias name="cc" class="org.jnode.apps.commander.CharvaCommander"/> + </extension> +</plugin> Modified: branches/jikesRVM/distr/descriptors/org.jnode.apps.edit.xml =================================================================== --- branches/jikesRVM/distr/descriptors/org.jnode.apps.edit.xml 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/descriptors/org.jnode.apps.edit.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -14,8 +14,9 @@ </runtime> <requires> - <import plugin="charva"/> - <import plugin="org.jnode.shell.help"/> + <import plugin="charva"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.syntax"/> </requires> <extension point="org.jnode.security.permissions"> @@ -25,4 +26,12 @@ <extension point="org.jnode.shell.aliases"> <alias name="edit" class="org.jnode.apps.edit.EditCommand"/> </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="edit"> + <optional description="Edit a file"> + <argument argLabel="file" /> + </optional> + </syntax> + </extension> </plugin> Modified: branches/jikesRVM/distr/descriptors/org.jnode.apps.editor.xml =================================================================== --- branches/jikesRVM/distr/descriptors/org.jnode.apps.editor.xml 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/descriptors/org.jnode.apps.editor.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -14,7 +14,8 @@ </runtime> <requires> - <import plugin="org.jnode.shell.help"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.syntax"/> </requires> <extension point="org.jnode.security.permissions"> @@ -23,5 +24,24 @@ <extension point="org.jnode.shell.aliases"> <alias name="leed" class="org.jnode.apps.editor.LeedCommand"/> + <alias name="le" class="org.jnode.apps.editor.LeedCommand"/> + <alias name="levi" class="org.jnode.apps.editor.LeviCommand"/> + <alias name="lv" class="org.jnode.apps.editor.LeviCommand"/> </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="leed"> + <argument argLabel="file" description="Edit a file"/> + </syntax> + <syntax alias="le"> + <argument argLabel="file" description="Edit a file"/> + </syntax> + <syntax alias="levi"> + <argument argLabel="file" description="View a file"/> + </syntax> + <syntax alias="lv"> + <argument argLabel="file" description="View a file"/> + </syntax> + </extension> + </plugin> Modified: branches/jikesRVM/distr/descriptors/org.jnode.apps.httpd.xml =================================================================== --- branches/jikesRVM/distr/descriptors/org.jnode.apps.httpd.xml 2009-09-09 17:32:39 UTC (rev 5674) +++ branches/jikesRVM/distr/descriptors/org.jnode.apps.httpd.xml 2009-09-10 11:00:11 UTC (rev 5675) @@ -20,7 +20,7 @@ </runtime> <extension point="org.jnode.shell.aliases"> - <alias name="nanohttpd" class="org.jnode.net.command.NanoHTTPDCommand"/> + <alias name="nanohttpd" class="fi.iki.elonen.NanoHTTPD"/> </extension> <extension point="org.jnode.security.permissions"> @@ -31,7 +31,7 @@ <permission class="java.util.PropertyPermission" name="user.dir" actions="read"/> <permission class="java.util.PropertyPermission" name="file.encoding" actions="read"/> <permission class="org.jnode.net.NetPermission" name="bootpClient"/> - <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> <permission class="java.net.SocketPermission" name="*:80" actions="resolve,listen"/> </extension> </plugin> Copied: branches/jikesRVM/distr/descriptors/org.jnode.apps.jpartition.xml (from rev 5663, trunk/distr/descriptors/o... [truncated message content] |
From: <cr...@us...> - 2009-09-09 17:33:04
|
Revision: 5674 http://jnode.svn.sourceforge.net/jnode/?rev=5674&view=rev Author: crawley Date: 2009-09-09 17:32:39 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (core) Modified Paths: -------------- branches/jikesRVM/core/.classpath branches/jikesRVM/core/.project branches/jikesRVM/core/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/core/build.xml branches/jikesRVM/core/descriptors/ejc.xml branches/jikesRVM/core/descriptors/gnu.mauve.xml branches/jikesRVM/core/descriptors/nanoxml.xml branches/jikesRVM/core/descriptors/org.apache.tools.ant.xml branches/jikesRVM/core/descriptors/org.classpath.core.xml branches/jikesRVM/core/descriptors/org.classpath.ext.corba.xml branches/jikesRVM/core/descriptors/org.classpath.ext.imageio.xml branches/jikesRVM/core/descriptors/org.classpath.ext.management.xml branches/jikesRVM/core/descriptors/org.classpath.ext.print.xml branches/jikesRVM/core/descriptors/org.classpath.ext.sql.xml branches/jikesRVM/core/descriptors/org.classpath.ext.xml branches/jikesRVM/core/descriptors/org.classpath.ext.xml.xml branches/jikesRVM/core/descriptors/org.classpath.tools.xml branches/jikesRVM/core/descriptors/org.jmock.xml branches/jikesRVM/core/descriptors/org.jnode.driver.bus.pci.xml branches/jikesRVM/core/descriptors/org.jnode.driver.console.textscreen.xml branches/jikesRVM/core/descriptors/org.jnode.driver.input.l10n.xml branches/jikesRVM/core/descriptors/org.jnode.driver.input.xml branches/jikesRVM/core/descriptors/org.jnode.driver.xml branches/jikesRVM/core/descriptors/org.jnode.runtime.core.xml branches/jikesRVM/core/descriptors/org.jnode.test.xml branches/jikesRVM/core/descriptors/org.jnode.testrunner.xml branches/jikesRVM/core/descriptors/org.jnode.vm.core.xml branches/jikesRVM/core/descriptors/org.jnode.vm_x86.xml branches/jikesRVM/core/descriptors/org.jnode.work.xml branches/jikesRVM/core/descriptors/org.junit.xml branches/jikesRVM/core/descriptors/org.objectweb.asm.xml branches/jikesRVM/core/lib/ant-commons-net.jar branches/jikesRVM/core/lib/ant-junit.jar branches/jikesRVM/core/lib/ant-launcher.jar branches/jikesRVM/core/lib/ant-nodeps.jar branches/jikesRVM/core/lib/ant-trax.jar branches/jikesRVM/core/lib/ant.jar branches/jikesRVM/core/lib/mauve.jar branches/jikesRVM/core/src/classpath/ext/java/nio/channels/LinkChannel.java branches/jikesRVM/core/src/classpath/ext/java/util/prefs/TransientPreferences.java branches/jikesRVM/core/src/classpath/ext/javax/cache/Cache.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheEntry.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheException.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheFactory.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheListener.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheLoader.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheManager.java branches/jikesRVM/core/src/classpath/ext/javax/cache/CacheStatistics.java branches/jikesRVM/core/src/classpath/ext/javax/cache/EvictionStrategy.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/AbstractLinkMessageHandler.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/ClosedLinkException.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/Isolate.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/IsolatePermission.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/IsolateStartupException.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/IsolateStatus.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/Link.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/LinkMessage.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/LinkMessageDispatcher.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/LinkMessageHandler.java branches/jikesRVM/core/src/classpath/ext/javax/isolate/StreamBindings.java branches/jikesRVM/core/src/classpath/gnu/gnu/java/awt/LowPriorityEvent.java branches/jikesRVM/core/src/classpath/vm/gnu/java/security/action/GetPolicyAction.java branches/jikesRVM/core/src/classpath/vm/gnu/java/security/action/GetPropertiesAction.java branches/jikesRVM/core/src/classpath/vm/gnu/java/security/action/InvokeAction.java branches/jikesRVM/core/src/classpath/vm/gnu/java/security/action/SetPropertyAction.java branches/jikesRVM/core/src/classpath/vm/gnu/java/security/util/SimplePermissionCollection.java branches/jikesRVM/core/src/classpath/vm/java/awt/VMAwtAPI.java branches/jikesRVM/core/src/classpath/vm/java/awt/image/VMImageAPI.java branches/jikesRVM/core/src/classpath/vm/java/awt/image/VMImageUtils.java branches/jikesRVM/core/src/classpath/vm/java/lang/VMRuntime.java branches/jikesRVM/core/src/classpath/vm/java/lang/VMSecurityManager.java branches/jikesRVM/core/src/classpath/vm/java/lang/VMSystem.java branches/jikesRVM/core/src/classpath/vm/java/net/ExSocketOptions.java branches/jikesRVM/core/src/classpath/vm/java/net/VMInetAddress.java branches/jikesRVM/core/src/classpath/vm/java/net/VMNetAPI.java branches/jikesRVM/core/src/classpath/vm/java/net/VMNetDevice.java branches/jikesRVM/core/src/classpath/vm/java/net/VMNetUtils.java branches/jikesRVM/core/src/classpath/vm/java/net/VMNetworkInterface.java branches/jikesRVM/core/src/classpath/vm/java/security/VMSecureRandom.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Assembler.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Magic.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Runtime.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/classloader/VM_Array.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/classloader/VM_NormalMethod.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/classloader/VM_TypeReference.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_ComplexLIR2MIRExpansion.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_FinalMIRExpansion.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_Simplifier.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_StackManager.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_AddressConstantOperand.java branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_LocationOperand.java branches/jikesRVM/core/src/core/org/jnode/assembler/BootImageNativeStream.java branches/jikesRVM/core/src/core/org/jnode/assembler/Label.java branches/jikesRVM/core/src/core/org/jnode/assembler/NativeStream.java branches/jikesRVM/core/src/core/org/jnode/assembler/ObjectResolver.java branches/jikesRVM/core/src/core/org/jnode/assembler/UnresolvedObjectRefException.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/InvalidOpcodeException.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86Assembler.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86BinaryAssembler.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86Constants.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86Operation.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86Register.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java branches/jikesRVM/core/src/core/org/jnode/assembler/x86/X86Utils.java branches/jikesRVM/core/src/core/org/jnode/boot/InitJarProcessor.java branches/jikesRVM/core/src/core/org/jnode/boot/Main.java branches/jikesRVM/core/src/core/org/jnode/boot/MemoryResourceInputStream.java branches/jikesRVM/core/src/core/org/jnode/boot/NoCloseInputStream.java branches/jikesRVM/core/src/core/org/jnode/debug/UDPOutputStream.java branches/jikesRVM/core/src/core/org/jnode/debugger/DebugState.java branches/jikesRVM/core/src/core/org/jnode/debugger/Debugger.java branches/jikesRVM/core/src/core/org/jnode/debugger/DebuggerPlugin.java branches/jikesRVM/core/src/core/org/jnode/debugger/DebuggerUtils.java branches/jikesRVM/core/src/core/org/jnode/debugger/RootState.java branches/jikesRVM/core/src/core/org/jnode/debugger/ThreadListState.java branches/jikesRVM/core/src/core/org/jnode/debugger/ThreadState.java branches/jikesRVM/core/src/core/org/jnode/log4j/config/Log4jConfigurePlugin.java branches/jikesRVM/core/src/core/org/jnode/log4j/config/VirtualConsoleAppender.java branches/jikesRVM/core/src/core/org/jnode/naming/DefaultNameSpace.java branches/jikesRVM/core/src/core/org/jnode/naming/InitialNaming.java branches/jikesRVM/core/src/core/org/jnode/naming/NameSpace.java branches/jikesRVM/core/src/core/org/jnode/plugin/ConfigurationElement.java branches/jikesRVM/core/src/core/org/jnode/plugin/Extension.java branches/jikesRVM/core/src/core/org/jnode/plugin/ExtensionPoint.java branches/jikesRVM/core/src/core/org/jnode/plugin/ExtensionPointListener.java branches/jikesRVM/core/src/core/org/jnode/plugin/FragmentDescriptor.java branches/jikesRVM/core/src/core/org/jnode/plugin/Library.java branches/jikesRVM/core/src/core/org/jnode/plugin/Plugin.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginClassLoader.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginDescriptor.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginDescriptorListener.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginException.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginLoader.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginLoaderManager.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginManager.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginPrerequisite.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginReference.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginRegistry.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginSecurityConstants.java branches/jikesRVM/core/src/core/org/jnode/plugin/PluginUtils.java branches/jikesRVM/core/src/core/org/jnode/plugin/Runtime.java branches/jikesRVM/core/src/core/org/jnode/plugin/URLPluginLoader.java branches/jikesRVM/core/src/core/org/jnode/plugin/manager/DefaultPluginLoaderManager.java branches/jikesRVM/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/AbstractModelObject.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/AttributeModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/ConfigurationElementModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/EmptyPlugin.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/ExtensionModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/ExtensionPointModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/Factory.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/FragmentDescriptorModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/LibraryModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginClassLoaderImpl.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginJar.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginModelObject.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginPrerequisiteModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginRegistryModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/PluginsClassLoader.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/RuntimeModel.java branches/jikesRVM/core/src/core/org/jnode/plugin/model/package.html branches/jikesRVM/core/src/core/org/jnode/plugin/package.html branches/jikesRVM/core/src/core/org/jnode/protocol/ProtocolHandlerFactoryPlugin.java branches/jikesRVM/core/src/core/org/jnode/protocol/plugin/Handler.java branches/jikesRVM/core/src/core/org/jnode/protocol/plugin/PluginURLConnection.java branches/jikesRVM/core/src/core/org/jnode/protocol/system/Handler.java branches/jikesRVM/core/src/core/org/jnode/protocol/system/SystemURLConnection.java branches/jikesRVM/core/src/core/org/jnode/security/JNodePermission.java branches/jikesRVM/core/src/core/org/jnode/security/JNodePolicy.java branches/jikesRVM/core/src/core/org/jnode/security/JNodeSecurityManager.java branches/jikesRVM/core/src/core/org/jnode/security/SecurityPlugin.java branches/jikesRVM/core/src/core/org/jnode/system/BootLog.java branches/jikesRVM/core/src/core/org/jnode/system/DMAException.java branches/jikesRVM/core/src/core/org/jnode/system/DMAManager.java branches/jikesRVM/core/src/core/org/jnode/system/DMAResource.java branches/jikesRVM/core/src/core/org/jnode/system/IOResource.java branches/jikesRVM/core/src/core/org/jnode/system/IRQHandler.java branches/jikesRVM/core/src/core/org/jnode/system/IRQResource.java branches/jikesRVM/core/src/core/org/jnode/system/MemoryResource.java branches/jikesRVM/core/src/core/org/jnode/system/MemoryScanner.java branches/jikesRVM/core/src/core/org/jnode/system/MultiMediaMemoryResource.java branches/jikesRVM/core/src/core/org/jnode/system/Resource.java branches/jikesRVM/core/src/core/org/jnode/system/ResourceManager.java branches/jikesRVM/core/src/core/org/jnode/system/ResourceNotFreeException.java branches/jikesRVM/core/src/core/org/jnode/system/ResourceOwner.java branches/jikesRVM/core/src/core/org/jnode/system/ResourcePermission.java branches/jikesRVM/core/src/core/org/jnode/system/SimpleResourceOwner.java branches/jikesRVM/core/src/core/org/jnode/system/event/FocusEvent.java branches/jikesRVM/core/src/core/org/jnode/system/event/FocusListener.java branches/jikesRVM/core/src/core/org/jnode/system/event/SystemEvent.java branches/jikesRVM/core/src/core/org/jnode/system/package.html branches/jikesRVM/core/src/core/org/jnode/system/repository/Repository.java branches/jikesRVM/core/src/core/org/jnode/system/repository/RepositoryPlugin.java branches/jikesRVM/core/src/core/org/jnode/system/repository/RepositoryPluginLoader.java branches/jikesRVM/core/src/core/org/jnode/system/repository/SystemRepository.java branches/jikesRVM/core/src/core/org/jnode/system/repository/SystemRepositoryPlugin.java branches/jikesRVM/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java branches/jikesRVM/core/src/core/org/jnode/system/repository/spi/SystemRepositoryProvider.java branches/jikesRVM/core/src/core/org/jnode/system/x86/DMA.java branches/jikesRVM/core/src/core/org/jnode/system/x86/DMAConstants.java branches/jikesRVM/core/src/core/org/jnode/system/x86/DMAPlugin.java branches/jikesRVM/core/src/core/org/jnode/system/x86/X86DMAChannel.java branches/jikesRVM/core/src/core/org/jnode/util/AccessControllerUtils.java branches/jikesRVM/core/src/core/org/jnode/util/BCDUtils.java branches/jikesRVM/core/src/core/org/jnode/util/BeanUtils.java branches/jikesRVM/core/src/core/org/jnode/util/BigEndian.java branches/jikesRVM/core/src/core/org/jnode/util/BooleanUtils.java branches/jikesRVM/core/src/core/org/jnode/util/BootableArrayList.java branches/jikesRVM/core/src/core/org/jnode/util/BootableHashMap.java branches/jikesRVM/core/src/core/org/jnode/util/ByteBufferInputStream.java branches/jikesRVM/core/src/core/org/jnode/util/ByteBufferUtils.java branches/jikesRVM/core/src/core/org/jnode/util/ByteQueue.java branches/jikesRVM/core/src/core/org/jnode/util/ByteQueueProcessor.java branches/jikesRVM/core/src/core/org/jnode/util/ByteQueueProcessorThread.java branches/jikesRVM/core/src/core/org/jnode/util/ChannelInputStream.java branches/jikesRVM/core/src/core/org/jnode/util/ChannelOutputStream.java branches/jikesRVM/core/src/core/org/jnode/util/Command.java branches/jikesRVM/core/src/core/org/jnode/util/Counter.java branches/jikesRVM/core/src/core/org/jnode/util/CounterGroup.java branches/jikesRVM/core/src/core/org/jnode/util/EmptyInputStream.java branches/jikesRVM/core/src/core/org/jnode/util/FileUtils.java branches/jikesRVM/core/src/core/org/jnode/util/JarBuffer.java branches/jikesRVM/core/src/core/org/jnode/util/JarConstants.java branches/jikesRVM/core/src/core/org/jnode/util/LittleEndian.java branches/jikesRVM/core/src/core/org/jnode/util/NumberUtils.java branches/jikesRVM/core/src/core/org/jnode/util/ObjectArrayIterator.java branches/jikesRVM/core/src/core/org/jnode/util/ObjectUtils.java branches/jikesRVM/core/src/core/org/jnode/util/OsUtils.java branches/jikesRVM/core/src/core/org/jnode/util/Queue.java branches/jikesRVM/core/src/core/org/jnode/util/QueueProcessor.java branches/jikesRVM/core/src/core/org/jnode/util/QueueProcessorThread.java branches/jikesRVM/core/src/core/org/jnode/util/Statistic.java branches/jikesRVM/core/src/core/org/jnode/util/Statistics.java branches/jikesRVM/core/src/core/org/jnode/util/StopWatch.java branches/jikesRVM/core/src/core/org/jnode/util/SynchronizedCounter.java branches/jikesRVM/core/src/core/org/jnode/util/SystemInputStream.java branches/jikesRVM/core/src/core/org/jnode/util/TimeUtils.java branches/jikesRVM/core/src/core/org/jnode/util/TimeoutException.java branches/jikesRVM/core/src/core/org/jnode/util/Token.java branches/jikesRVM/core/src/core/org/jnode/vm/AllocationBitmap.java branches/jikesRVM/core/src/core/org/jnode/vm/BootableObject.java branches/jikesRVM/core/src/core/org/jnode/vm/CpuID.java branches/jikesRVM/core/src/core/org/jnode/vm/HeapHelperImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/IOResourceImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/JvmType.java branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileService.java branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileThread.java branches/jikesRVM/core/src/core/org/jnode/vm/MathSupport.java branches/jikesRVM/core/src/core/org/jnode/vm/MemoryBlockManager.java branches/jikesRVM/core/src/core/org/jnode/vm/MemoryMapEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/MemoryResourceImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/MemoryScannerImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/MultiMediaMemoryResourceImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/ObjectVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/RTCService.java branches/jikesRVM/core/src/core/org/jnode/vm/Region.java branches/jikesRVM/core/src/core/org/jnode/vm/ResourceLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/ResourceManagerImpl.java branches/jikesRVM/core/src/core/org/jnode/vm/SoftByteCodes.java branches/jikesRVM/core/src/core/org/jnode/vm/Unsafe.java branches/jikesRVM/core/src/core/org/jnode/vm/VirtualMemoryRegion.java branches/jikesRVM/core/src/core/org/jnode/vm/Vm.java branches/jikesRVM/core/src/core/org/jnode/vm/VmAbstractClassLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/VmAccessControlContext.java branches/jikesRVM/core/src/core/org/jnode/vm/VmAccessController.java branches/jikesRVM/core/src/core/org/jnode/vm/VmAddress.java branches/jikesRVM/core/src/core/org/jnode/vm/VmArchitecture.java branches/jikesRVM/core/src/core/org/jnode/vm/VmExit.java branches/jikesRVM/core/src/core/org/jnode/vm/VmJavaClassLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/VmJavaMultiMediaSupport.java branches/jikesRVM/core/src/core/org/jnode/vm/VmMagic.java branches/jikesRVM/core/src/core/org/jnode/vm/VmMultiMediaSupport.java branches/jikesRVM/core/src/core/org/jnode/vm/VmProcess.java branches/jikesRVM/core/src/core/org/jnode/vm/VmProcessClassLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/VmReflection.java branches/jikesRVM/core/src/core/org/jnode/vm/VmStackFrame.java branches/jikesRVM/core/src/core/org/jnode/vm/VmStackFrameEnumerator.java branches/jikesRVM/core/src/core/org/jnode/vm/VmStackReader.java branches/jikesRVM/core/src/core/org/jnode/vm/VmSystem.java branches/jikesRVM/core/src/core/org/jnode/vm/VmSystemClassLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/VmSystemObject.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BasicBlock.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BasicBlockFinder.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeFlags.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeParser.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeViewer.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeVisitorSupport.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/BytecodeWriter.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/ControlFlowGraph.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/DelegatingBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/StackException.java branches/jikesRVM/core/src/core/org/jnode/vm/bytecode/TypeStack.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/AbstractCode.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/AbstractExceptionHandler.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/CompiledCodeList.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/IMTBuilder.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/MethodPragmaFlags.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/Modifier.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/NotResolvedYetException.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/ObjectFlags.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/ObjectLayout.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/SelectorMap.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/Signature.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/TIBBuilder.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/TIBLayout.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/TypePragmaFlags.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/TypeSizeInfo.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmAddressMap.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmAnnotatedElement.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmArray.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmArrayClass.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmByteCode.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmCP.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmClassLoader.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmClassType.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmCompiledCode.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmCompiledExceptionHandler.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstClass.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstDouble.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstFieldRef.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstFloat.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstIMethodRef.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstInt.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstLong.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstMemberRef.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstMethodRef.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstObject.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmConstString.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmExceptions.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmField.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmImplementedInterface.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmInstanceField.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmInstanceMethod.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmInterfaceClass.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmInterpretedExceptionHandler.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmIsolatedStatics.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmIsolatedStaticsEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmLineNumberMap.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmLocalVariable.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmLocalVariableTable.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmMember.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmMethod.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmMethodCode.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmNormalClass.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmObject.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmPrimitiveClass.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmResolvableConstObject.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmSharedStatics.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmSharedStaticsEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmSpecialMethod.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmStaticField.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmStaticMethod.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmStatics.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmStaticsAllocator.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmStaticsBase.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmType.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmTypeState.java branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmUTF8Convert.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompileError.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompiledExceptionHandler.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompiledIMT.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompiledMethod.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompilerBytecodeParser.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompilerBytecodeViewer.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/CompilerBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/DelegatingCompilerBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/EntryPoints.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/GCMapIterator.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/IMTCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/IllegalModeException.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/InlineBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/NativeCodeCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/OptimizingBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/VerifyingCompilerBytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/AddressingMode.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/CodeGenerator.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/Constant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/DoubleConstant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/FloatConstant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IRGenerator.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IRTest.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/IntConstant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/LinearScanAllocator.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/LiveRange.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/LocalVariable.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/Location.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/LongConstant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/MethodArgument.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/NativeTest.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/Operand.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/PhiOperand.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/PrimitiveTest.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/ReferenceConstant.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/RegisterLocation.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/RegisterPool.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/SSAStack.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/StackLocation.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/StackVariable.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/Variable.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/AssignQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/BinaryOperation.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/BinaryQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/BranchCondition.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/BranchQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/ConditionalBranchQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/ConstantRefAssignQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/Quad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/UnaryOperation.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/UnaryQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/UnconditionalBranchQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/VarReturnQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/VariableRefAssignQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/compiler/ir/quad/VoidReturnQuad.java branches/jikesRVM/core/src/core/org/jnode/vm/isolate/IsolateThread.java branches/jikesRVM/core/src/core/org/jnode/vm/isolate/VmIsolate.java branches/jikesRVM/core/src/core/org/jnode/vm/isolate/VmIsolateLocal.java branches/jikesRVM/core/src/core/org/jnode/vm/isolate/VmStreamBindings.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/GCStatistics.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/HeapHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/HeapStatistics.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/VmHeapManager.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/VmWriteBarrier.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/DefGCStatistics.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/DefHeapStatistics.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/DefaultHeapManager.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/DefaultWriteBarrier.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/FinalizerThread.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/FinalizerVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCManager.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCMarkVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCSetWhiteVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCStack.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCSweepVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCThread.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/GCVerifyVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/HeapStatisticsVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/VmAbstractHeap.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/VmBootHeap.java branches/jikesRVM/core/src/core/org/jnode/vm/memmgr/def/VmDefaultHeap.java branches/jikesRVM/core/src/core/org/jnode/vm/performance/PerformanceCounterEvent.java branches/jikesRVM/core/src/core/org/jnode/vm/performance/PerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/vm/performance/PresetEvent.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/IRQManager.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/IRQThread.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/IdleThread.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/Monitor.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/MonitorManager.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/ProcessorLock.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/SpinLock.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/SystemThread.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmProcessor.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmScheduler.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmThread.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmThreadQueue.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmThreadQueueEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/scheduler/VmThreadVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/GDT.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/IOAPIC.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/IOAPICRedirectionEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/LocalAPIC.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MMXMultiMediaSupport.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPBusEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPConfigTable.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPFloatingPointerStructure.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPIOAPICEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPIOInterruptAssignmentEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPInterruptAssignmentEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPLocalInterruptAssignmentEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MPProcessorEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/MSR.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/PIC8259A.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/TSS32.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/UnsafeX86.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture32.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture64.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Processor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Processor32.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Processor64.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86StackReader.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Thread.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Thread32.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Thread64.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/X86Cpu.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/X86CpuID.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/X86IRQManager.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/X86MemoryMapEntry.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/X86Vendor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/AbstractX86Compiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/AbstractX86StackManager.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/BaseX86MagicHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86CompiledIMT.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86CompilerConstants.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86CompilerHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86IMTCompiler32.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86IMTCompiler64.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/X86JumpTable.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/DoubleWordItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/EmitterContext.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerFPU.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerSSE.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FPUHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FPUStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/FloatItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/InlinedMethodInfo.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/IntItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/Item.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/ItemFactory.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/ItemStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/ItemVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/L1AHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/LongItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/MagicHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/RefItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/RegisterVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/VirtualStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/WordItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/X86BytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/X86GCMapIterator.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/X86Level1ACompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/X86RegisterPool.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1a/X86StackFrame.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/EmitterContext.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerFPU.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerSSE.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FPUHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FPUStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/FloatItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/InlinedMethodInfo.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/IntItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/Item.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/ItemFactory.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/ItemStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/ItemVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/L1AHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/LongItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/MagicHelper.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/RefItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/RegisterVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/VirtualStack.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/WordItem.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/X86BytecodeVisitor.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/X86GCMapIterator.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/X86Level1BCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/X86RegisterPool.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l1b/X86StackFrame.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l2/GenericX86CodeGenerator.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l2/X86CodeGenerator.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/l2/X86RegisterPool.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/package.html branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/stub/EmptyGCMapIterator.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/compiler/stub/X86StubCompiler.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/Athlon64PerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/DualMSRPerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/P4FamilyPerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/P6PerformanceCouters.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/Pentium4PerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/vm/x86/performance/X86PerformanceCounters.java branches/jikesRVM/core/src/core/org/jnode/work/Work.java branches/jikesRVM/core/src/core/org/jnode/work/WorkManager.java branches/jikesRVM/core/src/core/org/jnode/work/WorkPlugin.java branches/jikesRVM/core/src/core/org/jnode/work/WorkUtils.java branches/jikesRVM/core/src/driver/org/jnode/driver/AbstractDeviceManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/ApiNotFoundException.java branches/jikesRVM/core/src/driver/org/jnode/driver/Bus.java branches/jikesRVM/core/src/driver/org/jnode/driver/DefaultDeviceManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/Device.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceAlreadyConnectedException.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceAlreadyRegisteredException.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceException.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceFinder.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceFinderPlugin.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceInfoAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceManagerListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceNotFoundException.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/DeviceUtils.java branches/jikesRVM/core/src/driver/org/jnode/driver/Driver.java branches/jikesRVM/core/src/driver/org/jnode/driver/DriverException.java branches/jikesRVM/core/src/driver/org/jnode/driver/DriverPermission.java branches/jikesRVM/core/src/driver/org/jnode/driver/DriverPlugin.java branches/jikesRVM/core/src/driver/org/jnode/driver/InvalidDriverException.java branches/jikesRVM/core/src/driver/org/jnode/driver/RemovableDeviceAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/firewire/FireWireBus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/firewire/FireWireDevice.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/firewire/FireWireDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/AGPCapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/AbstractPCIDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/Capability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/CompactHotSwapCapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/DeviceDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/MSICapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIBaseAddress.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIBus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIBusAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIClassToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIConstants.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIDescriptors.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIDevice.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIDeviceConfig.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIException.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIFinder.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType0.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType1.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType2.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PCI_IDs.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/PMCapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/SlotIDCapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/VPDCapability.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pci/VendorDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusBus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusDevice.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/smbus/DIMMDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/smbus/SMBus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/smbus/SMBusControler.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/smbus/SMBusDevice.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/AbstractDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/AbstractDeviceItem.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/AbstractHostControllerDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/ConfigurationDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/DeviceDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/EndPointDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/InterfaceDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/SetupPacket.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/StringDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/StringDescriptorZero.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBBus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBConfiguration.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBConstants.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBControlPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBDataPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBDevice.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBEndPoint.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBException.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBHostControllerAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBHubAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBHubMonitor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBInterface.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBPacket.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBPipeListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/USBRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/hub/HubDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/hub/PortStatus.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubConstants.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBControlRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBDataRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractStructure.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractTreeStructure.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/FrameList.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/QueueHead.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/Schedule.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/TransferDescriptor.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIConstants.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIControlPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIControlRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCICore.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDataPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDataRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIIO.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipeManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIRequest.java branches/jikesRVM/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIRootHub.java branches/jikesRVM/core/src/driver/org/jnode/driver/character/ChannelAlreadyOwnedException.java branches/jikesRVM/core/src/driver/org/jnode/driver/character/CharacterDeviceAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i440BXDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ACPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ACPI_SMBusControler.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ISABridge.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_USBController.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82443BX_HostPCIBridge.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/i440BX/i82443BX_PCIPCIBridge.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/via/Via82C686.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/via/Via8363_0.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/via/ViaDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/chipset/via/ViaQuirks.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/Console.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/ConsoleEvent.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/ConsoleException.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/ConsoleListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/ConsoleManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/TextConsole.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/spi/AbstractConsole.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java branches/jikesRVM/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsolePlugin.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/DeadKeyException.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/Key.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardAdapter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardConstants.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardEvent.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/KeyboardListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/Keys.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/LogitechProtocol.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/LogitechWheelMouseProtocol.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/MouseInterpreter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/MouseProtocolHandler.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/PointerAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/PointerEvent.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/PointerInterpreter.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/PointerListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/SystemListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/SystemTriggerAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/SystemTriggerListener.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/UnsupportedKeyException.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_BE_fr.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_CH_fr.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DE.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DK.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DV.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_ES.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_FR.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_FR_fr.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_101.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_hu.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_hu_101.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_IT.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_IT_it.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_NO.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_SE.java branches/jikesRVM/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_US_en.java branches/jikesRVM/core/src/driver/org/jnode/driver/package.html branches/jikesRVM/core/src/driver/org/jnode/driver/serial/SerialPortAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/serial/SerialPortDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/serial/SerialPortFinder.java branches/jikesRVM/core/src/driver/org/jnode/driver/system/acpi/AcpiAPI.java branches/jikesRVM/core/src/driver/org/jnode/driver/system/acpi/AcpiDeviceToDriverMapper.java branches/jikesRVM/core/src/driver/org/jnode/driver/system/acpi/AcpiDriver.java branches/jikesRVM/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java branches/jikesRVM/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java branches/jikesRVM/core/src/driver/or... [truncated message content] |
From: <cr...@us...> - 2009-09-09 16:32:30
|
Revision: 5673 http://jnode.svn.sourceforge.net/jnode/?rev=5673&view=rev Author: crawley Date: 2009-09-09 16:32:22 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (sound) Added Paths: ----------- branches/jikesRVM/sound/ branches/jikesRVM/sound/.checkstyle branches/jikesRVM/sound/.classpath branches/jikesRVM/sound/.cvsignore branches/jikesRVM/sound/.project branches/jikesRVM/sound/.settings/ branches/jikesRVM/sound/build.xml branches/jikesRVM/sound/descriptors/ branches/jikesRVM/sound/lib/ branches/jikesRVM/sound/sound.iml branches/jikesRVM/sound/src/ branches/jikesRVM/sound/src/driver/ branches/jikesRVM/sound/src/sound/ branches/jikesRVM/sound/src/test/ Removed Paths: ------------- branches/jikesRVM/sound/.checkstyle branches/jikesRVM/sound/.classpath branches/jikesRVM/sound/.cvsignore branches/jikesRVM/sound/.project branches/jikesRVM/sound/.settings/ branches/jikesRVM/sound/build.xml branches/jikesRVM/sound/descriptors/ branches/jikesRVM/sound/lib/ branches/jikesRVM/sound/sound.iml branches/jikesRVM/sound/src/ branches/jikesRVM/sound/src/driver/ branches/jikesRVM/sound/src/sound/ branches/jikesRVM/sound/src/test/ Property changes on: branches/jikesRVM/sound ___________________________________________________________________ Added: svn:ignore + build Deleted: branches/jikesRVM/sound/.checkstyle =================================================================== --- trunk/sound/.checkstyle 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/.checkstyle 2009-09-09 16:32:22 UTC (rev 5673) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<fileset-config file-format-version="1.2.0" simple-config="true"> - <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false"> - <file-match-pattern match-pattern="." include-pattern="true"/> - </fileset> -</fileset-config> Copied: branches/jikesRVM/sound/.checkstyle (from rev 5663, trunk/sound/.checkstyle) =================================================================== --- branches/jikesRVM/sound/.checkstyle (rev 0) +++ branches/jikesRVM/sound/.checkstyle 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Deleted: branches/jikesRVM/sound/.classpath =================================================================== --- trunk/sound/.classpath 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/.classpath 2009-09-09 16:32:22 UTC (rev 5673) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="build/classes"/> -</classpath> Copied: branches/jikesRVM/sound/.classpath (from rev 5663, trunk/sound/.classpath) =================================================================== --- branches/jikesRVM/sound/.classpath (rev 0) +++ branches/jikesRVM/sound/.classpath 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Deleted: branches/jikesRVM/sound/.cvsignore =================================================================== --- trunk/sound/.cvsignore 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/.cvsignore 2009-09-09 16:32:22 UTC (rev 5673) @@ -1 +0,0 @@ -build Copied: branches/jikesRVM/sound/.cvsignore (from rev 5663, trunk/sound/.cvsignore) =================================================================== --- branches/jikesRVM/sound/.cvsignore (rev 0) +++ branches/jikesRVM/sound/.cvsignore 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1 @@ +build Deleted: branches/jikesRVM/sound/.project =================================================================== --- trunk/sound/.project 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/.project 2009-09-09 16:32:22 UTC (rev 5673) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>sound</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: branches/jikesRVM/sound/.project (from rev 5663, trunk/sound/.project) =================================================================== --- branches/jikesRVM/sound/.project (rev 0) +++ branches/jikesRVM/sound/.project 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>sound</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Deleted: branches/jikesRVM/sound/build.xml =================================================================== --- trunk/sound/build.xml 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/build.xml 2009-09-09 16:32:22 UTC (rev 5673) @@ -1,46 +0,0 @@ -<project name="JNode-Sound" default="all" basedir="."> - - <typedef file="${basedir}/../all/lib/jnode.xml"/> - - <property name="my-build.dir" value="${basedir}/build"/> - <property name="my-classes.dir" value="${my-build.dir}/classes"/> - <property name="my-src.dir" value="${basedir}/src"/> - <property name="my.jar" value="${jnode-sound.jar}"/> - -<!-- Subproject specific classpath --> - <path id="my-cp"> - <pathelement location="${jnode-core.jar}"/> - <path refid="cp"/> - </path> - -<!-- Initialize all subproject directories --> - <target name="prepare"> - <mkdir dir="${my-classes.dir}"/> - <jnode.copy-descriptors/> - <copy todir="${my-classes.dir}"> - <fileset dir="${my-src.dir}/sound" excludes="**/*.java,**/package.html"/> - </copy> - </target> - -<!-- Compile all subproject java files --> - <target name="compile" depends="prepare"> - <jnode.compile> - <src path="${my-src.dir}/driver"/> - <src path="${my-src.dir}/sound"/> - <src path="${my-src.dir}/test"/> - <classpath refid="my-cp"/> - </jnode.compile> - </target> - -<!-- Assemble the jarfile --> - <target name="assemble" depends="compile"/> - -<!-- Do it all --> - <target name="all" depends="assemble"/> - -<!-- Clean everything --> - <target name="clean"> - <jnode.clean/> - </target> - -</project> Copied: branches/jikesRVM/sound/build.xml (from rev 5663, trunk/sound/build.xml) =================================================================== --- branches/jikesRVM/sound/build.xml (rev 0) +++ branches/jikesRVM/sound/build.xml 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1,46 @@ +<project name="JNode-Sound" default="all" basedir="."> + + <typedef file="${basedir}/../all/lib/jnode.xml"/> + + <property name="my-build.dir" value="${basedir}/build"/> + <property name="my-classes.dir" value="${my-build.dir}/classes"/> + <property name="my-src.dir" value="${basedir}/src"/> + <property name="my.jar" value="${jnode-sound.jar}"/> + +<!-- Subproject specific classpath --> + <path id="my-cp"> + <pathelement location="${jnode-core.jar}"/> + <path refid="cp"/> + </path> + +<!-- Initialize all subproject directories --> + <target name="prepare"> + <mkdir dir="${my-classes.dir}"/> + <jnode.copy-descriptors/> + <copy todir="${my-classes.dir}"> + <fileset dir="${my-src.dir}/sound" excludes="**/*.java,**/package.html"/> + </copy> + </target> + +<!-- Compile all subproject java files --> + <target name="compile" depends="prepare"> + <jnode.compile> + <src path="${my-src.dir}/driver"/> + <src path="${my-src.dir}/sound"/> + <src path="${my-src.dir}/test"/> + <classpath refid="my-cp"/> + </jnode.compile> + </target> + +<!-- Assemble the jarfile --> + <target name="assemble" depends="compile"/> + +<!-- Do it all --> + <target name="all" depends="assemble"/> + +<!-- Clean everything --> + <target name="clean"> + <jnode.clean/> + </target> + +</project> Deleted: branches/jikesRVM/sound/sound.iml =================================================================== --- trunk/sound/sound.iml 2009-08-26 11:52:35 UTC (rev 5663) +++ branches/jikesRVM/sound/sound.iml 2009-09-09 16:32:22 UTC (rev 5673) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/sound" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - Copied: branches/jikesRVM/sound/sound.iml (from rev 5663, trunk/sound/sound.iml) =================================================================== --- branches/jikesRVM/sound/sound.iml (rev 0) +++ branches/jikesRVM/sound/sound.iml 2009-09-09 16:32:22 UTC (rev 5673) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/sound" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-09-09 16:30:34
|
Revision: 5672 http://jnode.svn.sourceforge.net/jnode/?rev=5672&view=rev Author: crawley Date: 2009-09-09 16:30:22 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (fs) Modified Paths: -------------- branches/jikesRVM/fs/.classpath branches/jikesRVM/fs/.project branches/jikesRVM/fs/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/fs/build.xml branches/jikesRVM/fs/descriptors/jcifs.xml branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ide.disk.xml branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ramdisk.command.xml branches/jikesRVM/fs/descriptors/org.jnode.driver.block.scsi.cdrom.xml branches/jikesRVM/fs/descriptors/org.jnode.driver.block.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ext2.test.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ftpfs.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ftpfs.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.iso9660.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.jifs.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.jifs.example.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ntfs.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ramfs.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.smbfs.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.xml branches/jikesRVM/fs/descriptors/org.jnode.partitions.command.xml branches/jikesRVM/fs/descriptors/org.jnode.partitions.xml branches/jikesRVM/fs/descriptors/org.jnode.test.fs.xml branches/jikesRVM/fs/fs.iml branches/jikesRVM/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/BlockDeviceAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/BlockDeviceAPIHelper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ByteArrayDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/CHS.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/FSBlockAlignmentSupport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/FSBlockDeviceAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/FileDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/Geometry.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/JarFileDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/MappedBlockDeviceSupport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/MappedFSBlockDeviceSupport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/PartitionableBlockAlignmentSupport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/PartitionableBlockDeviceAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FDC.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyConstants.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyControllerBus.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyControllerDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyControllerDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyControllerFinder.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyDriveParameters.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyDriveParametersCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyException.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyIdCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyParameters.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyReadSectorCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppySeekCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/FloppyWriteSectorCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/support/DefaultFloppyDeviceFactory.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDeviceFactory.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDriverUtils.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskPartitionDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskPartitionDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ramdisk/RamDiskDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ramdisk/RamDiskDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/ramdisk/command/RamDiskCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/scsi/cdrom/CDROMDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/scsi/cdrom/SCSICDROMDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/CBW.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/CSW.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/ITransport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageBulkTransport.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageConstants.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageDeviceData.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageSCSIHostDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEControllerDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEDeviceFactory.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEBus.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDECommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEConstants.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEControllerAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEDeviceAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEDeviceFactory.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEDriveDescriptor.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEDriverUtils.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEException.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/IDEIO.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/atapi/ATAPIDeviceToDriverMapper.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/atapi/ATAPIDriver.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/command/IDEIdCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/command/IDEPacketCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/command/IDERWSectorsCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/command/IDEReadSectorsCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/ide/command/IDEWriteSectorsCommand.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/CDB.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIBuffer.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIConstants.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIDevice.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIDeviceAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIException.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/SCSIHostControllerAPI.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBGetConfiguration.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBMediaRemoval.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBRead10.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadCapacity.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadTOC.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBStartStopUnit.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CapacityData.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/MMCUtils.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/CDBInquiry.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/CDBReportLuns.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/CDBRequestSense.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/CDBTestUnitReady.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/InquiryData.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/SenseData.java branches/jikesRVM/fs/src/driver/org/jnode/driver/bus/scsi/cdb/spc/SenseKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSAccessRights.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSEntryTableIgnoreCase.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FSObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FileSystemException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FileSystemFullException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/FileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ReadOnlyFileSystemException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/EjectCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/MountCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/BlockBitmap.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/BlockReservation.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2Constants.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2Directory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2DirectoryRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2Entry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2File.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2Print.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2Utils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/FSBitmap.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/GroupDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/INode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/INodeBitmap.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/INodeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/INodeReservation.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/INodeTable.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Superblock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/cache/Block.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/cache/BlockCache.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/cache/CacheEvent.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/cache/CacheListener.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/cache/INodeCache.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/exception/UnallocatedBlockException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/test/command/CopyTest.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/test/command/FillTest.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/test/command/WriteTest.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/AbstractDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/BootSector.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/Fat.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatBasicDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatConstants.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatLfnDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatLfnDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatRootEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatUtils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/GrubBootSector.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/GrubFatFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/LfnEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/test/FatTest.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFSDevice.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFSDriver.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/command/FTPMountCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/initrd/InitRamdisk.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/Descriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/EntryRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660Constants.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660Directory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660Entry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660File.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660Volume.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/PrimaryVolumeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/SupplementaryVolumeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/VolumeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/FSTreeBuilder.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFSCache.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jarfs/JarFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/BootSector.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/CodePage.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/CodePageDecoder.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/CodePageEncoder.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/Fat.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/Fat32.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatAttr.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatCache.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatCase.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatChain.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatDotDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatLongDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatMarshal.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatName.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatRootDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatShortDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatTable.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatUtils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/StrWriter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/ExtFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/JIFSDirIterator.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/JIFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/JIFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/JIFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/def/JIFSExtension.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/def/JIFSPlugin.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDpluginJars.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDplugins.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDrootDir.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDthreads.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFdevices.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFfilesystems.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFfragmentJar.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFmemory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFplugin.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFpluginJar.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFthread.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFuptime.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/files/JIFSFversion.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/AttributeListAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/AttributeListAttributeNonRes.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/AttributeListAttributeRes.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/AttributeListBlock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/AttributeListEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/BootRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/DataRun.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/DirectoryEntryIterator.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/FileNameAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/FileRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexAllocationAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexBlock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexHeader.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexRoot.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/IndexRootAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/MasterFileTable.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSIndex.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSNonResidentAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSResidentAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSStructure.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSUTIL.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/NTFSVolume.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/RAMDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/RAMFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/RAMFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/RAMFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/def/RAMFSPlugin.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/FileSystemService.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FSEntryCache.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileHandleImpl.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileHandleManager.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileSystemManager.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileSystemMounter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileSystemPlugin.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/FileSystemTypeManager.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/VirtualDirEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/VirtualFSDevice.java branches/jikesRVM/fs/src/fs/org/jnode/fs/service/def/VirtualMountEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/Format.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFSDevice.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFSDriver.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/SmbShell.java branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/command/SMBMountCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/AbstractFSDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/AbstractFSEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/AbstractFSFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/AbstractFSObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/AbstractFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/FSEntryTable.java branches/jikesRVM/fs/src/fs/org/jnode/fs/util/DosUtils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/util/FSUtils.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/PartitionTable.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/PartitionTableEntry.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/PartitionTableException.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/PartitionTableType.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/command/FdiskCommand.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/ibm/IBMPartitionTable.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/ibm/IBMPartitionTableEntry.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/ibm/IBMPartitionTableType.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/ibm/IBMPartitionTypes.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/service/PartitionTableService.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/service/def/PartitionTablePlugin.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/service/def/PartitionTableTypeManager.java branches/jikesRVM/fs/src/test/org/jnode/fs/ntfs/test/NTFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/BlockDeviceStressTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/DirTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/FileTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/FloppyTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/GeometryTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/IDETest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/LfnTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/LowLevelIoTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/SCSITest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPIContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestSuite.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/Partition.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/BlockAlignmentSupportContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/ByteArrayDeviceContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/FileDeviceContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/FloppyDriverContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskDriverContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskPartitionDriverContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/MappedBlockDeviceSupportContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/RamDiskDriverContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/context/SCSICDROMDriverContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/factories/AbstractMockDeviceFactory.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/factories/MockIDEDeviceFactory.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/stubs/StubDeviceManager.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/stubs/StubNameSpace.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/driver/tests/BlockDeviceAPITest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/FSConfigurations.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/FSContext.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/FSTestSuite.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/DeviceParam.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/FS.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/FSAccessMode.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/FSType.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/FileParam.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/JNodeDeviceParam.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/OsType.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/RamDiskParam.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/config/ResourceParam.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/tests/BasicFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/tests/CheckdiskTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/tests/ConcurrentAccessFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/tests/FileFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/filesystem/tests/TreeFSTest.java branches/jikesRVM/fs/src/test/org/jnode/test/fs/ntfs/NTFSUnitTest.java branches/jikesRVM/fs/src/test/org/jnode/test/support/AbstractTest.java branches/jikesRVM/fs/src/test/org/jnode/test/support/AbstractTestSuite.java branches/jikesRVM/fs/src/test/org/jnode/test/support/CGLibCoreMockExt.java branches/jikesRVM/fs/src/test/org/jnode/test/support/ConfigManager.java branches/jikesRVM/fs/src/test/org/jnode/test/support/Context.java branches/jikesRVM/fs/src/test/org/jnode/test/support/ContextManager.java branches/jikesRVM/fs/src/test/org/jnode/test/support/MockInitializer.java branches/jikesRVM/fs/src/test/org/jnode/test/support/MockObjectFactory.java branches/jikesRVM/fs/src/test/org/jnode/test/support/MockUtils.java branches/jikesRVM/fs/src/test/org/jnode/test/support/TestConfig.java branches/jikesRVM/fs/src/test/org/jnode/test/support/TestUtils.java Added Paths: ----------- branches/jikesRVM/fs/.checkstyle branches/jikesRVM/fs/build-tests.xml branches/jikesRVM/fs/descriptors/org.jnode.driver.block.usb.storage.scsi.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.ext2.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.fat.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.hfsplus.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.hfsplus.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.jfat.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.jfat.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.nfs.command.xml branches/jikesRVM/fs/descriptors/org.jnode.fs.nfs.xml branches/jikesRVM/fs/src/driver/org/jnode/driver/block/GeometryException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/BlockDeviceFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/Formatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/AbstractFormatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/archive/ branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/BlockSize.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystemFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/command/FormatExt2Command.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatFileSystemFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/FatType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/command/FormatFatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/ExtendedFileInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/FileInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HFSPlusParams.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusBSDInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystemFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusForkData.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusSystemChecker.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsUnicodeString.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsUtils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/JournalInfoBlock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/Catalog.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogFolder.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogNodeId.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogThread.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/command/FormatHfsPlusCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/Extent.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractNodeRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/BTHeaderRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/IndexRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/Key.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/LeafRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/Node.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/NodeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/NodeRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/RecordData.java branches/jikesRVM/fs/src/fs/org/jnode/fs/iso9660/ISO9660DTime.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/ClusterSize.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFileSystemFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/FatFsInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/FatFormatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/GrubException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/JGrub.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/JGrubInstallCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/MBRFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/Stage1_5.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/Stage2.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/command/CreateJIFSCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/NFSHostNameArgument.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/NFSMountCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Device.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Driver.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Entry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2File.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2FileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2FileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Object.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2RootEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/TableEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/mount/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/nfs/ branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/CompressedDataRun.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/DataRunInterface.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ntfs/StandardInformationAttribute.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ramfs/def/flavormap.properties branches/jikesRVM/fs/src/fs/org/jnode/fs/spi/UnixFSAccessRights.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/command/IBMPartitionTypeArgument.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/command/PartitionHelper.java branches/jikesRVM/fs/src/fs/org/jnode/partitions/ibm/MasterBootRecord.java branches/jikesRVM/fs/src/test/org/jnode/fs/hfsplus/ branches/jikesRVM/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java Removed Paths: ------------- branches/jikesRVM/fs/descriptors/org.jnode.jfat.xml branches/jikesRVM/fs/src/fs/org/jnode/fs/command/CatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/CdCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/CpCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/DeleteCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/DirCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/FormatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/HexdumpCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/MkdirCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/PwdCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/command/TouchCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/Ext2AccessRights.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ext2/command/FormatExt2Command.java branches/jikesRVM/fs/src/fs/org/jnode/fs/fat/command/FormatFatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/ftpfs/command/MakeFTPDeviceCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/ExtendedFileInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/FileInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HFSPlusParams.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusBSDInfo.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystemFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusForkData.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusObject.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusSystemChecker.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsUnicodeString.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/HfsUtils.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/JournalInfoBlock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/Catalog.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogFile.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogFolder.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogNodeId.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/catalog/CatalogThread.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/command/FormatHfsPlusCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/Extent.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/extent/ExtentNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/ branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractKey.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractNode.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/AbstractNodeRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/BTHeaderRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/IndexRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/Key.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/LeafRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/Node.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/NodeDescriptor.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/NodeRecord.java branches/jikesRVM/fs/src/fs/org/jnode/fs/hfsplus/tree/RecordData.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/FatFormatCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/GrubException.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/JGrub.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/JGrubInstallCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/MBRFormatter.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/Stage1_5.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jfat/command/Stage2.java branches/jikesRVM/fs/src/fs/org/jnode/fs/jifs/command/createJIFS.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/NFSHostNameArgument.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/command/NFSMountCommand.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Device.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Driver.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Entry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2File.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2FileSystem.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2FileSystemType.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Object.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2RootEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/TableEntry.java branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/mount/ branches/jikesRVM/fs/src/fs/org/jnode/fs/nfs/nfs2/rpc/nfs/ branches/jikesRVM/fs/src/fs/org/jnode/fs/smbfs/command/MakeSMBDeviceCommand.java branches/jikesRVM/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java Property Changed: ---------------- branches/jikesRVM/fs/ Property changes on: branches/jikesRVM/fs ___________________________________________________________________ Modified: svn:ignore - build + build reports Added: svn:mergeinfo + /trunk/fs:2906-5663 Copied: branches/jikesRVM/fs/.checkstyle (from rev 5663, trunk/fs/.checkstyle) =================================================================== --- branches/jikesRVM/fs/.checkstyle (rev 0) +++ branches/jikesRVM/fs/.checkstyle 2009-09-09 16:30:22 UTC (rev 5672) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/fs/.classpath =================================================================== --- branches/jikesRVM/fs/.classpath 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/.classpath 2009-09-09 16:30:22 UTC (rev 5672) @@ -1,22 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/fs"/> - <classpathentry kind="src" path="src/driver"/> - <classpathentry kind="src" path="src/test"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> - <classpathentry kind="lib" path="/JNode-Core/lib/junit.jar"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/fs"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/driver"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry kind="src" path="/shell"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/JNode-Core/lib/ant.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/jmock-1.0.1.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/jmock-cglib-1.0.1.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/asm.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/cglib-2.1.jar"/> <classpathentry kind="lib" path="lib/edtftpj-1.5.2.jar"/> <classpathentry kind="lib" path="lib/jcifs-1.2.6.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/commons-net-1.1.0.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/jcfe.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/jfunc.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/net"/> + <classpathentry kind="src" path="/core"/> + <classpathentry kind="lib" path="/core/lib/ant.jar"/> + <classpathentry kind="lib" path="/core/lib/cglib-2.1.jar"/> + <classpathentry kind="lib" path="/core/lib/commons-net-1.1.0.jar"/> + <classpathentry kind="lib" path="/core/lib/jmock-1.0.1.jar"/> + <classpathentry kind="lib" path="/core/lib/jmock-cglib-1.0.1.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/core/lib/junit-4.5.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/fs/.project =================================================================== --- branches/jikesRVM/fs/.project 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/.project 2009-09-09 16:30:22 UTC (rev 5672) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-FS</name> + <name>fs</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-Shell</project> </projects> @@ -12,8 +13,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/fs/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/fs/.settings/org.eclipse.jdt.core.prefs 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/.settings/org.eclipse.jdt.core.prefs 2009-09-09 16:30:22 UTC (rev 5672) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:12:27 CEST 2005 +#Mon Jul 14 11:33:25 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Copied: branches/jikesRVM/fs/build-tests.xml (from rev 5663, trunk/fs/build-tests.xml) =================================================================== --- branches/jikesRVM/fs/build-tests.xml (rev 0) +++ branches/jikesRVM/fs/build-tests.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -0,0 +1,27 @@ +<project name="JNode-FS-Tests" default="all" basedir="."> + + <import file="${basedir}/../all/build.xml"/> + + <target name="help" description="output target descriptions"> + <echo> +The main targets (tests) for this build are as follows: +all Runs all tests for this project +all-junit Runs all JUnit tests for this project +help Output these messages + </echo> + </target> + + <target name="all-junit"> + <delete dir="${basedir}/reports/junit"/> + <mkdir dir="${basedir}/reports/junit"/> + <junit showoutput="on" printsummary="on" fork="on"> + <classpath refid="cp-test"/> + <test name="org.jnode.test.fs.filesystem.FSTestSuite" todir="${basedir}/reports/junit"/> + </junit> + </target> + + <target name="all" depends="all-junit" /> + +</project> + + Modified: branches/jikesRVM/fs/build.xml =================================================================== --- branches/jikesRVM/fs/build.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/build.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -6,11 +6,13 @@ <property name="my-classes.dir" value="${my-build.dir}/classes"/> <property name="my-src.dir" value="${basedir}/src"/> <property name="my.jar" value="${jnode-fs.jar}"/> + <property name="my-report.dir" value="${my-build.dir}/report"/> <!-- Subproject specific classpath --> <path id="my-cp"> <pathelement location="${jnode-core.jar}"/> <pathelement location="${jnode-shell.jar}"/> + <pathelement location="${jnode-net.jar}"/> <pathelement location="${edtftpj.jar}"/> <pathelement location="${commons-net.jar}"/> <pathelement location="${jcifs.jar}"/> @@ -32,6 +34,10 @@ <classpath refid="my-cp"/> </jnode.compile> + <copy todir="${my-classes.dir}"> + <fileset dir="${my-src.dir}/fs" includes="**/*.properties"/> + </copy> + <!-- copy (if exists) image of file systems (*.img.WORK files are temporary) --> <copy todir="${my-classes.dir}/org/jnode/test/fs/"> <fileset dir="${my-src.dir}/test/org/jnode/test/fs/"> @@ -63,6 +69,24 @@ <target name="clean"> <jnode.clean/> </target> + +<!-- tests FileSystems --> + <target name="tests" depends="compile" description="Run FS tests with JUnit"> + <delete dir="${my-report.dir}" /> + <mkdir dir="${my-report.dir}"/> + <junit fork="yes" haltonerror="false" haltonfailure="false" printsummary="on" includeantruntime="true"> + <classpath refid="cp-jnode" /> + <formatter type="xml" /> + <test name="org.jnode.test.fs.filesystem.FSTestSuite" todir="${my-report.dir}" outfile="TEST-fs"/> + </junit> + <junitreport todir="${my-report.dir}"> + <fileset dir="${my-report.dir}"> + <include name="TEST*.xml"/> + </fileset> + <report todir="${my-report.dir}" format="frames"/> + </junitreport> + <echo message="HTML report: ${my-report.dir}/index.html" /> + </target> </project> Modified: branches/jikesRVM/fs/descriptors/jcifs.xml =================================================================== --- branches/jikesRVM/fs/descriptors/jcifs.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/jcifs.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -10,6 +10,7 @@ <requires> <import plugin="org.jnode.net"/> + <import plugin="org.jnode.protocol" /> </requires> <runtime> @@ -23,5 +24,9 @@ <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> <permission class="java.net.NetPermission" name="specifyStreamHandler"/> </extension> - + + <extension point="org.jnode.protocol.handlers"> + <handler protocol="smb" class="jcifs.smb.Handler" /> + </extension> + </plugin> \ No newline at end of file Modified: branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ide.disk.xml =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ide.disk.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ide.disk.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -9,6 +9,7 @@ <requires> <import plugin="org.jnode.driver.bus.ide"/> + <import plugin="org.jnode.fs"/> </requires> <runtime> Modified: branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ramdisk.command.xml =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ramdisk.command.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/org.jnode.driver.block.ramdisk.command.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -21,5 +21,14 @@ <extension point="org.jnode.shell.aliases"> <alias name="ramdisk" class="org.jnode.driver.block.ramdisk.command.RamDiskCommand"/> </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="ramdisk"> + <sequence description="create a ramdisk"> + <option argLabel="create" shortName="c" longName="create"/> + <optional><option argLabel="size" shortName="s" longName="size"/></optional> + </sequence> + </syntax> + </extension> </plugin> Modified: branches/jikesRVM/fs/descriptors/org.jnode.driver.block.scsi.cdrom.xml =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.driver.block.scsi.cdrom.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/org.jnode.driver.block.scsi.cdrom.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -10,6 +10,7 @@ <requires> <import plugin="org.jnode.driver.block"/> <import plugin="org.jnode.driver.bus.scsi"/> + <import plugin="org.jnode.fs"/> </requires> <runtime> Copied: branches/jikesRVM/fs/descriptors/org.jnode.driver.block.usb.storage.scsi.xml (from rev 5663, trunk/fs/descriptors/org.jnode.driver.block.usb.storage.scsi.xml) =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.driver.block.usb.storage.scsi.xml (rev 0) +++ branches/jikesRVM/fs/descriptors/org.jnode.driver.block.usb.storage.scsi.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.block.usb.storage.scsi" + name="JNode USB Mass Storage SCSI drivers" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.driver.bus.usb"/> + <import plugin="org.jnode.driver.block"/> + <import plugin="org.jnode.driver.bus.scsi"/> + <import plugin="org.jnode.driver.block.usb.storage"/> + </requires> + + <runtime> + <library name="jnode-fs.jar"> + <export name="org.jnode.driver.block.usb.storage.scsi.*"/> + </library> + </runtime> + + <extension point="org.jnode.driver.mappers"> + <mapper class="org.jnode.driver.block.usb.storage.scsi.USBStorageSCSIDeviceToDriverMapper"/> + </extension> +</plugin> Modified: branches/jikesRVM/fs/descriptors/org.jnode.driver.block.xml =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.driver.block.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/org.jnode.driver.block.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -18,7 +18,7 @@ </runtime> <extension point="org.jnode.security.permissions"> - <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write,delete"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write,delete"/> <permission class="java.util.PropertyPermission" name="user.dir" actions="read"/> </extension> </plugin> \ No newline at end of file Modified: branches/jikesRVM/fs/descriptors/org.jnode.fs.command.xml =================================================================== --- branches/jikesRVM/fs/descriptors/org.jnode.fs.command.xml 2009-09-09 16:09:10 UTC (rev 5671) +++ branches/jikesRVM/fs/descriptors/org.jnode.fs.command.xml 2009-09-09 16:30:22 UTC (rev 5672) @@ -1,45 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plugin SYSTEM "jnode.dtd"> -<plugin id="org.jnode.fs.command" +<plugin id="org.jnode.fs.command" name="JNode filesystem commands" version="@VERSION@" license-name="lgpl" provider-name="JNode.org"> - + <requires> <import plugin="org.jnode.fs"/> - <import plugin="org.jnode.shell.help"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.syntax"/> + <import plugin="org.jnode.protocol.nfs"/> </requires> - + <runtime> <library name="jnode-fs.jar"> <export name="org.jnode.fs.command.*"/> </library> </runtime> - + <extension point="org.jnode.shell.aliases"> - <alias name="cat" class="org.jnode.fs.command.CatCommand"/> - <alias name="cd" class="org.jnode.fs.command.CdCommand"/> - <alias name="cp" class="org.jnode.fs.command.CpCommand"/> - <alias name="del" class="org.jnode.fs.command.DeleteCommand"/> - <alias name="dir" class="org.jnode.fs.command.DirCommand"/> - <alias name="ls" class="org.jnode.fs.command.DirCommand"/> <alias name="eject" class="org.jnode.fs.command.EjectCommand"/> - <alias name="format" class="org.jnode.fs.command.FormatCommand"/> - <alias name="mkdir" class="org.jnode.fs.command.MkdirCommand"/> <alias name="mount" class="org.jnode.fs.command.MountCommand"/> - <alias name="pwd" class="org.jnode.fs.command.PwdCommand"/> - <alias name="touch" class="org.jnode.fs.co... [truncated message content] |
From: <cr...@us...> - 2009-09-09 16:09:22
|
Revision: 5671 http://jnode.svn.sourceforge.net/jnode/?rev=5671&view=rev Author: crawley Date: 2009-09-09 16:09:10 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (shell) Modified Paths: -------------- branches/jikesRVM/shell/.classpath branches/jikesRVM/shell/.project branches/jikesRVM/shell/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/shell/build.xml branches/jikesRVM/shell/descriptors/org.beanshell.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.bsh.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.driver.console.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.driver.system.acpi.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.driver.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.test.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.help.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.xml branches/jikesRVM/shell/shell.iml branches/jikesRVM/shell/src/shell/org/jnode/shell/Command.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandInfo.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandLine.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandShell.java branches/jikesRVM/shell/src/shell/org/jnode/shell/DefaultCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/Shell.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellUtils.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ThreadCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/alias/AliasManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/alias/NoSuchAliasException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/alias/def/DefaultAliasManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/DeviceCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/console/ConsoleCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/system/acpi/AcpiCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/test/SuiteCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/test/TestCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/def/DefaultShellManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/def/ShellPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/CommandLineElement.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/CompletionException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/Help.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/HelpException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/def/SystemHelpPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/messages.properties branches/jikesRVM/shell/src/shell/org/jnode/shell/help/messages_de.properties branches/jikesRVM/shell/src/shell/org/jnode/shell/help/messages_fr.properties Added Paths: ----------- branches/jikesRVM/shell/.checkstyle branches/jikesRVM/shell/build-tests.xml branches/jikesRVM/shell/descriptors/js.xml branches/jikesRVM/shell/descriptors/net.n3.nanoxml.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.bjorne.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.driver.system.bus.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.syntax.xml branches/jikesRVM/shell/descriptors/org.jnode.test.shell.xml branches/jikesRVM/shell/lib/bsh-2.0b5.jar branches/jikesRVM/shell/lib/nanoxml-2.2.3.jar branches/jikesRVM/shell/lib/rhino1.6r5-jsr223.jar branches/jikesRVM/shell/src/emu/ branches/jikesRVM/shell/src/emu/org/ branches/jikesRVM/shell/src/emu/org/jnode/ branches/jikesRVM/shell/src/emu/org/jnode/emu/ branches/jikesRVM/shell/src/emu/org/jnode/emu/DeviceManager.java branches/jikesRVM/shell/src/emu/org/jnode/emu/Emu.java branches/jikesRVM/shell/src/emu/org/jnode/emu/EmuException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/AbstractCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ArgumentCompleter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/AsyncCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/BuiltinCommandInfo.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandCompletions.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandInterpreter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandRunnable.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandRunner.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandShellReader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandThread.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandThreadImpl.java branches/jikesRVM/shell/src/shell/org/jnode/shell/Completable.java branches/jikesRVM/shell/src/shell/org/jnode/shell/DefaultInterpreter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/NoTokensAvailableException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/PathnamePattern.java branches/jikesRVM/shell/src/shell/org/jnode/shell/RedirectingInterpreter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellControlException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellFailureException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellInvocationException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ShellSyntaxException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/SimpleCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/SymbolSource.java branches/jikesRVM/shell/src/shell/org/jnode/shell/ThreadExitListener.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/AliasBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/AssignmentArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneAliasDefinitionArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneAliasNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltinCommandInfo.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneCompletable.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneCompleter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneControlException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneShellPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneSubshellRunner.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneToken.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BreakBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CaseCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CaseItemNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CharIterator.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ColonBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ContinueBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ExitBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ExportBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ForCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/IfCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/LoopCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReadonlyBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/RedirectionNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReturnBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SetBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ShiftBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SourceBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/UnaliasBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/UnsetBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/VariableNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/VariableSlot.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/bsh/BshCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/console/ClearConsoleCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/system/bus/ branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/system/bus/SMBusCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/EnhancedHelp.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/HelpFactory.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/def/DefaultHelpFactory.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/def/NewSyntaxHelp.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/def/TextHelpBase.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/ branches/jikesRVM/shell/src/shell/org/jnode/shell/io/BaseCommandIO.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIO.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOHolder.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOMarker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandInput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandInputOutput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandOutput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/FanoutWriter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/NullInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/NullOutputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/Pipeline.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/PipelineInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/PipelineOutputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/ShellConsoleReader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/ShellConsoleWriter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/ branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandLauncher.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateSocket.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateSocketImpl.java branches/jikesRVM/shell/src/shell/org/jnode/shell/jnode.ini.dist branches/jikesRVM/shell/src/shell/org/jnode/shell/package.html branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/Proclet.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/AliasArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/AlternativesSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Argument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentBundle.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentSpecLoader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ClassNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/CommandSyntaxException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/CountryArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/DefaultSyntaxManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/DeviceArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/EmptySyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/EnumArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/FileArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/FlagArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/GroupSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/HostNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/IntegerArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/KeyboardLayoutArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/LanguageArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Log4jLevelArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Log4jLoggerArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/LongArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MappedArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuAlternation.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuBackReference.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuParser.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuPreset.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSequence.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSymbol.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionSetSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionalSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PluginArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PluginSyntaxSpecAdapter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PortNumberArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PropertyNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/RepeatSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SequenceSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SharedStack.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ShellPropertyNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SizeArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/StringArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SymbolSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Syntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxArgumentMissingException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxBundle.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxFailureException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxMultiplicityException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxSpecAdapter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxSpecLoader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SystemSyntaxPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ThreadNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/URLArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/VerbSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/XMLSyntaxSpecAdapter.java branches/jikesRVM/shell/src/test/ branches/jikesRVM/shell/src/test/org/ branches/jikesRVM/shell/src/test/org/jnode/ branches/jikesRVM/shell/src/test/org/jnode/test/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/AllTests.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/Cassowary.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionHelper.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/DeviceManager.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyAliasCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyCompileCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyCpuIDCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyDuhCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyEchoCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/PathnamePatternTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/all-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneContextTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneParserTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjornePseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneTokenizerTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ClassTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/CommandTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/DummyPseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/PluginSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/PseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ScriptTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestCommandShell.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestEmu.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestHarness.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnable.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnerBase.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnerException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSetSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecificationException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecificationParser.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestsAbandonedException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TextContent.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/help/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/help/DefaultHelpTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/PipelineTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/ReaderInputStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/WriterOutputStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/proclet/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/proclet/ProcletStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/AllTests.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentBundleTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/DefaultTokenizerTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/RepeatSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestAliasManager.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestShell.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestSyntaxManager.java Removed Paths: ------------- branches/jikesRVM/shell/descriptors/org.jnode.shell.command.ant.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.debug.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.log4j.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.plugin.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.system.xml branches/jikesRVM/shell/descriptors/org.jnode.shell.command.xml branches/jikesRVM/shell/lib/bsh-2.0b1.jar branches/jikesRVM/shell/src/emu/org/ branches/jikesRVM/shell/src/emu/org/jnode/ branches/jikesRVM/shell/src/emu/org/jnode/emu/ branches/jikesRVM/shell/src/emu/org/jnode/emu/DeviceManager.java branches/jikesRVM/shell/src/emu/org/jnode/emu/Emu.java branches/jikesRVM/shell/src/emu/org/jnode/emu/EmuException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CommandHistory.java branches/jikesRVM/shell/src/shell/org/jnode/shell/CompletionInfo.java branches/jikesRVM/shell/src/shell/org/jnode/shell/Line.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/AliasBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/AssignmentArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneAliasDefinitionArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneAliasNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltinCommandInfo.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneCompletable.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneCompleter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneControlException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneShellPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneSubshellRunner.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneToken.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/BreakBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CaseCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CaseItemNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CharIterator.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ColonBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/CommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ContinueBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ExitBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ExportBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ForCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/IfCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/LoopCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReadonlyBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/RedirectionNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ReturnBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SetBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SetFlagArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/ShiftBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/SourceBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/UnaliasBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/UnsetBuiltin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/VariableNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/bjorne/VariableSlot.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/AliasCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ClassCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ClasspathCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/CompileCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/DateCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/DisassembleCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/EchoCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/EnvCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ExecCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ExitCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/GcCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/GrepCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/HelpCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/HistoryCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/JavaCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/KillCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/LoadkeysCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/LocaleCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/MemoryCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/NamespaceCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/OnHeapCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/RunCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/SetCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ThreadCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/ant/ branches/jikesRVM/shell/src/shell/org/jnode/shell/command/bsh/BeanshellCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/debug/ branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/system/acpi/SMBusCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/driver/system/bus/SMBusCommand.java branches/jikesRVM/shell/src/shell/org/jnode/shell/command/log4j/ branches/jikesRVM/shell/src/shell/org/jnode/shell/command/plugin/ branches/jikesRVM/shell/src/shell/org/jnode/shell/command/system/ branches/jikesRVM/shell/src/shell/org/jnode/shell/help/AliasArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/Argument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/ClassNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/CountryArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/DeviceArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/FileArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/IntegerArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/LanguageArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/LongArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/OptionArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/Parameter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/ParsedArguments.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/PluginArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/PropertyNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/StringArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/StringListArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/Syntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/SyntaxErrorException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/ThreadNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/URLArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/help/def/DefaultHelp.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/BaseCommandIO.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIO.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOHolder.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandIOMarker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandInput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandInputOutput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/CommandOutput.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/FanoutWriter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/NullInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/NullOutputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/Pipeline.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/PipelineInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/PipelineOutputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/ShellConsoleReader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/io/ShellConsoleWriter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandLauncher.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateSocket.java branches/jikesRVM/shell/src/shell/org/jnode/shell/isolate/IsolateSocketImpl.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/AbstractProxyPrintStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/Proclet.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletCommandInvoker.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletIOContext.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyInputStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyPrintStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/proclet/ProcletProxyStream.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/AliasArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/AlternativesSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Argument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentBundle.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentSpecLoader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ArgumentSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ClassNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/CommandSyntaxException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/CountryArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/DefaultSyntaxManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/DeviceArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/EmptySyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/EnumArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/FileArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/FlagArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/GroupSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/HostNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/IntegerArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/KeyboardLayoutArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/LanguageArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Log4jLevelArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Log4jLoggerArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/LongArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MappedArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuAlternation.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuBackReference.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuParser.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuPreset.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSequence.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSymbol.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/MuSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionSetSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/OptionalSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PluginArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PluginSyntaxSpecAdapter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PortNumberArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PowersetSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/PropertyNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/RepeatSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SequenceSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SharedStack.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ShellPropertyNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SizeArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/StringArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SymbolSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/Syntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxArgumentMissingException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxBundle.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxFailureException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxManager.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxMultiplicityException.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxSpecAdapter.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SyntaxSpecLoader.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/SystemSyntaxPlugin.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/ThreadNameArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/URLArgument.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/VerbSyntax.java branches/jikesRVM/shell/src/shell/org/jnode/shell/syntax/XMLSyntaxSpecAdapter.java branches/jikesRVM/shell/src/test/org/ branches/jikesRVM/shell/src/test/org/jnode/ branches/jikesRVM/shell/src/test/org/jnode/test/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/AllTests.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/Cassowary.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionHelper.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionInfoTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/CompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/DefaultSyntaxCompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/DeviceManager.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyAliasCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyCompileCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyCpuIDCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyDuhCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/MyEchoCommand.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/PathnamePatternTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/all-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneCompletionTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneContextTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneParserTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjornePseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/BjorneTokenizerTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ClassTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/CommandTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/DummyPseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/PluginSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/PseudoPlugin.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/ScriptTestRunner.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestCommandShell.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestEmu.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestHarness.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnable.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnerBase.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestRunnerException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSetSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecification.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecificationException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestSpecificationParser.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TestsAbandonedException.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/harness/TextContent.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/help/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/help/DefaultHelpTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/PipelineTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/ReaderInputStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/io/WriterOutputStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/proclet/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/proclet/ProcletStreamTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/AllTests.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/AlternativesSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentBundleTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentMultiplicityTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/ArgumentTypesTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/CommandLineTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/DefaultTokenizerTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuParserTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuParserTest2.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/MuSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/OptionSetSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/OptionSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/PowersetSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/RepeatSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/SequenceSyntaxTest.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestAliasManager.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestShell.java branches/jikesRVM/shell/src/test/org/jnode/test/shell/syntax/TestSyntaxManager.java Property Changed: ---------------- branches/jikesRVM/shell/ branches/jikesRVM/shell/src/shell/org/jnode/shell/help/InetAddressArgument.java Property changes on: branches/jikesRVM/shell ___________________________________________________________________ Modified: svn:ignore - build + build reports Added: svn:mergeinfo + /trunk/shell:2906-5663 Copied: branches/jikesRVM/shell/.checkstyle (from rev 5663, trunk/shell/.checkstyle) =================================================================== --- branches/jikesRVM/shell/.checkstyle (rev 0) +++ branches/jikesRVM/shell/.checkstyle 2009-09-09 16:09:10 UTC (rev 5671) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/shell/.classpath =================================================================== --- branches/jikesRVM/shell/.classpath 2009-09-09 15:52:30 UTC (rev 5670) +++ branches/jikesRVM/shell/.classpath 2009-09-09 16:09:10 UTC (rev 5671) @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/shell"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/junit.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/ant.jar"/> - <classpathentry kind="lib" path="lib/bsh-2.0b1.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/ant-launcher.jar"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/shell"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/emu"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry kind="src" path="/core"/> + <classpathentry exported="true" kind="lib" path="lib/bsh-2.0b5.jar"/> + <classpathentry kind="lib" path="lib/rhino1.6r5-jsr223.jar"/> + <classpathentry kind="lib" path="/core/lib/ant-launcher.jar"/> + <classpathentry kind="lib" path="/core/lib/ant.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="lib/nanoxml-2.2.3.jar"/> + <classpathentry kind="lib" path="/core/lib/junit-4.5.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/shell/.project =================================================================== --- branches/jikesRVM/shell/.project 2009-09-09 15:52:30 UTC (rev 5670) +++ branches/jikesRVM/shell/.project 2009-09-09 16:09:10 UTC (rev 5671) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-Shell</name> + <name>shell</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> </projects> <buildSpec> @@ -11,8 +12,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/shell/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/shell/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:52:30 UTC (rev 5670) +++ branches/jikesRVM/shell/.settings/org.eclipse.jdt.core.prefs 2009-09-09 16:09:10 UTC (rev 5671) @@ -1,12 +1,66 @@ -#Tue Apr 12 20:13:19 CEST 2005 +#Mon Jul 14 11:34:04 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 Copied: branches/jikesRVM/shell/build-tests.xml (from rev 5663, trunk/shell/build-tests.xml) =================================================================== --- branches/jikesRVM/shell/build-tests.xml (rev 0) +++ branches/jikesRVM/shell/build-tests.xml 2009-09-09 16:09:10 UTC (rev 5671) @@ -0,0 +1,63 @@ +<project name="JNode-Shell-Tests" default="all" basedir="."> + + <import file="${basedir}/../all/build.xml"/> + + <target name="help" description="output target descriptions"> + <echo> +The main targets (tests) for this build are as follows: +all Runs all tests for this project +all-blackbox Runs all blackbox tests for this project +all-junit Runs all JUnit tests for this project +bjorne Runs the bjorne interpreter blackbox-tests +help Output these messages + </echo> + </target> + + <!-- FIXME - I think that we need some 'Ant magic' for running blackbox tests. + For a start, we need to be able to set the blackbox options (-E, -F, -v, -d, etc) + once in an Ant property. --> + + <target name="bjorne"> + <java classpathref="cp-test" classname="org.jnode.test.shell.harness.TestHarness"> + <arg value="-E"/> + <arg value="-v"/> + <arg value="-s"/> + <arg value="${root.dir}"/> + <arg value="${basedir}/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml"/> + <arg value="${basedir}/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml"/> + </java> + </target> + + <target name="all-blackbox"> + <java classpathref="cp-test" classname="org.jnode.test.shell.harness.TestHarness"> + <arg value="-E" /> + <arg value="-v"/> + <arg value="-s" /> + <arg value="${root.dir}" /> + <arg value="${basedir}/src/test/org/jnode/test/shell/all-tests.xml" /> + </java> + </target> + + <target name="all-junit"> + <delete dir="${basedir}/reports/junit"/> + <mkdir dir="${basedir}/reports/junit"/> + <junit showoutput="on" printsummary="on" fork="on"> + <classpath refid="cp-test"/> + <formatter type="plain"/> + <batchtest fork="yes" todir="${basedir}/reports/junit"> + <fileset dir="${basedir}/src/test"> + <include name="**/*Test.java" /> + <!-- + FIXME - Some of the unit tests may need to be excluded if they cannot be + made to run in classic Java from the sandbox command line. + --> + </fileset> + </batchtest> + </junit> + </target> + + <target name="all" depends="all-junit,all-blackbox" /> + +</project> + + Modified: branches/jikesRVM/shell/build.xml =================================================================== --- branches/jikesRVM/shell/build.xml 2009-09-09 15:52:30 UTC (rev 5670) +++ branches/jikesRVM/shell/build.xml 2009-09-09 16:09:10 UTC (rev 5671) @@ -10,6 +10,7 @@ <!-- Subproject specific classpath --> <path id="my-cp"> <pathelement location="${jnode-core.jar}"/> + <pathelement location="${nanoxml-java.jar}"/> <path refid="cp"/> </path> @@ -18,14 +19,17 @@ <mkdir dir="${my-classes.dir}"/> <jnode.copy-descriptors/> <copy todir="${my-classes.dir}"> - <fileset dir="${my-src.dir}/shell" excludes="**/*.java,**/package.html"/> + <fileset dir="${my-src.dir}/shell" excludes="**/*.java,**/package.html"/> + <fileset dir="${my-src.dir}/test" excludes="**/*.java,**/package.html"/> </copy> </target> <!-- Compile all subproject java files --> <target name="compile" depends="prepare"> <jnode.compile> - <src path="${my-src.dir}/shell"/> + <src path="${my-src.dir}/shell"/> + <src path="${my-src.dir}/test"/> + <src path="${my-src.dir}/emu"/> <classpath refid="my-cp"/> </jnode.compile> </target> Copied: branches/jikesRVM/shell/descriptors/js.xml (from rev 5663, trunk/shell/descriptors/js.xml) =================================================================== --- branches/jikesRVM/shell/descriptors/js.xml (rev 0) +++ branches/jikesRVM/shell/descriptors/js.xml 2009-09-09 16:09:10 UTC (rev 5671) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="js" + name="Rhino classes" + version="1.0" + provider-name="mozilla.org" + provider-url="http://www.mozilla.org/rhino/" + license-name="mpl"> + + <runtime> + <library name="js.jar"> + <export name="*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="js" class="org.mozilla.javascript.tools.shell.Main"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="setSecurityManager" actions="*" /> + <permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" /> + <permission class="java.lang.RuntimePermission" name="setIO" actions="*" /> + <permission class="java.lang.RuntimePermission" name="exitVM" actions="*" /> + <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" /> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> +</plugin> \ No newline at end of file Copied: branches/jikesRVM/s... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:52:41
|
Revision: 5670 http://jnode.svn.sourceforge.net/jnode/?rev=5670&view=rev Author: crawley Date: 2009-09-09 15:52:30 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (textui) Modified Paths: -------------- branches/jikesRVM/textui/.classpath branches/jikesRVM/textui/.project branches/jikesRVM/textui/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/textui/src/textui/charva/awt/AbstractToolkit.java branches/jikesRVM/textui/src/textui/charva/awt/Component.java branches/jikesRVM/textui/src/textui/charva/awt/Container.java branches/jikesRVM/textui/src/textui/charva/awt/EventQueue.java branches/jikesRVM/textui/src/textui/charva/awt/FlowLayout.java branches/jikesRVM/textui/src/textui/charva/awt/GridBagLayout.java branches/jikesRVM/textui/src/textui/charva/awt/IllegalComponentStateException.java branches/jikesRVM/textui/src/textui/charva/awt/SyncQueue.java branches/jikesRVM/textui/src/textui/charva/awt/TerminfoCapabilityException.java branches/jikesRVM/textui/src/textui/charva/awt/Toolkit.java branches/jikesRVM/textui/src/textui/charva/awt/Window.java branches/jikesRVM/textui/src/textui/charva/awt/event/AWTEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/ActionEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/AdjustmentEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/FocusEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/GarbageCollectionEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/InputEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/InvocationEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/ItemEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/KeyEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/MouseEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/PaintEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/ScrollEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/SyncEvent.java branches/jikesRVM/textui/src/textui/charva/awt/event/WindowEvent.java branches/jikesRVM/textui/src/textui/charva/awt/util/MultiLineLabel.java branches/jikesRVM/textui/src/textui/charvax/swing/AbstractButton.java branches/jikesRVM/textui/src/textui/charvax/swing/AbstractListModel.java branches/jikesRVM/textui/src/textui/charvax/swing/ButtonGroup.java branches/jikesRVM/textui/src/textui/charvax/swing/DefaultComboBoxModel.java branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListModel.java branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListSelectionModel.java branches/jikesRVM/textui/src/textui/charvax/swing/JComboBox.java branches/jikesRVM/textui/src/textui/charvax/swing/JFileChooser.java branches/jikesRVM/textui/src/textui/charvax/swing/JList.java branches/jikesRVM/textui/src/textui/charvax/swing/JMenu.java branches/jikesRVM/textui/src/textui/charvax/swing/JPopupMenu.java branches/jikesRVM/textui/src/textui/charvax/swing/JScrollBar.java branches/jikesRVM/textui/src/textui/charvax/swing/JTabbedPane.java branches/jikesRVM/textui/src/textui/charvax/swing/JTable.java branches/jikesRVM/textui/src/textui/charvax/swing/JTextArea.java branches/jikesRVM/textui/src/textui/charvax/swing/JTextField.java branches/jikesRVM/textui/src/textui/charvax/swing/event/ListDataEvent.java branches/jikesRVM/textui/src/textui/charvax/swing/event/ListSelectionEvent.java branches/jikesRVM/textui/src/textui/charvax/swing/event/TableModelEvent.java branches/jikesRVM/textui/src/textui/charvax/swing/event/TreeModelEvent.java branches/jikesRVM/textui/src/textui/charvax/swing/event/TreeSelectionEvent.java branches/jikesRVM/textui/src/textui/charvax/swing/table/AbstractTableModel.java branches/jikesRVM/textui/src/textui/charvax/swing/table/DefaultTableModel.java branches/jikesRVM/textui/src/textui/charvax/swing/tree/DefaultMutableTreeNode.java branches/jikesRVM/textui/src/textui/charvax/swing/tree/DefaultTreeModel.java branches/jikesRVM/textui/src/textui/charvax/swing/tree/TreeNode.java branches/jikesRVM/textui/src/textui/charvax/swing/tree/TreePath.java branches/jikesRVM/textui/textui.iml Added Paths: ----------- branches/jikesRVM/textui/.checkstyle Copied: branches/jikesRVM/textui/.checkstyle (from rev 5663, trunk/textui/.checkstyle) =================================================================== --- branches/jikesRVM/textui/.checkstyle (rev 0) +++ branches/jikesRVM/textui/.checkstyle 2009-09-09 15:52:30 UTC (rev 5670) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: branches/jikesRVM/textui/.classpath =================================================================== --- branches/jikesRVM/textui/.classpath 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/.classpath 2009-09-09 15:52:30 UTC (rev 5670) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/textui"/> - <classpathentry exported="true" kind="src" path="/JNode-Core"/> - <classpathentry exported="true" kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry exported="true" kind="src" path="/JNode-Shell"/> + <classpathentry exported="true" kind="src" path="/core"/> + <classpathentry exported="true" kind="src" path="/shell"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/textui/.project =================================================================== --- branches/jikesRVM/textui/.project 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/.project 2009-09-09 15:52:30 UTC (rev 5670) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-TextUI</name> + <name>textui</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-Shell</project> </projects> Modified: branches/jikesRVM/textui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/textui/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:52:30 UTC (rev 5670) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:13:31 CEST 2005 +#Mon Jul 14 11:34:13 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/textui/src/textui/charva/awt/AbstractToolkit.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/AbstractToolkit.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/AbstractToolkit.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -660,7 +660,8 @@ { // throw new RuntimeException( // "trying to remove window not in windowlist"); - System.err.println( "Trying to remove window not in list" ); + //todo why does it happen this case? +// System.err.println( "Trying to remove window not in list" ); } // throw new RuntimeException( // "trying to remove window not in windowlist"); @@ -673,7 +674,7 @@ * modifying it, because the window list is accessed by the * keyboard-reading thread as well as by the event-dispatching thread. */ - Vector getWindowList() { + Vector<Window> getWindowList() { return _windowList; } @@ -813,12 +814,12 @@ * A list of visible Windows. The first in the list is at the bottom, the * last is on top. */ - private Vector _windowList = new Vector(); + private Vector<Window> _windowList = new Vector<Window>(); /** * A list of color-pairs. */ - protected Vector _colorPairs = new Vector(); + protected Vector<ColorPair> _colorPairs = new Vector<ColorPair>(); protected EventQueue _evtQueue; Modified: branches/jikesRVM/textui/src/textui/charva/awt/Component.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/Component.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/Component.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -190,7 +190,7 @@ * collected when there are no more strong references to it. */ public void setParent(Container container_) { - _parent = new WeakReference(container_); + _parent = new WeakReference<Container>(container_); // If this component's colors have not been set yet, inherit // the parent container's colors. @@ -219,7 +219,7 @@ */ public void addKeyListener(KeyListener kl_) { if (_keyListeners == null) - _keyListeners = new Vector(); + _keyListeners = new Vector<KeyListener>(); _keyListeners.add(kl_); } @@ -228,7 +228,7 @@ */ public void addFocusListener(FocusListener fl_) { if (_focusListeners == null) - _focusListeners = new Vector(); + _focusListeners = new Vector<FocusListener>(); _focusListeners.add(fl_); } @@ -270,7 +270,7 @@ */ public void processKeyEvent(KeyEvent ke_) { if (_keyListeners != null) { - for (Enumeration e = _keyListeners.elements(); + for (Enumeration<KeyListener> e = _keyListeners.elements(); e.hasMoreElements(); ) { KeyListener kl = (KeyListener) e.nextElement(); @@ -305,7 +305,7 @@ */ public void processFocusEvent(FocusEvent fe_) { if (_focusListeners != null) { - for (Enumeration e = _focusListeners.elements(); + for (Enumeration<FocusListener> e = _focusListeners.elements(); e.hasMoreElements(); ) { FocusListener fl = (FocusListener) e.nextElement(); @@ -400,7 +400,7 @@ Rectangle bounds = getBounds(); Window ancestor = getAncestorWindow(); - Vector windowList = Toolkit.getDefaultToolkit().getWindowList(); + Vector<Window> windowList = Toolkit.getDefaultToolkit().getWindowList(); boolean obscured = false; synchronized (windowList) { @@ -592,7 +592,7 @@ * allow the parent to be garbage-collected when there are no more * strong references to it. */ - protected WeakReference _parent = null; + protected WeakReference<Container> _parent = null; /** * This flag is true if this component can react to user input. @@ -612,12 +612,12 @@ /** * A list of KeyListeners registered for this component. */ - protected Vector _keyListeners = null; + protected Vector<KeyListener> _keyListeners = null; /** * A list of FocusListeners registered for this component. */ - protected Vector _focusListeners = null; + protected Vector<FocusListener> _focusListeners = null; /** * the X-alignment of this component Modified: branches/jikesRVM/textui/src/textui/charva/awt/Container.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/Container.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/Container.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -108,7 +108,7 @@ * the point are relative to the origin of this container. */ public Component getComponentAt(int x, int y) { - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.contains(x, y)) { @@ -217,7 +217,7 @@ if ( !isVisible()) return; - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.isVisible()) @@ -234,7 +234,7 @@ { super.setForeground(color_); - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.getForeground() == null) @@ -251,7 +251,7 @@ { super.setBackground(color_); - Enumeration e = _components.elements(); + Enumeration <Component>e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.getBackground() == null) @@ -297,7 +297,7 @@ /* _currentFocus is not yet set. Try to set it to the first * FocusTraversable component contained in this container. */ - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.isFocusTraversable()) { @@ -464,7 +464,7 @@ if ( !super.isFocusTraversable()) return false; - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.isFocusTraversable()) @@ -478,7 +478,7 @@ /* Default implementation of debug, gets overridden by subclasses. */ public void debug(int level_) { - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); c.debug(level_ + 1); @@ -494,7 +494,7 @@ */ private void firstFocus() { - Enumeration e = _components.elements(); + Enumeration<Component> e = _components.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.isFocusTraversable()) { @@ -568,7 +568,7 @@ /** * The list of components contained within this Container. */ - protected Vector _components = new Vector(); + protected Vector<Component> _components = new Vector<Component>(); /** The container's size */ Modified: branches/jikesRVM/textui/src/textui/charva/awt/EventQueue.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/EventQueue.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/EventQueue.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -126,9 +126,9 @@ //==================================================================== // INSTANCE VARIABLES - private LinkedList _lowPriorityQueue = new LinkedList(); + private LinkedList<AWTEvent> _lowPriorityQueue = new LinkedList<AWTEvent>(); - private LinkedList _highPriorityQueue = new LinkedList(); + private LinkedList<AWTEvent> _highPriorityQueue = new LinkedList<AWTEvent>(); //==================================================================== // STATIC VARIABLES Modified: branches/jikesRVM/textui/src/textui/charva/awt/FlowLayout.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/FlowLayout.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/FlowLayout.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -114,7 +114,7 @@ int voffset = insets.top; Component[] components = container_.getComponents(); - Vector localvector = new Vector(); + Vector<Component> localvector = new Vector<Component>(); for (int i=0; i<components.length; i++) { Component c = components[i]; @@ -160,7 +160,7 @@ /** private function to layout a single row of components. * @return The height of the laid-out row. */ - private int layoutRow(Container container_, Vector components_, + private int layoutRow(Container container_, Vector<Component> components_, int widthleft_, int heightleft_, int voffset_) { int hoffset = 0; @@ -179,7 +179,7 @@ break; } - Enumeration e = components_.elements(); + Enumeration<Component> e = components_.elements(); while (e.hasMoreElements()) { Component c = (Component) e.nextElement(); if (c.getSize().height > rowHeight) Modified: branches/jikesRVM/textui/src/textui/charva/awt/GridBagLayout.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/GridBagLayout.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/GridBagLayout.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -47,9 +47,9 @@ */ _rows = 0; _columns = 0; - Enumeration e1 = _constraints.elements(); + Enumeration<GridBagConstraints> e1 = _constraints.elements(); while (e1.hasMoreElements()) { - GridBagConstraints gbc = (GridBagConstraints) e1.nextElement(); + GridBagConstraints gbc = e1.nextElement(); if (gbc.gridx + gbc.gridwidth > _columns) _columns = gbc.gridx + gbc.gridwidth; @@ -72,11 +72,11 @@ int width_left[] = new int[_components.size()]; int height_left[] = new int[_components.size()]; - e1 = _components.elements(); - Enumeration e2 = _constraints.elements(); - for (int i=0; e1.hasMoreElements(); i++) { - Component c = (Component) e1.nextElement(); - GridBagConstraints gbc = (GridBagConstraints) e2.nextElement(); + Enumeration<Component> e3 = _components.elements(); + Enumeration<GridBagConstraints> e2 = _constraints.elements(); + for (int i=0; e3.hasMoreElements(); i++) { + Component c = e3.nextElement(); + GridBagConstraints gbc = e2.nextElement(); /* Calculate the minimum width & height required for this * component. @@ -97,9 +97,9 @@ * value determines the height of this row. */ _calculatedRowHeights[row] = 0; - Enumeration e = _constraints.elements(); + Enumeration<GridBagConstraints> e = _constraints.elements(); for (int i=0; e.hasMoreElements(); i++) { - GridBagConstraints gbc = (GridBagConstraints) e.nextElement(); + GridBagConstraints gbc = e.nextElement(); if (row == gbc.gridy + gbc.gridheight - 1) { /* This component's bottom edge is in the current row. @@ -115,7 +115,7 @@ */ e = _constraints.elements(); for (int i=0; e.hasMoreElements(); i++) { - GridBagConstraints gbc = (GridBagConstraints) e.nextElement(); + GridBagConstraints gbc = e.nextElement(); if (row >= gbc.gridy && row < gbc.gridy + gbc.gridheight) { @@ -133,9 +133,9 @@ * value determines the width of this column. */ _calculatedColumnWidths[column] = 0; - Enumeration e = _constraints.elements(); + Enumeration<GridBagConstraints> e = _constraints.elements(); for (int i=0; e.hasMoreElements(); i++) { - GridBagConstraints gbc = (GridBagConstraints) e.nextElement(); + GridBagConstraints gbc = e.nextElement(); if (column == gbc.gridx + gbc.gridwidth - 1) { /* This component's right edge is in the current column. @@ -151,7 +151,7 @@ */ e = _constraints.elements(); for (int i=0; e.hasMoreElements(); i++) { - GridBagConstraints gbc = (GridBagConstraints) e.nextElement(); + GridBagConstraints gbc = e.nextElement(); if (column >= gbc.gridx && column < gbc.gridx + gbc.gridwidth) { @@ -165,7 +165,7 @@ */ e2 = _constraints.elements(); while (e2.hasMoreElements()) { - GridBagConstraints gbc = (GridBagConstraints) e2.nextElement(); + GridBagConstraints gbc = e2.nextElement(); for (int i=gbc.gridx; i< gbc.gridx + gbc.gridwidth; i++) { if (gbc.weightx > _calculatedColumnWeights[i]) @@ -209,12 +209,12 @@ int extraColumns = size.width - minsize.width; int extraRows = size.height - minsize.height; - Enumeration e1 = _components.elements(); - Enumeration e2 = _constraints.elements(); + Enumeration<Component> e1 = _components.elements(); + Enumeration<GridBagConstraints> e2 = _constraints.elements(); while (e1.hasMoreElements()) { - Component c = (Component) e1.nextElement(); + Component c = e1.nextElement(); - GridBagConstraints gbc = (GridBagConstraints) e2.nextElement(); + GridBagConstraints gbc = e2.nextElement(); /* Calculate the boundaries of the grid cell that this * component occupies. @@ -406,13 +406,13 @@ /** * As components are added, they are stored in this vector. */ - private Vector _components = new Vector(); + private Vector<Component> _components = new Vector<Component>(); /** * As components are added, their constraint objects are stored in * this vector. */ - private Vector _constraints = new Vector(); + private Vector<GridBagConstraints> _constraints = new Vector<GridBagConstraints>(); /** The number of rows in the grid (calculated from all the added * components and their gridx, gridy, gridwidth and gridheight Modified: branches/jikesRVM/textui/src/textui/charva/awt/IllegalComponentStateException.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/IllegalComponentStateException.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/IllegalComponentStateException.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -23,9 +23,10 @@ * This exception is thrown when a CHARVA component is in an * illegal state for the requested operation. */ -public class IllegalComponentStateException - extends RuntimeException +public class IllegalComponentStateException extends RuntimeException { + private static final long serialVersionUID = 1L; + /** Construct an IllegalComponentStateException. */ public IllegalComponentStateException() Modified: branches/jikesRVM/textui/src/textui/charva/awt/SyncQueue.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/SyncQueue.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/SyncQueue.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -26,9 +26,9 @@ * if possible. This speeds up redrawing. * The queue also handles GarbageCollectionEvents. */ -class SyncQueue - extends java.util.LinkedList +class SyncQueue extends java.util.LinkedList<AWTEvent> { + private static final long serialVersionUID = 1L; private static SyncQueue _instance; private boolean stopped = false; Modified: branches/jikesRVM/textui/src/textui/charva/awt/TerminfoCapabilityException.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/TerminfoCapabilityException.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/TerminfoCapabilityException.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -25,9 +25,10 @@ * when it finds the requested capability but it is of the wrong * type). */ -public class TerminfoCapabilityException - extends Exception +public class TerminfoCapabilityException extends Exception { + private static final long serialVersionUID = 1L; + public TerminfoCapabilityException() { super(); Modified: branches/jikesRVM/textui/src/textui/charva/awt/Toolkit.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/Toolkit.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/Toolkit.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -33,7 +33,8 @@ private int[] colorpairs = new int[256]; - private LinkedList keyQueue = new LinkedList(); + // This is a mixed queue of Integer and MouseEvent instances + private LinkedList<Object> keyQueue = new LinkedList<Object>(); private final TextConsole console; @@ -132,7 +133,7 @@ } registered = true; conMan.registerConsole(console); - System.out.println("Registering charva Toolkit with consoleManager."); + //System.out.println("Registering charva Toolkit with consoleManager."); // pause(); conMan.focus(console); @@ -154,8 +155,11 @@ try { final ShellManager sm = InitialNaming.lookup(ShellManager.NAME); final ConsoleManager conMgr = sm.getCurrentShell().getConsole().getManager(); - final TextConsole console = (TextConsole) conMgr - .createConsole("charva", ConsoleManager.CreateOptions.TEXT); + final TextConsole console = (TextConsole) conMgr.createConsole( + "charva", + ConsoleManager.CreateOptions.TEXT | + ConsoleManager.CreateOptions.STACKED | + ConsoleManager.CreateOptions.NO_LINE_EDITTING); console.addKeyboardListener(new KeyboardAdapter() { public void keyPressed(KeyboardEvent event) { if (event.isControlDown() && event.getKeyChar() == 'z') { @@ -448,6 +452,7 @@ keyQueue.add(new Integer(key)); keyQueue.notifyAll(); + event.consume(); } } Modified: branches/jikesRVM/textui/src/textui/charva/awt/Window.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/Window.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/Window.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -76,7 +76,7 @@ * Register a WindowListener object for this window. */ public void addWindowListener(WindowListener listener_) { - if (_windowListeners == null) _windowListeners = new Vector(); + if (_windowListeners == null) _windowListeners = new Vector<WindowListener>(); _windowListeners.add(listener_); } @@ -88,7 +88,7 @@ protected void processWindowEvent(WindowEvent evt_) { if (_windowListeners == null) return; - Enumeration e = _windowListeners.elements(); + Enumeration<WindowListener> e = _windowListeners.elements(); while (e.hasMoreElements()) { WindowListener wl = (WindowListener) e.nextElement(); switch (evt_.getID()) { @@ -257,7 +257,7 @@ /* * Now redraw all of the windows, from the bottom to the top. */ - Vector winlist = _term.getWindowList(); + Vector<Window> winlist = _term.getWindowList(); Window window = null; synchronized (winlist) { for (int i = 0; i < winlist.size(); i++) { @@ -323,7 +323,7 @@ */ if (!((Component) source).isTotallyObscured()) { - Vector windowlist = _term.getWindowList(); + Vector<Window> windowlist = _term.getWindowList(); synchronized (windowlist) { /* @@ -425,6 +425,7 @@ super.debug(1); } + @SuppressWarnings("unused") private void startPlayback() { // System.err.println("Playback disabled (awaiting security exception fix..)"); return; @@ -456,7 +457,7 @@ private boolean _windowClosed = false; - private Vector _windowListeners = null; + private Vector<WindowListener> _windowListeners = null; private static boolean _dispatchThreadRunning = false; Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/AWTEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/AWTEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/AWTEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -24,9 +24,9 @@ * This is the base class for all the CHARVA user-interface events. * It encapsulates information about the event. */ -public abstract class AWTEvent - extends java.util.EventObject +public abstract class AWTEvent extends java.util.EventObject { + private static final long serialVersionUID = 1L; /** * Construct an event with the specified source and ID. * @param source_ The component that emitted this event. Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/ActionEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/ActionEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/ActionEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -25,9 +25,9 @@ * An event which indicates that a component-defined action (typically * the pressing of a button) occurred. */ -public class ActionEvent - extends AWTEvent +public class ActionEvent extends AWTEvent { + private static final long serialVersionUID = 1L; String _command; public ActionEvent(Component source_, String command_) { Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/AdjustmentEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/AdjustmentEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/AdjustmentEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -24,9 +24,9 @@ /** * The adjustment event emitted by Adjustable objects (eg a scrollbar). */ -public class AdjustmentEvent - extends AWTEvent +public class AdjustmentEvent extends AWTEvent { + private static final long serialVersionUID = 1L; /** * Create a new AdjustmentEvent. * @param source_ The component to which the event must be delivered. Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/FocusEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/FocusEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/FocusEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -28,9 +28,9 @@ * registered to receive such events using the object's addFocusListener() * method. */ -public class FocusEvent - extends AWTEvent +public class FocusEvent extends AWTEvent { + private static final long serialVersionUID = 1L; /** * Create a new FocusEvent. * @param id_ The event identifier. Must be FOCUS_LOST or FOCUS_GAINED. Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/GarbageCollectionEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/GarbageCollectionEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/GarbageCollectionEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -30,9 +30,9 @@ * returned. This is a useful but optional way of limiting the growth * of the heap without causing noticeable delays. */ -public class GarbageCollectionEvent - extends AWTEvent +public class GarbageCollectionEvent extends AWTEvent { + private static final long serialVersionUID = 1L; public GarbageCollectionEvent(Component source_) { super(source_, AWTEvent.GARBAGE_COLLECTION); } Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/InputEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/InputEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/InputEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -23,9 +23,9 @@ /** * This is the superclass of KeyEvent and MouseEvent. */ -public class InputEvent - extends AWTEvent +public class InputEvent extends AWTEvent { + private static final long serialVersionUID = 1L; public InputEvent(Component source_, int id_) { super(source_, id_); } Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/InvocationEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/InvocationEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/InvocationEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -24,9 +24,9 @@ * An event which executes the <code>run()</code> method on a * <code>Runnable</code> when dispatched by the AWT event dispatcher thread. */ -public class InvocationEvent - extends AWTEvent +public class InvocationEvent extends AWTEvent { + private static final long serialVersionUID = 1L; /** * Constructs an InvocationEvent with the specified source which * will execute the Runnable's run() method when dispatched by Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/ItemEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/ItemEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/ItemEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -24,9 +24,9 @@ /** * An event which indicates that an item was selected or deselected. */ -public class ItemEvent - extends AWTEvent +public class ItemEvent extends AWTEvent { + private static final long serialVersionUID = 1L; /** * Constructs an ItemEvent object. * @param source_ The object (such as a List) that originated the event. Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/KeyEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/KeyEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/KeyEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -25,9 +25,9 @@ /** * An event which indicates that a keystroke occurred in an object. */ -public class KeyEvent - extends InputEvent +public class KeyEvent extends InputEvent { + private static final long serialVersionUID = 1L; private int _key; public KeyEvent(int key_, int id_, Component source_) { Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/MouseEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/MouseEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/MouseEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -23,9 +23,9 @@ /** * An event which encapsulates information about a mouse-click. */ -public class MouseEvent - extends InputEvent +public class MouseEvent extends InputEvent { + private static final long serialVersionUID = 1L; public MouseEvent(Component source_, int modifiers_, int x_, int y_, int clickcount_, int button_) { Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/PaintEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/PaintEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/PaintEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -26,9 +26,9 @@ * An event which is used to ensure that painting of components is * serialized, i.e that it occurs in the main event-processing loop. */ -public class PaintEvent - extends AWTEvent +public class PaintEvent extends AWTEvent { + private static final long serialVersionUID = 1L; Rectangle _updateRect; public PaintEvent(Component source_, Rectangle rect_) { Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/ScrollEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/ScrollEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/ScrollEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -28,9 +28,9 @@ * such as a Table, when its state changes in such a way that it may * need to be scrolled (if it is contained within a ScrollPane). */ -public class ScrollEvent - extends AWTEvent +public class ScrollEvent extends AWTEvent { + private static final long serialVersionUID = 1L; /** * Construct a ScrollEvent with the specified direction and limit * parameters. Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/SyncEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/SyncEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/SyncEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -25,9 +25,9 @@ * A special event which is used for coalescing screen-refresh actions * if possible, in order to speed up redrawing. */ -public class SyncEvent - extends AWTEvent +public class SyncEvent extends AWTEvent { + private static final long serialVersionUID = 1L; public SyncEvent(Component source_) { super(source_, AWTEvent.SYNC_EVENT); Modified: branches/jikesRVM/textui/src/textui/charva/awt/event/WindowEvent.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/event/WindowEvent.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/event/WindowEvent.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -29,9 +29,9 @@ * The event is passed to each WindowListener object that is registered to * receive such events using the window's addWindowListener method. */ -public class WindowEvent - extends AWTEvent +public class WindowEvent extends AWTEvent { + private static final long serialVersionUID = 1L; public WindowEvent(Window source_, int id_) { super(source_, id_); Modified: branches/jikesRVM/textui/src/textui/charva/awt/util/MultiLineLabel.java =================================================================== --- branches/jikesRVM/textui/src/textui/charva/awt/util/MultiLineLabel.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charva/awt/util/MultiLineLabel.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -43,7 +43,7 @@ public Dimension minimumSize() { int width=0, height=0; - Enumeration e = _labeltext.elements(); + Enumeration<String> e = _labeltext.elements(); while (e.hasMoreElements()) { String s = (String) e.nextElement(); if (s.length() > width) @@ -62,7 +62,7 @@ // we'll sort out justification and video-attributes etc later. - Enumeration e = _labeltext.elements(); + Enumeration<String> e = _labeltext.elements(); for (int row=0; e.hasMoreElements(); row++) { String s = (String) e.nextElement(); toolkit.setCursor(origin.addOffset(0, row)); @@ -93,7 +93,7 @@ public String[] getText() { String[] strings = new String[_labeltext.size()]; - Enumeration e = _labeltext.elements(); + Enumeration<String> e = _labeltext.elements(); for (int i=0; e.hasMoreElements(); i++) { String s = (String) e.nextElement(); strings[i] = s; @@ -122,7 +122,7 @@ " size=" + getSize() + " label=" + (String) _labeltext.elementAt(0)); } - private Vector _labeltext = new Vector(); + private Vector<String> _labeltext = new Vector<String>(); //private int _justification = LEFT; Modified: branches/jikesRVM/textui/src/textui/charvax/swing/AbstractButton.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/AbstractButton.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/AbstractButton.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -185,7 +185,7 @@ */ public void addActionListener(ActionListener al_) { if (_actionListeners == null) - _actionListeners = new Vector(); + _actionListeners = new Vector<ActionListener>(); _actionListeners.add(al_); } @@ -194,7 +194,7 @@ */ protected void fireActionPerformed(ActionEvent ae_) { if (_actionListeners != null) { - for (Enumeration e = _actionListeners.elements(); + for (Enumeration<ActionListener> e = _actionListeners.elements(); e.hasMoreElements(); ) { ActionListener al = (ActionListener) e.nextElement(); @@ -208,7 +208,7 @@ */ public void addItemListener(ItemListener il_) { if (_itemListeners == null) - _itemListeners = new Vector(); + _itemListeners = new Vector<ItemListener>(); _itemListeners.add(il_); } @@ -250,7 +250,7 @@ */ protected void fireItemStateChanged(ItemEvent ie_) { if (_itemListeners != null) { - for (Enumeration e = _itemListeners.elements(); + for (Enumeration<ItemListener> e = _itemListeners.elements(); e.hasMoreElements(); ) { ItemListener il = (ItemListener) e.nextElement(); @@ -308,10 +308,10 @@ /** * A list of ActionListeners registered for this component. */ - protected Vector _actionListeners = null; + protected Vector<ActionListener> _actionListeners = null; /** * A list of ItemListeners registered for this component. */ - protected Vector _itemListeners = null; + protected Vector<ItemListener> _itemListeners = null; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/AbstractListModel.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/AbstractListModel.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/AbstractListModel.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -37,7 +37,7 @@ */ public void addListDataListener(ListDataListener l_) { if (_listeners == null) - _listeners = new ArrayList(); + _listeners = new ArrayList<ListDataListener>(); _listeners.add(l_); } @@ -62,7 +62,7 @@ ListDataEvent event = new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index0_, index1_); - for (Iterator iter = _listeners.iterator(); iter.hasNext(); ) { + for (Iterator<ListDataListener> iter = _listeners.iterator(); iter.hasNext(); ) { ListDataListener l = (ListDataListener) iter.next(); l.contentsChanged(event); } @@ -78,7 +78,7 @@ ListDataEvent event = new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index0_, index1_); - for (Iterator iter = _listeners.iterator(); iter.hasNext(); ) { + for (Iterator<ListDataListener> iter = _listeners.iterator(); iter.hasNext(); ) { ListDataListener l = (ListDataListener) iter.next(); l.contentsChanged(event); } @@ -94,7 +94,7 @@ ListDataEvent event = new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index0_, index1_); - for (Iterator iter = _listeners.iterator(); iter.hasNext(); ) { + for (Iterator<ListDataListener> iter = _listeners.iterator(); iter.hasNext(); ) { ListDataListener l = (ListDataListener) iter.next(); l.contentsChanged(event); } @@ -106,6 +106,6 @@ /** * A list of ListDataListeners registered for this object. */ - protected ArrayList _listeners = null; + protected ArrayList<ListDataListener> _listeners = null; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/ButtonGroup.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/ButtonGroup.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/ButtonGroup.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -56,7 +56,7 @@ */ public ButtonGroup() { - _buttons = new Vector(); + _buttons = new Vector<AbstractButton>(); } /** Adds the specified button to the group. @@ -77,7 +77,7 @@ /** Returns an Enumeration of all the buttons in this group. */ - public Enumeration getElements() + public Enumeration<AbstractButton> getElements() { return _buttons.elements(); } @@ -86,7 +86,7 @@ */ public AbstractButton getSelection() { - for (Enumeration e = _buttons.elements(); e.hasMoreElements();) { + for (Enumeration<AbstractButton> e = _buttons.elements(); e.hasMoreElements();) { AbstractButton b = (AbstractButton) e.nextElement(); if (b.isSelected() == true) @@ -130,7 +130,7 @@ /* There should have been only one button in the selected * state. All the other buttons should be in the deselected state. */ - for (Enumeration e = _buttons.elements(); e.hasMoreElements(); ) { + for (Enumeration<AbstractButton> e = _buttons.elements(); e.hasMoreElements(); ) { AbstractButton b = (AbstractButton) e.nextElement(); if (source != b || statechange != ItemEvent.SELECTED) { @@ -145,5 +145,5 @@ //==================================================================== // INSTANCE VARIABLES - private Vector _buttons; + private Vector<AbstractButton> _buttons; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/DefaultComboBoxModel.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/DefaultComboBoxModel.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/DefaultComboBoxModel.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -37,7 +37,7 @@ /** Constructs a DefaultComboBoxModel object initialized with a vector. */ - public DefaultComboBoxModel(Vector items_) { + public DefaultComboBoxModel(Vector<?> items_) { super(); for (int i=0; i<items_.size(); i++) { _list.add(items_.elementAt(i)); @@ -162,7 +162,7 @@ //==================================================================== // INSTANCE VARIABLES - private ArrayList _list = new ArrayList(); + private ArrayList<Object> _list = new ArrayList<Object>(); private Object _selectedItem; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListModel.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListModel.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListModel.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -97,5 +97,5 @@ // INSTANCE VARIABLES - private ArrayList _list = new ArrayList(); + private ArrayList<Object> _list = new ArrayList<Object>(); } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListSelectionModel.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListSelectionModel.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/DefaultListSelectionModel.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -123,11 +123,11 @@ */ public void addSelectionInterval(int index0, int index1) { - TreeSet range = getRange(index0, index1); + TreeSet<Integer> range = getRange(index0, index1); /* Find the differences */ - TreeSet newSelection = (TreeSet) _selection.clone(); + TreeSet<Integer> newSelection = new TreeSet<Integer>(_selection); newSelection.addAll(range); handleSelectionChange(newSelection); @@ -141,11 +141,11 @@ */ public void removeSelectionInterval(int index0, int index1) { - TreeSet range = getRange(index0, index1); + TreeSet<Integer> range = getRange(index0, index1); /* Find the differences */ - TreeSet newSelection = (TreeSet) _selection.clone(); + TreeSet<Integer> newSelection = new TreeSet<Integer>(_selection); newSelection.removeAll(range); handleSelectionChange(newSelection); @@ -158,7 +158,7 @@ */ public void setSelectionInterval(int index0, int index1) { - TreeSet newSelection = getRange(index0, index1); + TreeSet<Integer> newSelection = getRange(index0, index1); handleSelectionChange(newSelection); } @@ -196,7 +196,7 @@ ListSelectionEvent event = new ListSelectionEvent(this, firstindex_, lastindex_, false); - Iterator iter = _listeners.iterator(); + Iterator<ListSelectionListener> iter = _listeners.iterator(); while (iter.hasNext()) { ListSelectionListener l = (ListSelectionListener) iter.next(); @@ -207,7 +207,7 @@ /** Returns a TreeSet that contains the indices between index0 and index1 * inclusive. */ - private TreeSet getRange(int index0, int index1) { + private TreeSet<Integer> getRange(int index0, int index1) { int start = 0; int end = 0; @@ -218,19 +218,19 @@ start = index1; end = index0; } - TreeSet range = new TreeSet(); + TreeSet<Integer> range = new TreeSet<Integer>(); for (int i=start; i<=end; i++) { range.add(new Integer(i)); } return range; } - private void handleSelectionChange(TreeSet newSelection_) { + private void handleSelectionChange(TreeSet<Integer> newSelection_) { /* Find the differences between the old selection and the new * selection. */ - TreeSet copyOld = (TreeSet) _selection.clone(); - TreeSet differences = (TreeSet) newSelection_.clone(); + TreeSet<Integer> copyOld = new TreeSet<Integer>(_selection); + TreeSet<Integer> differences = new TreeSet<Integer>(newSelection_); differences.removeAll(_selection); copyOld.removeAll(newSelection_); @@ -253,11 +253,11 @@ /** The list of listeners. */ - protected ArrayList _listeners = new ArrayList(); + protected ArrayList<ListSelectionListener> _listeners = new ArrayList<ListSelectionListener>(); /** The set of selected indices. */ - protected TreeSet _selection = new TreeSet(); + protected TreeSet<Integer> _selection = new TreeSet<Integer>(); private int _selectionMode = ListSelectionModel.SINGLE_SELECTION; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/JComboBox.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/JComboBox.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/JComboBox.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -101,7 +101,7 @@ * Vector. * @param items_ the vector of items to display in the combobox */ - public JComboBox(Vector items_) + public JComboBox(Vector<?> items_) { DefaultComboBoxModel model = new DefaultComboBoxModel(items_); setModel(model); @@ -265,7 +265,7 @@ */ public void addItemListener(ItemListener il_) { if (_itemListeners == null) - _itemListeners = new Vector(); + _itemListeners = new Vector<ItemListener>(); _itemListeners.add(il_); } @@ -281,7 +281,7 @@ */ protected void fireItemStateChanged(ItemEvent ie_) { if (_itemListeners != null) { - for (Enumeration e = _itemListeners.elements(); + for (Enumeration<ItemListener> e = _itemListeners.elements(); e.hasMoreElements(); ) { ItemListener il = (ItemListener) e.nextElement(); @@ -308,7 +308,7 @@ */ public void addActionListener(ActionListener al_) { if (_actionListeners == null) - _actionListeners = new Vector(); + _actionListeners = new Vector<ActionListener>(); _actionListeners.add(al_); } @@ -317,7 +317,7 @@ */ protected void fireActionEvent(ActionEvent ae_) { if (_actionListeners != null) { - for (Enumeration e = _actionListeners.elements(); + for (Enumeration<ActionListener> e = _actionListeners.elements(); e.hasMoreElements(); ) { ActionListener al = (ActionListener) e.nextElement(); @@ -439,12 +439,12 @@ /** * A list of ActionListeners registered for this component. */ - protected Vector _actionListeners = null; + protected Vector<ActionListener> _actionListeners = null; /** * A list of ItemListeners registered for this component. */ - protected Vector _itemListeners = null; + protected Vector<ItemListener> _itemListeners = null; /** * This is a non-static inner class that implements the popup Modified: branches/jikesRVM/textui/src/textui/charvax/swing/JFileChooser.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/JFileChooser.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/JFileChooser.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -306,7 +306,7 @@ protected void fireFileChooserEvent() { - Enumeration e = _filelisteners.elements(); + Enumeration<FileChooserListener> e = _filelisteners.elements(); while (e.hasMoreElements()) { FileChooserListener l = (FileChooserListener) e.nextElement(); l.fileChanged(new FileChooserEvent(this)); @@ -326,7 +326,7 @@ protected boolean _cancelWasPressed = true; protected int _fileSelectionMode = FILES_ONLY; protected FileFilter _fileFilter = null; - protected Vector _filelisteners = new Vector(); + protected Vector<FileChooserListener> _filelisteners = new Vector<FileChooserListener>(); protected static final int _COLS = 50; protected static final int _ROWS = 20; @@ -656,15 +656,13 @@ * the Comparator interface. This will be used by the TreeSet * to keep the filenames in lexicographical order. */ - Comparator fileSorter = new Comparator() { - public int compare(Object obj1, Object obj2) { - String file1 = (String) obj1; - String file2 = (String) obj2; + Comparator<String> fileSorter = new Comparator<String>() { + public int compare(String file1, String file2) { return file1.compareTo(file2); } }; - TreeSet dirs = new TreeSet(fileSorter); + TreeSet<String> dirs = new TreeSet<String>(fileSorter); int numEntries = 0; for (int i=0; i<files.length; i++) { if (files[i].isDirectory()) { @@ -684,7 +682,7 @@ /* Copy the filenames from the TreeSet to the JList widget */ - Iterator iter = dirs.iterator(); + Iterator<String> iter = dirs.iterator(); while (iter.hasNext()) { listModel.addElement(iter.next()); } @@ -857,16 +855,16 @@ // end of inner class NewDirDialog - private interface FileChooserListener - extends EventListener + private interface FileChooserListener extends EventListener { public void fileChanged(FileChooserEvent e); } - private class FileChooserEvent - extends java.util.EventObject + private class FileChooserEvent extends java.util.EventObject { - public FileChooserEvent(Object source_) + private static final long serialVersionUID = 1L; + + public FileChooserEvent(Object source_) { super(source_); } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/JList.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/JList.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/JList.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -84,7 +84,7 @@ /** * Construct a JList containing the items in the specified Vector. */ - public JList(Vector items_) + public JList(Vector<?> items_) { setListData(items_); } @@ -103,8 +103,8 @@ /** Constructs a ListModel from a Vector and then applies setModel to it. */ - public void setListData(Vector listData_) { - Enumeration e = listData_.elements(); + public void setListData(Vector<?> listData_) { + Enumeration<?> e = listData_.elements(); DefaultListModel model = new DefaultListModel(); while (e.hasMoreElements()) { @@ -205,7 +205,7 @@ * sorted in increasing index order. */ public int[] getSelectedIndices() { - ArrayList objects = new ArrayList(); + ArrayList<Integer> objects = new ArrayList<Integer>(); if ( ! _selectionModel.isSelectionEmpty()) { int first = _selectionModel.getMinSelectionIndex(); int last = _selectionModel.getMaxSelectionIndex(); @@ -217,7 +217,7 @@ int[] values = new int[objects.size()]; for (int i=0; i<values.length; i++) { - values[i] = ((Integer) objects.get(i)).intValue(); + values[i] = objects.get(i).intValue(); } return values; } @@ -241,7 +241,7 @@ * sorted in increasing index order. */ public Object[] getSelectedValues() { - ArrayList objects = new ArrayList(); + ArrayList<Object> objects = new ArrayList<Object>(); if ( ! _selectionModel.isSelectionEmpty()) { int first = _selectionModel.getMinSelectionIndex(); int last = _selectionModel.getMaxSelectionIndex(); @@ -589,7 +589,7 @@ */ public void addScrollListener(ScrollListener sl_) { if (_scrollListeners == null) - _scrollListeners = new Vector(); + _scrollListeners = new Vector<ScrollListener>(); _scrollListeners.add(sl_); } @@ -606,7 +606,7 @@ */ public void processScrollEvent(ScrollEvent e_) { if (_scrollListeners != null) { - for (Enumeration e = _scrollListeners.elements(); + for (Enumeration<ScrollListener> e = _scrollListeners.elements(); e.hasMoreElements(); ) { ScrollListener sl = (ScrollListener) e.nextElement(); @@ -647,6 +647,6 @@ /** A list of ScrollListeners registered for this JList. */ - private Vector _scrollListeners = null; + private Vector<ScrollListener> _scrollListeners = null; } Modified: branches/jikesRVM/textui/src/textui/charvax/swing/JMenu.java =================================================================== --- branches/jikesRVM/textui/src/textui/charvax/swing/JMenu.java 2009-09-09 15:49:36 UTC (rev 5669) +++ branches/jikesRVM/textui/src/textui/charvax/swing/JMenu.java 2009-09-09 15:52:30 UTC (rev 5670) @@ -104,9 +104,9 @@ { super.setForeground(color_); - Enumeration e = _menuItems.elements(); + Enumeration<Component> e = _menuItems.elements(); while (e.hasMoreElements()) { - Component c = (Component) e.nextElement(); + Component c = e.nextElement(); if (c.getForeground() == null) c.setForeground(color_); } @@ -121,9 +121,9 @@ { super.setBackground(color_); - Enumeration e = _menuItems.elements(); + Enumeration<Component> e = _menuItems.elements(); while (e.hasMoreElements()) { - Component c = (Component) e.nextElement(); + Component c = e.nextElement(); if (c.getBackground() == null) c.setBackground(color_); } @@ -311,7 +311,7 @@ */ void setParentMenu(Component parent_) { - _parentMenu = new WeakReference(parent_); + _parentMenu = new WeakReference<Component>(parent_); // If the colors of this menu have not been set yet, inherit the // colors of the parent. @@ -329,12 +329,12 @@ //==================================================================== // INSTANCE VARIABLES - private Vector _menuItems = new Vector(); + private Vector<Component> _menuItems = new Vector<Component>(); // Note that the reference to the parent is stored as a WeakReference // so that the parent can be garbage-collected when it no longer has // any strong references to it. - private WeakReference _parentMenu; + private WeakReference<Component> _parentMenu; private boolean _popupMenuVisible = false; //private final Point _popupMenuOrigin; Modified: branches/jikesRVM/textui/src/textui/charvax/swing/JPopupMenu.java ========================================... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:49:49
|
Revision: 5669 http://jnode.svn.sourceforge.net/jnode/?rev=5669&view=rev Author: crawley Date: 2009-09-09 15:49:36 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (gui) Modified Paths: -------------- branches/jikesRVM/gui/.classpath branches/jikesRVM/gui/.project branches/jikesRVM/gui/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/gui/descriptors/org.jnode.awt.swingpeers.xml branches/jikesRVM/gui/descriptors/org.jnode.desktop.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.console.swing.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.sound.command.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.textscreen.fb.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.video.ati.radeon.xml branches/jikesRVM/gui/descriptors/org.jnode.test.gui.xml branches/jikesRVM/gui/gui.iml branches/jikesRVM/gui/src/awt/org/jnode/awt/AWTMouseEventGenerator.java branches/jikesRVM/gui/src/awt/org/jnode/awt/AWTPlugin.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeAwtContext.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeCursors.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeEventQueue.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeFrameBufferDevice.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeGenericPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeGraphics2D.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeGraphicsConfiguration.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeGraphicsEnvironment.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeRobotPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeToolkit.java branches/jikesRVM/gui/src/awt/org/jnode/awt/KeyboardHandler.java branches/jikesRVM/gui/src/awt/org/jnode/awt/MouseHandler.java branches/jikesRVM/gui/src/awt/org/jnode/awt/StartAwt.java branches/jikesRVM/gui/src/awt/org/jnode/awt/VMImageAPIImpl.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/FontManager.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/FontProvider.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/JNodeFontPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/TextRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/bdf/BDFFont.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/bdf/BDFFontMetrics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/bdf/BDFTextRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/def/DefaultFontManager.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/def/FontPlugin.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/renderer/FontScaleOp.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/renderer/GlyphRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/renderer/RenderCache.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/renderer/RenderContext.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/renderer/SummedAreaTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/spi/AbstractTextRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/spi/FontData.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/spi/Glyph.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/spi/ShapedGlyph.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFileInput.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFont.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFontData.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFontDataFile.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFontMetrics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFInput.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFMemoryInput.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFOpenType.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFPlugin.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFSimpleTextRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFTextRenderer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFontProvider.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TableClass.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/glyph/CompositeGlyph.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/glyph/SimpleGlyph.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/glyph/TTFGlyph.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/CMapTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/GlyphTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/HeadTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/HorizontalHeaderTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/HorizontalMetricsTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/LocationsTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/MaxPTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/NameTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/OS2Table.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/PostTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/TTFTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/tables/VersionTable.java branches/jikesRVM/gui/src/awt/org/jnode/awt/geom/PolyLine.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/AbstractImageConsumer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/AbstractMemoryImageConsumer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/BufferedImageSurface.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/ImageConsumerInt.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/JNodeBufferedImage.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics2D.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/JNodeImage.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/JNodeImageGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/ISwingContainerPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/ISwingPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingBaseMenuItemPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingBaseMenuPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingBaseWindow.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingBaseWindowPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingButtonPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingCanvasPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingCheckboxMenuItemPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingCheckboxPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingChoicePeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingComponentPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingContainerLayout.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingContainerPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingDialogPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingFramePeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingJFramePeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingLabelPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingLightweightContainerPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingLightweightPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingListPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingMenuBarPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingMenuComponentPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingMenuItemPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingMenuPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingPanelPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingPeersPlugin.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingPopupMenuPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingRepaintManager.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollPanePeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollbarPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingTextAreaPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingTextComponentPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingTextFieldPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java branches/jikesRVM/gui/src/awt/org/jnode/awt/swingpeers/SwingWindowPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics2D.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/AwtUtils.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/ApplicationBar.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/ControlBar.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/Desktop.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/DesktopPlugin.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/WindowBar.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/classic/Desktop.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/classic/TaskBar.java branches/jikesRVM/gui/src/desktop/org/jnode/desktop/classic/WindowBar.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cAPI.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cLineState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cProtocol.java branches/jikesRVM/gui/src/driver/org/jnode/driver/bus/i2c/I2cTimeoutException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/console/swing/SwingTextScreenConsoleManager.java branches/jikesRVM/gui/src/driver/org/jnode/driver/input/usb/USBHidConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/input/usb/USBInputDeviceToDriverMapper.java branches/jikesRVM/gui/src/driver/org/jnode/driver/input/usb/USBKeyboardDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/input/usb/USBMouseDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2Bus.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2ByteChannel.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2Constants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2Device.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2Driver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2Finder.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2KeyboardDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/ps2/PS2PointerDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/command/BeepCommand.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/command/PlayCommand.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/Note.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/SpeakerAPI.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/SpeakerUtils.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDevice.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerFinder.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreen.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenPlugin.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/swing/SwingTextScreenManager.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/AbstractFrameBufferDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/AlreadyOpenException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/FrameBufferAPI.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/FrameBufferConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/FrameBufferException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/HardwareCursor.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/HardwareCursorAPI.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/HardwareCursorImage.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/NotOpenException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/Surface.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/UnknownConfigurationException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Configuration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Constants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Driver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64VgaIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64VgaState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/CommonRegs.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/CrtcRegs.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/FBInfo.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/FPIBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/FPITimingBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/FpRegs.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/PLLInfo.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/PllRegs.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonAcceleration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonHardwareCursor.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonVgaIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonVgaState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/DDC1Exception.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/DDC1NoSignalException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/DDC1ParseException.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/DDC1Reader.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/DisplayDataChannelAPI.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/EDID.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/ddc/EDIDConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaAcceleration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaHardwareCursor.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaVgaIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaVgaState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/spi/DpmsState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/util/AbstractSurface.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/util/Curves.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/StandardVGA.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/VGABitmapGraphics.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/VGAConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/VGADriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/VGAFinder.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vgahw/DisplayMode.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vgahw/VgaConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vgahw/VgaIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vgahw/VgaState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vgahw/VgaUtils.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vmware/VMWareConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vmware/VMWareConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vmware/VMWareDriver.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFFontContainer.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFGlyph.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFMetrics.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFParser.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFParserConstants.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/BDFParserTokenManager.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/ParseException.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/SimpleCharStream.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/Token.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/TokenMgrError.java branches/jikesRVM/gui/src/font/org/jnode/font/bdf/mappings.properties branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTDemo.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTFrameTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTMenuBuilderTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTMenuTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/BufferImageTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/ColorModelTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/ConsoleTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/CurvesTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/DDC1Test.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/DialogTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Editor.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Emu.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/FBConsole.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/FBTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/FontManagerTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/GeneralPathTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/GlyphTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/GraphicsTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/HTMLTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/ImageIOTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/ImageTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Imageutil.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/IndexColorModelTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/JDPTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/JInternalFrameTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/JTableTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/JTreeTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/MouseEventTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/PolyLineTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/QuadCurveTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/RobotTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/SwingMenuTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/SwingTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/TTFFileTest.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/TextFieldTest.java branches/jikesRVM/gui/src/thinlet/thinlet/ThinTest.java branches/jikesRVM/gui/src/thinlet/thinlet/Thinlet.java Added Paths: ----------- branches/jikesRVM/gui/.checkstyle branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cirrus.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cursor.xml branches/jikesRVM/gui/descriptors/org.jnode.driver.video.vesa.xml branches/jikesRVM/gui/fonts/6x12_FixedMedium-12.bdf branches/jikesRVM/gui/fonts/VGAMedium-19.bdf branches/jikesRVM/gui/images/JNode_logo_trans.png branches/jikesRVM/gui/images/jnode_icon.png branches/jikesRVM/gui/mapgen.sh branches/jikesRVM/gui/src/awt/org/jnode/awt/GraphicsFactory.java branches/jikesRVM/gui/src/awt/org/jnode/awt/JNodeSurfaceGraphics2D.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/DefaultTextPipe.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/TGlyphVector.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/bdf/BDFFontPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java branches/jikesRVM/gui/src/awt/org/jnode/awt/image/BufferedImageGraphics2D.java branches/jikesRVM/gui/src/awt/org/jnode/awt/java2d/ branches/jikesRVM/gui/src/awt/org/jnode/awt/java2d/loops/ branches/jikesRVM/gui/src/awt/org/jnode/awt/java2d/loops/JNodeMaskBlit.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BasicGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BasicSurfaceGraphics.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BitmapGraphics16bpp.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BitmapGraphics24bpp.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BitmapGraphics32bpp.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/BitmapGraphics8bpp.java branches/jikesRVM/gui/src/awt/org/jnode/awt/util/SurfaceGraphics2D.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/Background.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/DefaultBackground.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/GradientBackground.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/FrameBufferAPIOwner.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/ branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusCore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cursor/ branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cursor/SoftwareCursor.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/util/VesaGTF.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/ branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/ModeInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/PMInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESAConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESADeviceToDriverMapper.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VbeInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Graphics2DSurface.java Removed Paths: ------------- branches/jikesRVM/gui/images/background.png branches/jikesRVM/gui/src/awt/org/jnode/awt/font/truetype/TTFURLInput.java branches/jikesRVM/gui/src/awt/org/jnode/awt/java2d/loops/ branches/jikesRVM/gui/src/awt/org/jnode/awt/java2d/loops/JNodeMaskBlit.java branches/jikesRVM/gui/src/driver/org/jnode/driver/console/swing/JTextAreaTextScreen.java branches/jikesRVM/gui/src/driver/org/jnode/driver/textscreen/fb/FbScrollableTextScreen.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusConstants.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusCore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/cursor/SoftwareCursor.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/ModeInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/PMInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESAConfiguration.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESADeviceToDriverMapper.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VbeInfoBlock.java branches/jikesRVM/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/AWTTest2.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/BoxWorld.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/ConsoleTest2.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Rubik.java branches/jikesRVM/gui/src/test/org/jnode/test/gui/Tetris.java Copied: branches/jikesRVM/gui/.checkstyle (from rev 5663, trunk/gui/.checkstyle) =================================================================== --- branches/jikesRVM/gui/.checkstyle (rev 0) +++ branches/jikesRVM/gui/.checkstyle 2009-09-09 15:49:36 UTC (rev 5669) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="FilesFromPackage" enabled="true"> + <filter-data value="src/font"/> + <filter-data value="src/thinlet"/> + </filter> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/gui/.classpath =================================================================== --- branches/jikesRVM/gui/.classpath 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/.classpath 2009-09-09 15:49:36 UTC (rev 5669) @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/awt"/> - <classpathentry kind="src" path="src/font"/> - <classpathentry kind="src" path="src/desktop"/> - <classpathentry kind="src" path="src/driver"/> - <classpathentry kind="src" path="src/test"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/awt"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/font"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/desktop"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/driver"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/thinlet"/> + <classpathentry kind="src" path="/core"/> + <classpathentry kind="src" path="/shell"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/gui/.project =================================================================== --- branches/jikesRVM/gui/.project 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/.project 2009-09-09 15:49:36 UTC (rev 5669) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-GUI</name> + <name>gui</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-Shell</project> </projects> @@ -12,8 +13,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/gui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/gui/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:49:36 UTC (rev 5669) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:12:42 CEST 2005 +#Mon Jul 14 11:33:36 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/gui/descriptors/org.jnode.awt.swingpeers.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.awt.swingpeers.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.awt.swingpeers.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -15,7 +15,6 @@ <runtime> <library name="jnode-gui.jar"> <export name="org.jnode.awt.swingpeers.*"/> - <export name="org.jnode.awt.swingpeers.event.*"/> </library> </runtime> Modified: branches/jikesRVM/gui/descriptors/org.jnode.desktop.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.desktop.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.desktop.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -31,12 +31,15 @@ <permission class="java.util.PropertyPermission" name="jnode.desktop" actions="read,write"/> <permission class="java.lang.RuntimePermission" name="getClassLoader" /> + <permission class="java.lang.RuntimePermission" name="accessDeclaredMembers" /> + <permission class="java.lang.RuntimePermission" name="preferences" /> <permission class="java.util.PropertyPermission" name="java.util.logging.manager" actions="read"/> <permission class="java.util.logging.LoggingPermission" name="control" actions="" /> <permission class="java.util.PropertyPermission" name="java.util.logging.config.class" actions="read" /> <permission class="java.util.PropertyPermission" name="java.util.logging.config.file" actions="read" /> <permission class="java.util.PropertyPermission" name="gnu.classpath.home.url" actions="read" /> <permission class="java.awt.AWTPermission" name="listenToAllAWTEvents" actions="read" /> + <permission class="java.awt.AWTPermission" name="setWindowAlwaysOnTop" /> </extension> </plugin> \ No newline at end of file Modified: branches/jikesRVM/gui/descriptors/org.jnode.driver.console.swing.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.console.swing.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.console.swing.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -26,5 +26,6 @@ <extension point="org.jnode.security.permissions"> <permission class="java.util.PropertyPermission" name="gnu.awt.dispatchthread.priority" actions="read"/> <permission class="java.awt.AWTPermission" name="listenToAllAWTEvents"/> + <permission class="java.lang.RuntimePermission" name="exitVM"/> </extension> </plugin> \ No newline at end of file Modified: branches/jikesRVM/gui/descriptors/org.jnode.driver.sound.command.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.sound.command.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.sound.command.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -22,5 +22,15 @@ <alias name="beep" class="org.jnode.driver.sound.command.BeepCommand"/> <alias name="play" class="org.jnode.driver.sound.command.PlayCommand"/> </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="beep"> + <empty description="Play a system beep"/> + </syntax> + <syntax alias="play"> + <empty description="Play a scale"/> + <option argLabel="tune" shortName="t" longName="tune" description="Play a tune"/> + </syntax> + </extension> </plugin> Modified: branches/jikesRVM/gui/descriptors/org.jnode.driver.textscreen.fb.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -9,7 +9,13 @@ class="org.jnode.driver.textscreen.fb.FbTextScreenPlugin"> <requires> + <import plugin="org.jnode.awt"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.driver.console.core"/> + <import plugin="org.jnode.driver.console.textscreen"/> <import plugin="org.jnode.driver.textscreen.core"/> + <import plugin="org.jnode.driver.textscreen"/> + <import plugin="org.jnode.driver.video"/> </requires> <runtime> @@ -17,5 +23,12 @@ <export name="org.jnode.driver.textscreen.fb.*"/> </library> </runtime> + + <extension point="org.jnode.security.permissions"> + <permission class="java.lang.RuntimePermission" name="setIO"/> + + <!-- fb console is experimental, TODO: fix security --> + <permission class="java.security.AllPermission" /> + </extension> </plugin> \ No newline at end of file Modified: branches/jikesRVM/gui/descriptors/org.jnode.driver.video.ati.radeon.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.video.ati.radeon.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.video.ati.radeon.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -27,6 +27,10 @@ <extension point="org.jnode.driver.mappers"> <mapper id="1002:5159" architecture="RV100" name="RV100 QY" driver-class="org.jnode.driver.video.ati.radeon.RadeonDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> <mapper id="1002:4c57" architecture="M7" name="M7 LW" driver-class="org.jnode.driver.video.ati.radeon.RadeonDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + <!-- todo support this + <mapper id="1002:5b60" architecture="RV250" name="X300 RV370 5B60" driver-class="org.jnode.driver.video.ati.radeon.RadeonDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + <mapper id="1002:5b70" architecture="RV250" name="X300 RV370" driver-class="org.jnode.driver.video.ati.radeon.RadeonDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + --> </extension> </plugin> \ No newline at end of file Copied: branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cirrus.xml (from rev 5663, trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml) =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cirrus.xml (rev 0) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cirrus.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.video.cirrus" + name="JNode Cirrus driver" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.awt"/> + <import plugin="org.jnode.driver.video"/> + <import plugin="org.jnode.driver.bus.pci"/> + </requires> + + <runtime> + <library name="jnode-gui.jar"> + <export name="org.jnode.driver.video.cirrus.*"/> + </library> + </runtime> + + <extension point="org.jnode.driver.mappers"> + <mapper id="1013:00B8" architecture="gd5446" name="Cirrus Logic GD 5446" driver-class="org.jnode.driver.video.cirrus.CirrusDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="org.jnode.system.ResourcePermission" name="ioports"/> + </extension> + +</plugin> Copied: branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cursor.xml (from rev 5663, trunk/gui/descriptors/org.jnode.driver.video.cursor.xml) =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cursor.xml (rev 0) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.video.cursor.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.video.cursor" + name="JNode Video interfaces" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.driver.video"/> + <import plugin="org.jnode.awt"/> + </requires> + + <runtime> + <library name="jnode-gui.jar"> + <export name="org.jnode.driver.video.cursor.*"/> + </library> + </runtime> + +</plugin> \ No newline at end of file Copied: branches/jikesRVM/gui/descriptors/org.jnode.driver.video.vesa.xml (from rev 5663, trunk/gui/descriptors/org.jnode.driver.video.vesa.xml) =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.driver.video.vesa.xml (rev 0) +++ branches/jikesRVM/gui/descriptors/org.jnode.driver.video.vesa.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.video.vesa" + name="JNode Video VESA driver" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.driver.bus.pci"/> + <import plugin="org.jnode.driver.video"/> + <import plugin="org.jnode.awt"/> + <import plugin="org.jnode.driver.video.cursor"/> + </requires> + + <runtime> + <library name="jnode-gui.jar"> + <export name="org.jnode.driver.video.vesa.*"/> + </library> + </runtime> + + <extension point="org.jnode.driver.mappers"> + <mapper class="org.jnode.driver.video.vesa.VESADeviceToDriverMapper"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="org.jnode.system.ResourcePermission" name="ioports"/> + </extension> + + <extension point="org.jnode.shell.aliases"> + <alias name="vesa" class="org.jnode.driver.video.vesa.VESACommand"/> + </extension> + +</plugin> \ No newline at end of file Modified: branches/jikesRVM/gui/descriptors/org.jnode.test.gui.xml =================================================================== --- branches/jikesRVM/gui/descriptors/org.jnode.test.gui.xml 2009-09-09 15:35:38 UTC (rev 5668) +++ branches/jikesRVM/gui/descriptors/org.jnode.test.gui.xml 2009-09-09 15:49:36 UTC (rev 5669) @@ -27,19 +27,21 @@ <application name="AWT demo" class="org.jnode.test.gui.AWTDemo"/> <application name="Swing test" class="org.jnode.test.gui.SwingTest"/> <application name="Swing menu test" class="org.jnode.test.gui.SwingMenuTest"/> - <application name="Tetris" class="org.jnode.test.gui.Tetris"/> <application name="Console" class="org.jnode.test.gui.ConsoleTest"/> - <application name="Console2" class="org.jnode.test.gui.ConsoleTest2"/> - <!-- application name="BoxWorld" class="org.jnode.test.gui.BoxWorld"/ --> <!-- application name="Thinlet" class="thinlet.ThinTest"/ --> <!-- application name="GlyphTest" class="org.jnode.test.gui.GlyphTest"/ --> </extension> - <extension point="org.jnode.security.permissions"> - <permission class="java.lang.RuntimePermission" name="setIO"/> - <permission class="java.awt.AWTPermission" name="createRobot"/> - <permission class="java.awt.AWTPermission" name="readDisplayPixels"/> - </extension> + <extension point="org.jnode.security.permissions"> + <permission class="java.lang.RuntimePermission" name="setIO"/> + <permission class="java.lang.RuntimePermission" name="exitVM" actions="*" /> + <permission class="java.awt.AWTPermission" name="createRobot"/> + <permission class="java.awt.AWTPermission" name="readDisplayPixels"/> + <permission class="java.util.PropertyPermission" name="user.home" actions="read"/> + <permission class="java.util.PropertyPermission" name="gnu.awt.dispatchthread.priority" actions="read"/> + <permission class="java.util.PropertyPermission" name="gnu.javax.swing.DebugGraphics" actions="read"/> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + </extension> <extension point="org.jnode.shell.aliases"> <alias name="AWTTest" class="org.jnode.test.gui.AWTTest"/> @@ -48,10 +50,8 @@ <alias name="AWTDemo" class="org.jnode.test.gui.AWTDemo"/> <alias name="JTableTest" class="org.jnode.test.gui.JTableTest"/> <alias name="JTreeTest" class="org.jnode.test.gui.JTreeTest"/> - <alias name="BoxWorld" class="org.jnode.test.gui.BoxWorld"/> - <alias name="DialogTest" class="org.jnode.test.gui.DialogTest"/> + <alias name="DialogTest" class="org.jnode.test.gui.DialogTest"/> <alias name="FBTest" class="org.jnode.test.gui.FBTest"/> - <alias name="Tetris" class="org.jnode.test.gui.Tetris"/> <alias name="SwingTest" class="org.jnode.test.gui.SwingTest"/> <alias name="MouseEventTest" class="org.jnode.test.gui.MouseEventTest"/> <alias name="SwingMenuTest" class="org.jnode.test.gui.SwingMenuTest"/> @@ -59,7 +59,16 @@ <alias name="ThinTest" class="thinlet.ThinTest"/> <alias name="GlyphTest" class="org.jnode.test.gui.GlyphTest"/> <alias name="RobotTest" class="org.jnode.test.gui.RobotTest"/> - <alias name="Rubik" class="org.jnode.test.gui.Rubik"/> </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="FBTest"> + <optionSet description="run framebuffer tests"> + <option argLabel="device" shortName="d"/> + <option argLabel="loops" shortName="l"/> + <option argLabel="tests" shortName="t"/> + </optionSet> + </syntax> + </extension> </plugin> Copied: branches/jikesRVM/gui/fonts/6x12_FixedMedium-12.bdf (from rev 5663, trunk/gui/fonts/6x12_FixedMedium-12.bdf) =================================================================== --- branches/jikesRVM/gui/fonts/6x12_FixedMedium-12.bdf (rev 0) +++ branches/jikesRVM/gui/fonts/6x12_FixedMedium-12.bdf 2009-09-09 15:49:36 UTC (rev 5669) @@ -0,0 +1,3620 @@ +STARTFONT 2.1 +FONT -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-0 +SIZE 12 75 75 +FONTBOUNDINGBOX 6 12 0 -2 +COMMENT "Generated by fontforge, http://fontforge.sourceforge.net" +STARTPROPERTIES 22 +FONTNAME_REGISTRY "" +FOUNDRY "Misc" +FAMILY_NAME "Fixed" +WEIGHT_NAME "Medium" +SLANT "R" +SETWIDTH_NAME "SemiCondensed" +ADD_STYLE_NAME "" +PIXEL_SIZE 12 +POINT_SIZE 120 +RESOLUTION_X 75 +RESOLUTION_Y 75 +SPACING "C" +AVERAGE_WIDTH 60 +CHARSET_REGISTRY "437" +CHARSET_ENCODING "0" +COPYRIGHT "Public domain terminal emulator font. Share and enjoy." +_XMBDFED_INFO "Edited with xmbdfed 4.5." +CAP_HEIGHT 7 +X_HEIGHT 5 +WEIGHT 10 +RESOLUTION 103 +QUAD_WIDTH 6 +ENDPROPERTIES +CHARS 255 +STARTCHAR char0 +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +A8 +00 +88 +00 +88 +00 +A8 +ENDCHAR +STARTCHAR uni0001 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 9 0 -1 +BITMAP +70 +88 +D8 +D8 +88 +D8 +A8 +88 +70 +ENDCHAR +STARTCHAR uni0002 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 9 0 -1 +BITMAP +70 +F8 +A8 +A8 +F8 +A8 +D8 +F8 +70 +ENDCHAR +STARTCHAR uni0003 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +50 +F8 +F8 +F8 +F8 +70 +70 +20 +ENDCHAR +STARTCHAR uni0004 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +20 +70 +70 +F8 +F8 +70 +70 +20 +ENDCHAR +STARTCHAR uni0005 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +70 +70 +A8 +F8 +F8 +A8 +20 +70 +ENDCHAR +STARTCHAR uni0006 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +20 +20 +70 +70 +F8 +F8 +20 +70 +ENDCHAR +STARTCHAR uni0007 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 4 4 1 2 +BITMAP +60 +F0 +F0 +60 +ENDCHAR +STARTCHAR uni0008 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 12 0 -2 +BITMAP +FC +FC +FC +FC +CC +84 +84 +CC +FC +FC +FC +FC +ENDCHAR +STARTCHAR uni0009 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 6 0 0 +BITMAP +30 +48 +84 +84 +48 +30 +ENDCHAR +STARTCHAR uni000A +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 12 0 -2 +BITMAP +FC +FC +FC +CC +B4 +78 +78 +B4 +CC +FC +FC +FC +ENDCHAR +STARTCHAR uni000B +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 7 0 0 +BITMAP +1C +0C +74 +88 +88 +88 +70 +ENDCHAR +STARTCHAR uni000C +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 -2 +BITMAP +70 +88 +88 +88 +70 +20 +70 +20 +ENDCHAR +STARTCHAR uni000D +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +30 +28 +20 +20 +E0 +C0 +ENDCHAR +STARTCHAR uni000E +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +60 +58 +48 +48 +48 +C8 +D8 +18 +ENDCHAR +STARTCHAR uni000F +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 9 0 -1 +BITMAP +20 +20 +88 +20 +50 +20 +88 +20 +20 +ENDCHAR +STARTCHAR uni0010 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 5 0 1 +BITMAP +C0 +F0 +FC +F0 +C0 +ENDCHAR +STARTCHAR uni0011 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 5 0 1 +BITMAP +0C +3C +FC +3C +0C +ENDCHAR +STARTCHAR uni0012 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +70 +A8 +20 +A8 +70 +20 +ENDCHAR +STARTCHAR uni0013 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 3 7 1 0 +BITMAP +A0 +A0 +A0 +A0 +A0 +00 +A0 +ENDCHAR +STARTCHAR uni0014 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 8 0 0 +BITMAP +78 +E8 +E8 +E8 +68 +28 +28 +28 +ENDCHAR +STARTCHAR uni0015 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 4 8 1 0 +BITMAP +70 +80 +60 +90 +90 +60 +10 +E0 +ENDCHAR +STARTCHAR uni0016 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 6 5 0 1 +BITMAP +FC +FC +FC +FC +FC +ENDCHAR +STARTCHAR uni0017 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +70 +A8 +20 +A8 +70 +F8 +ENDCHAR +STARTCHAR uni0018 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +70 +A8 +20 +20 +20 +20 +ENDCHAR +STARTCHAR uni0019 +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +20 +20 +20 +A8 +70 +20 +ENDCHAR +STARTCHAR uni001A +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 5 0 1 +BITMAP +20 +10 +F8 +10 +20 +ENDCHAR +STARTCHAR uni001B +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 5 0 1 +BITMAP +20 +40 +F8 +40 +20 +ENDCHAR +STARTCHAR uni001C +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +80 +80 +80 +80 +F8 +ENDCHAR +STARTCHAR uni001D +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 3 0 2 +BITMAP +50 +F8 +50 +ENDCHAR +STARTCHAR uni001E +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +20 +70 +70 +F8 +F8 +F8 +ENDCHAR +STARTCHAR uni001F +ENCODING -1 +SWIDTH 1000 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +F8 +F8 +70 +70 +20 +20 +ENDCHAR +STARTCHAR space +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 1 1 5 -2 +BITMAP +00 +ENDCHAR +STARTCHAR exclam +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 1 7 2 0 +BITMAP +80 +80 +80 +80 +80 +00 +80 +ENDCHAR +STARTCHAR quotedbl +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 3 1 5 +BITMAP +A0 +A0 +A0 +ENDCHAR +STARTCHAR numbersign +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +50 +F8 +50 +50 +F8 +50 +ENDCHAR +STARTCHAR dollar +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 9 0 -1 +BITMAP +20 +70 +A8 +A0 +70 +28 +A8 +70 +20 +ENDCHAR +STARTCHAR percent +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +C8 +C8 +10 +20 +40 +98 +98 +ENDCHAR +STARTCHAR ampersand +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +40 +A0 +A0 +40 +A8 +90 +68 +ENDCHAR +STARTCHAR quotesingle +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 1 3 2 5 +BITMAP +80 +80 +80 +ENDCHAR +STARTCHAR parenleft +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 9 1 -1 +BITMAP +20 +40 +40 +80 +80 +80 +40 +40 +20 +ENDCHAR +STARTCHAR parenright +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 9 1 -1 +BITMAP +80 +40 +40 +20 +20 +20 +40 +40 +80 +ENDCHAR +STARTCHAR asterisk +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +A8 +70 +20 +70 +A8 +20 +ENDCHAR +STARTCHAR plus +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 5 0 1 +BITMAP +20 +20 +F8 +20 +20 +ENDCHAR +STARTCHAR comma +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 3 0 -1 +BITMAP +60 +60 +C0 +ENDCHAR +STARTCHAR hyphen +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 1 1 3 +BITMAP +E0 +ENDCHAR +STARTCHAR period +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 2 2 1 0 +BITMAP +C0 +C0 +ENDCHAR +STARTCHAR slash +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +08 +10 +10 +20 +40 +40 +80 +ENDCHAR +STARTCHAR zero +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 4 7 1 0 +BITMAP +60 +90 +90 +90 +90 +90 +60 +ENDCHAR +STARTCHAR one +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 7 1 0 +BITMAP +40 +C0 +40 +40 +40 +40 +E0 +ENDCHAR +STARTCHAR two +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +08 +10 +20 +40 +F8 +ENDCHAR +STARTCHAR three +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +08 +10 +30 +08 +88 +70 +ENDCHAR +STARTCHAR four +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +10 +30 +50 +90 +F8 +10 +10 +ENDCHAR +STARTCHAR five +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +80 +F0 +08 +08 +88 +70 +ENDCHAR +STARTCHAR six +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +30 +40 +80 +F0 +88 +88 +70 +ENDCHAR +STARTCHAR seven +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +08 +10 +10 +20 +20 +20 +ENDCHAR +STARTCHAR eight +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +88 +70 +88 +88 +70 +ENDCHAR +STARTCHAR nine +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +88 +78 +08 +10 +60 +ENDCHAR +STARTCHAR colon +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 2 5 1 0 +BITMAP +C0 +C0 +00 +C0 +C0 +ENDCHAR +STARTCHAR semicolon +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 6 0 -1 +BITMAP +60 +60 +00 +60 +60 +C0 +ENDCHAR +STARTCHAR less +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 5 1 1 +BITMAP +20 +40 +80 +40 +20 +ENDCHAR +STARTCHAR equal +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 3 0 2 +BITMAP +F8 +00 +F8 +ENDCHAR +STARTCHAR greater +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 5 1 1 +BITMAP +80 +40 +20 +40 +80 +ENDCHAR +STARTCHAR question +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +10 +20 +20 +00 +20 +ENDCHAR +STARTCHAR at +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +B8 +A8 +B8 +80 +70 +ENDCHAR +STARTCHAR A +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +88 +F8 +88 +88 +88 +ENDCHAR +STARTCHAR B +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F0 +48 +48 +70 +48 +48 +F0 +ENDCHAR +STARTCHAR C +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +80 +80 +80 +88 +70 +ENDCHAR +STARTCHAR D +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F0 +48 +48 +48 +48 +48 +F0 +ENDCHAR +STARTCHAR E +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +80 +80 +F0 +80 +80 +F8 +ENDCHAR +STARTCHAR F +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +80 +80 +F0 +80 +80 +80 +ENDCHAR +STARTCHAR G +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +80 +80 +98 +88 +70 +ENDCHAR +STARTCHAR H +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +88 +F8 +88 +88 +88 +ENDCHAR +STARTCHAR I +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 7 1 0 +BITMAP +E0 +40 +40 +40 +40 +40 +E0 +ENDCHAR +STARTCHAR J +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +38 +10 +10 +10 +10 +90 +60 +ENDCHAR +STARTCHAR K +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +90 +A0 +C0 +A0 +90 +88 +ENDCHAR +STARTCHAR L +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +80 +80 +80 +80 +80 +80 +F8 +ENDCHAR +STARTCHAR M +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +D8 +A8 +88 +88 +88 +88 +ENDCHAR +STARTCHAR N +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +C8 +A8 +98 +88 +88 +ENDCHAR +STARTCHAR O +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +88 +88 +88 +88 +70 +ENDCHAR +STARTCHAR P +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F0 +88 +88 +F0 +80 +80 +80 +ENDCHAR +STARTCHAR Q +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +88 +88 +A8 +90 +68 +ENDCHAR +STARTCHAR R +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F0 +88 +88 +F0 +A0 +90 +88 +ENDCHAR +STARTCHAR S +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +70 +88 +80 +70 +08 +88 +70 +ENDCHAR +STARTCHAR T +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +20 +20 +20 +20 +20 +20 +ENDCHAR +STARTCHAR U +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +88 +88 +88 +88 +70 +ENDCHAR +STARTCHAR V +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +88 +88 +50 +50 +20 +ENDCHAR +STARTCHAR W +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +88 +88 +A8 +A8 +50 +ENDCHAR +STARTCHAR X +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +50 +20 +50 +88 +88 +ENDCHAR +STARTCHAR Y +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +88 +88 +50 +20 +20 +20 +20 +ENDCHAR +STARTCHAR Z +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +F8 +08 +10 +20 +40 +80 +F8 +ENDCHAR +STARTCHAR bracketleft +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 9 1 -1 +BITMAP +E0 +80 +80 +80 +80 +80 +80 +80 +E0 +ENDCHAR +STARTCHAR backslash +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +80 +40 +40 +20 +10 +10 +08 +ENDCHAR +STARTCHAR bracketright +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 9 1 -1 +BITMAP +E0 +20 +20 +20 +20 +20 +20 +20 +E0 +ENDCHAR +STARTCHAR asciicircum +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 3 0 5 +BITMAP +20 +50 +88 +ENDCHAR +STARTCHAR underscore +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 1 0 -2 +BITMAP +F8 +ENDCHAR +STARTCHAR grave +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 3 3 1 5 +BITMAP +80 +40 +20 +ENDCHAR +STARTCHAR a +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +70 +08 +78 +88 +78 +ENDCHAR +STARTCHAR b +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +80 +80 +F0 +88 +88 +88 +F0 +ENDCHAR +STARTCHAR c +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +70 +88 +80 +88 +70 +ENDCHAR +STARTCHAR d +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +08 +08 +78 +88 +88 +88 +78 +ENDCHAR +STARTCHAR e +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +70 +88 +F0 +80 +70 +ENDCHAR +STARTCHAR f +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +30 +48 +40 +E0 +40 +40 +40 +ENDCHAR +STARTCHAR g +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 -2 +BITMAP +70 +88 +88 +88 +78 +08 +70 +ENDCHAR +STARTCHAR h +ENCODING -1 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +80 +80 +F0 +88 +88 +88 +88 +ENDCHAR +STARTCHAR i +EN... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:36:02
|
Revision: 5668 http://jnode.svn.sourceforge.net/jnode/?rev=5668&view=rev Author: crawley Date: 2009-09-09 15:35:38 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (net) Modified Paths: -------------- branches/jikesRVM/net/.classpath branches/jikesRVM/net/.project branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/net/build.xml branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml branches/jikesRVM/net/descriptors/org.jnode.test.net.xml branches/jikesRVM/net/descriptors/org.xbill.dns.xml branches/jikesRVM/net/net.iml branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xTxBuffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100RxFD.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/AbstractEthernetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/BasicEthernetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/event/LinkStatusEvent.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/BufferManager.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/DWordIOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/Descriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/DescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/IOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/InitializationBlock32Bit.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/RxDescriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/RxDescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/TxDescriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/TxDescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/WordIOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackDevice.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackFinder.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000PacketHeader.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCIDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2CommFrame.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2CommandResponse.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2IO.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2InfoFrame.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Record.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139RxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139TxBuffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/AbstractDeviceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/NetDeviceEventProcessor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDevice.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbNetConstant.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/wireless/spi/WirelessDeviceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/wireless/spi/WirelessEthernetDriver.java branches/jikesRVM/net/src/net/org/jnode/net/HardwareAddress.java branches/jikesRVM/net/src/net/org/jnode/net/InvalidLayerException.java branches/jikesRVM/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java branches/jikesRVM/net/src/net/org/jnode/net/LayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/LinkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/LinkLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/NetPermission.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayerManager.java branches/jikesRVM/net/src/net/org/jnode/net/NoSuchProtocolException.java branches/jikesRVM/net/src/net/org/jnode/net/ProtocolAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ProtocolAddressInfo.java branches/jikesRVM/net/src/net/org/jnode/net/Resolver.java branches/jikesRVM/net/src/net/org/jnode/net/SocketBuffer.java branches/jikesRVM/net/src/net/org/jnode/net/TransportLayer.java branches/jikesRVM/net/src/net/org/jnode/net/TransportLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPCache.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPCacheEntry.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/arp/RARPNetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Address.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4AddressAndMask.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Constants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ControlBlockList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4FragmentList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Header.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4IfAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ProtocolAddressInfo.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Route.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4RoutingTable.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Service.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Utils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/AbstractBOOTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPMessage.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/IPv4ConfigurationService.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationProcessor.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationQueueEntry.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationServiceImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/IPv4ConfigurationPlugin.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/Ifconfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetBootpDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetConfigurationData.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDhcpConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetStaticDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/Route.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/AbstractDHCPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/DHCPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPAddressMaskHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPEchoHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPExHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPListener.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPListenerCriteria.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPTimestampHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPUnreachableHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4NetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4Sender.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4Statistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/raw/RAWProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/raw/RAWStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPDataBuffer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInChannel.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInputStream.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImplFactory.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPTimer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tftp/TFTPServer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImplFactory.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetAPIImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetDeviceImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetPlugin.java branches/jikesRVM/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/util/NetUtils.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/AuthenticationMode.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/WirelessConstants.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/p80211Header.java branches/jikesRVM/net/src/net/org/jnode/protocol/ftp/FTPURLConnection.java branches/jikesRVM/net/src/net/org/jnode/protocol/ftp/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/tftp/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/tftp/TFTPURLConnection.java branches/jikesRVM/net/src/test/org/jnode/test/net/ARPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/ChecksumTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/CvsTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/DnsTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/NetTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/TCPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/UDPSendTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/UDPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/URLTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/ethernet/EthernetAddressTest.java Added Paths: ----------- branches/jikesRVM/net/.checkstyle branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml branches/jikesRVM/net/lib/dnsjava-1.6.6-src.zip branches/jikesRVM/net/lib/dnsjava-1.6.6.jar branches/jikesRVM/net/lib/oncrpc.jar branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/UsbNetConstant.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/UsbNetDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDesc.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineTxRing.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Entry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ListDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/LookupResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Exception.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ReadFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ResultCode.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Time.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ExportEntry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountException.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/RemoteMountFileSystem.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/ branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4AddressArgument.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4HostArgument.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2URLConnection.java Removed Paths: ------------- branches/jikesRVM/net/descriptors/org.jnode.net.command.xml branches/jikesRVM/net/lib/dnsjava-1.5.0.jar branches/jikesRVM/net/lib/dnsjava-2.0.1a.jar branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDesc.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineTxRing.java branches/jikesRVM/net/src/net/org/jnode/net/command/ArpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/BootpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/DhcpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/HostArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/HostNameArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/IfconfigCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetstatCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetworkArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/PingCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/ResolverCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/RouteCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/TftpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/WLanCtlCommand.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Entry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ListDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/LookupResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Exception.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ReadFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ResultCode.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Time.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ExportEntry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountException.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/RemoteMountFileSystem.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4AddressArgument.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4HostArgument.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2URLConnection.java Property Changed: ---------------- branches/jikesRVM/net/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbNetConstant.java Property changes on: branches/jikesRVM/net ___________________________________________________________________ Modified: svn:ignore - build + build reports Copied: branches/jikesRVM/net/.checkstyle (from rev 5663, trunk/net/.checkstyle) =================================================================== --- branches/jikesRVM/net/.checkstyle (rev 0) +++ branches/jikesRVM/net/.checkstyle 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/net/.classpath =================================================================== --- branches/jikesRVM/net/.classpath 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.classpath 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/net"/> - <classpathentry kind="src" path="src/driver"/> - <classpathentry kind="src" path="src/test"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> - <classpathentry kind="lib" path="/JNode-Core/lib/gnu-crypto.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/javax-crypto.jar"/> - <classpathentry kind="lib" path="lib/dnsjava-2.0.1a.jar"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/net"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/driver"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry kind="src" path="/core"/> + <classpathentry exported="true" kind="lib" path="lib/oncrpc.jar"/> + <classpathentry kind="src" path="/shell"/> <classpathentry kind="lib" path="lib/jsch-0.1.24.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/commons-net-1.1.0.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/junit.jar"/> + <classpathentry kind="lib" path="lib/dnsjava-1.6.6.jar" sourcepath="lib/dnsjava-1.6.6-src.zip"/> + <classpathentry kind="lib" path="/core/lib/commons-net-1.1.0.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/core/lib/junit-4.5.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/net/.project =================================================================== --- branches/jikesRVM/net/.project 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.project 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-Net</name> + <name>net</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-Shell</project> </projects> @@ -12,8 +13,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:12:58 CEST 2005 +#Mon Jul 14 11:33:46 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/net/build.xml =================================================================== --- branches/jikesRVM/net/build.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/build.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,4 +1,4 @@ -<project name="JNode-Builder" default="all" basedir="."> +<project name="JNode-Net" default="all" basedir="."> <typedef file="${basedir}/../all/lib/jnode.xml"/> @@ -14,6 +14,7 @@ <pathelement location="${commons-net.jar}"/> <pathelement location="${dnsjava.jar}"/> <pathelement location="${jsch.jar}"/> + <pathelement location="${oncrpc.jar}"/> <path refid="cp"/> </path> Modified: branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml =================================================================== --- branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -10,7 +10,7 @@ license-url="http://www.jcraft.com/jsch/LICENSE.txt"> <requires> - <import plugin="crypto-security"/> + <import plugin="org.classpath.ext.security"/> </requires> Copied: branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml (from rev 5663, trunk/net/descriptors/org.acplt.oncrpc.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.acplt.oncrpc" + name="OncRpc" + version="1.0.6" + provider-name="Remote tea" + provider-url="http://remotetea.sourceforge.net/" + license-name="LGPL" + license-url="http://remotetea.sourceforge.net/"> + + + <runtime> + <library name="oncrpc.jar"> + <export name="org.acplt.oncrpc.*"/> + </library> + </runtime> + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" actions="connect,resolve"/> + </extension> + +</plugin> \ No newline at end of file Modified: branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -20,6 +20,7 @@ </runtime> <extension point="org.jnode.driver.mappers"> + <mapper id="10b7:9055" name="3C905B 100BaseTX [Cyclone] (rev 30)" driver-class="org.jnode.driver.net._3c90x._3c90xDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> <mapper id="10b7:9200" name="3C905C_TXM" driver-class="org.jnode.driver.net._3c90x._3c90xDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> </extension> @@ -28,4 +29,4 @@ <permission class="org.jnode.system.ResourcePermission" name="irq"/> </extension> -</plugin> \ No newline at end of file +</plugin> Copied: branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml (from rev 5663, trunk/net/descriptors/org.jnode.driver.net.via_rhine.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.net.via_rhine" + name="JNode VIA Rhine driver" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.driver.bus.pci"/> + <import plugin="org.jnode.driver.net.ethernet"/> + <import plugin="org.jnode.net"/> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.driver.net.via_rhine.*"/> + </library> + </runtime> + + <extension point="org.jnode.driver.mappers"> + <mapper id="1106:3065" name="VT6102" driver-class="org.jnode.driver.net.via_rhine.ViaRhineDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="org.jnode.system.ResourcePermission" name="ioports"/> + <permission class="org.jnode.system.ResourcePermission" name="irq"/> + </extension> + +</plugin> \ No newline at end of file Deleted: branches/jikesRVM/net/descriptors/org.jnode.net.command.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.command.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.command.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plugin SYSTEM "jnode.dtd"> - -<plugin id="org.jnode.net.command" - name="JNode Network Shell Commands" - version="@VERSION@" - license-name="lgpl" - provider-name="JNode.org"> - - <requires> - <import plugin="org.jnode.net"/> - <import plugin="org.jnode.net.arp"/> - <import plugin="org.jnode.net.ipv4"/> - <import plugin="org.jnode.net.ipv4.config"/> - <import plugin="org.jnode.shell.help"/> - </requires> - - <runtime> - <library name="jnode-net.jar"> - <export name="org.jnode.net.command.*"/> - </library> - </runtime> - - <extension point="org.jnode.shell.aliases"> - <alias name="arp" class="org.jnode.net.command.ArpCommand"/> - <alias name="bootp" class="org.jnode.net.command.BootpCommand"/> - <alias name="dhcp" class="org.jnode.net.command.DhcpCommand"/> - <alias name="ifconfig" class="org.jnode.net.command.IfconfigCommand"/> - <alias name="netstat" class="org.jnode.net.command.NetstatCommand"/> - <alias name="ping" class="org.jnode.net.command.PingCommand"/> - <alias name="route" class="org.jnode.net.command.RouteCommand"/> - <alias name="resolver" class="org.jnode.net.command.ResolverCommand"/> - <alias name="tftp" class="org.jnode.net.command.TftpCommand"/> - <alias name="wlanctl" class="org.jnode.net.command.WLanCtlCommand"/> - <alias name="net" class="org.jnode.net.command.NetCommand"/> - </extension> - - <extension point="org.jnode.security.permissions"> - <permission class="java.net.SocketPermission" name="*" actions="connect,resolve"/> - <permission class="java.net.SocketPermission" name="*:1024-" actions="listen,accept"/> - <permission class="java.net.SocketPermission" name="*:53" actions="resolve,listen,connect"/> - <permission class="java.net.SocketPermission" name="*:80" actions="resolve,listen,connect"/> - <permission class="java.util.PropertyPermission" name="dns.server" actions="read"/> - <permission class="java.util.PropertyPermission" name="dns.search" actions="read"/> - <permission class="org.jnode.net.NetPermission" name="bootpClient"/> - <permission class="org.jnode.net.NetPermission" name="dhcpClient"/> - <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> - </extension> -</plugin> Modified: branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -10,6 +10,13 @@ <requires> <import plugin="org.jnode.net.ipv4"/> + <!-- + Hack to handle the prefrences problem: + the org.jnode.fs.ramfs.def plugin sets up a partition + used by system prefrences and org.jnode.net.ipv4.config + uses the system prefrences so that needs to be setup beforhand + --> + <import plugin="org.jnode.fs.ramfs.def"/> </requires> <runtime> Modified: branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -32,6 +32,8 @@ <extension point="org.jnode.security.permissions"> <permission class="java.lang.RuntimePermission" name="setFactory"/> + + <permission class="java.io.FilePermission" name="/etc/resolv.conf" actions="read"/> <!-- Bootp --> <permission class="java.net.SocketPermission" name="*:67" actions="connect,resolve"/> <permission class="java.net.SocketPermission" name="localhost:68" actions="listen"/> @@ -46,6 +48,12 @@ <permission class="java.net.SocketPermission" name="*:53" actions="connect,resolve,listen"/> <permission class="java.util.PropertyPermission" name="dns.server" actions="read,write"/> <permission class="java.util.PropertyPermission" name="dns.search" actions="read,write"/> + + <!-- TFTP !?! --> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.util.PropertyPermission" name="user.dir" actions="read"/> + <permission class="java.net.SocketPermission" name="*:69" actions="connect,resolve"/> + </extension> <extension point="org.jnode.net.networkLayers"> Copied: branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml (from rev 5663, trunk/net/descriptors/org.jnode.net.nfs.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.net.nfs" name="NFS" version="@VERSION@" + license-name="lgpl" provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.net" /> + <import plugin="org.acplt.oncrpc" /> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.net.nfs.*" /> + <export name="org.jnode.net.nfs.nfs2.*" /> + <export name="org.jnode.net.nfs.nfs2.mount.*" /> + </library> + </runtime> + + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" + actions="connect,resolve" /> + </extension> + +</plugin> Copied: branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml (from rev 5663, trunk/net/descriptors/org.jnode.protocol.nfs.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.protocol.nfs" name="JNode NFS protocol handler" + version="@VERSION@" license-name="lgpl" provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.net.ipv4" /> + <import plugin="org.jnode.net.nfs" /> + <import plugin="org.jnode.protocol" /> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.protocol.nfs.*" /> + <export name="org.jnode.protocol.nfs.nfs2.*" /> + </library> + </runtime> + + <extension point="org.jnode.protocol.handlers"> + <handler protocol="nfs" class="org.jnode.protocol.nfs.Handler" /> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" + actions="connect,resolve" /> + </extension> + +</plugin> Modified: branches/jikesRVM/net/descriptors/org.jnode.test.net.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.test.net.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.test.net.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -8,7 +8,6 @@ provider-name="JNode.org"> <requires> - <import plugin="crypto-security"/> <import plugin="com.jcraft.jsch"/> </requires> Modified: branches/jikesRVM/net/descriptors/org.xbill.dns.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.xbill.dns.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.xbill.dns.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -3,7 +3,7 @@ <plugin id="org.xbill.dns" name="DNSJava" - version="1.5.0" + version="1.6.6" provider-name="XBill.org" provider-url="http://www.dnsjava.org" license-name="BSD like" @@ -11,17 +11,28 @@ <runtime> - <library name="dnsjava-1.5.0.jar"> + <library name="dnsjava-1.6.6.jar"> <export name="*"/> </library> </runtime> + <extension point="org.jnode.shell.aliases"> + <alias name="dig" class="dig"/> + <!-- todo: add jnamed.conf + <alias name="jnamed" class="jnamed"/> + --> + <alias name="lookup" class="lookup"/> + <!-- todo: console hangs on exit from update + <alias name="update" class="update"/> + --> + </extension> + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="/etc/resolv.conf" actions="read"/> <permission class="java.lang.RuntimePermission" name="selectorProvider"/> <permission class="java.util.PropertyPermission" name="dns.server" actions="read"/> <permission class="java.util.PropertyPermission" name="dns.search" actions="read"/> <permission class="java.net.SocketPermission" name="*" actions="resolve"/> <permission class="java.net.SocketPermission" name="*:53" actions="resolve,accept,connect,listen"/> </extension> - </plugin> \ No newline at end of file Deleted: branches/jikesRVM/net/lib/dnsjava-1.5.0.jar =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/dnsjava-1.6.6-src.zip (from rev 5663, trunk/net/lib/dnsjava-1.6.6-src.zip) =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/dnsjava-1.6.6.jar (from rev 5663, trunk/net/lib/dnsjava-1.6.6.jar) =================================================================== (Binary files differ) Deleted: branches/jikesRVM/net/lib/dnsjava-2.0.1a.jar =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/oncrpc.jar (from rev 5663, trunk/net/lib/oncrpc.jar) =================================================================== (Binary files differ) Modified: branches/jikesRVM/net/net.iml =================================================================== --- branches/jikesRVM/net/net.iml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/net.iml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/classes" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -14,34 +13,26 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="core" level="project" /> <orderEntry type="module" module-name="core" /> + <orderEntry type="module" module-name="shell" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/dnsjava-1.5.0.jar!/" /> + <root url="file://$MODULE_DIR$/lib" /> </CLASSES> <JAVADOC /> <SOURCES /> + <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jsch-0.1.24.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/commons-net-1.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/commons-net-1.1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> </component> </module> Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,71 +27,74 @@ /** * Generic API for network devices. - * + * <p/> * <h3>Transmission</h3> - * To transmit data, each network device should has a queue of Frame's. + * To transmit data, each network device should has a queue of Frame's. * The transmit method is called to add a frame to this queue. The device * should start a worker thread to process this queue. * Once a frame has been transmitted, the notifyTransmission method of that * frame must be called. - * + * <p/> * <h3>Reception</h3> * On reception of a frame, a network device must call the receive * method of the NetworkLayerManager. - * + * + * @author epr * @see org.jnode.net.NetworkLayerManager - * - * @author epr */ public interface NetDeviceAPI extends DeviceAPI { - /** - * Gets the hardware address of this device - */ - public HardwareAddress getAddress(); + /** + * Gets the hardware address of this device + */ + public HardwareAddress getAddress(); - /** - * Gets the maximum transfer unit, the number of bytes this device can - * transmit at a time. - */ - public int getMTU(); + /** + * Gets the maximum transfer unit, the number of bytes this device can + * transmit at a time. + */ + public int getMTU(); - /** - * Add the given frame to the transmit queue of this device. - * A client to this interface should use methods in Frame to checks for - * errors and wait for the actual transmission. - * After the frame has actually been transmitted by the device, the - * Frame.notifyTransmission method must be called. - * - * @param packet The network packet to transmit. No linklayer header has - * been added yet. - * @param destination The destination address, or null for a broadcast. - * @throws NetworkException - */ - public void transmit(SocketBuffer packet, HardwareAddress destination) - throws NetworkException; + /** + * Add the given frame to the transmit queue of this device. + * A client to this interface should use methods in Frame to checks for + * errors and wait for the actual transmission. + * After the frame has actually been transmitted by the device, the + * Frame.notifyTransmission method must be called. + * + * @param packet The network packet to transmit. No linklayer header has + * been added yet. + * @param destination The destination address, or null for a broadcast. + * @throws NetworkException + */ + public void transmit(SocketBuffer packet, HardwareAddress destination) + throws NetworkException; - /** - * Gets the protocol address information for a given protocol. - * @param protocolID - * @return The protocol address information, or null if not found. - */ - public ProtocolAddressInfo getProtocolAddressInfo(int protocolID); + /** + * Gets the protocol address information for a given protocol. + * + * @param protocolID + * @return The protocol address information, or null if not found. + */ + public ProtocolAddressInfo getProtocolAddressInfo(int protocolID); - /** - * Sets the protocol address information for a given protocol. - * @param protocolID - */ - public void setProtocolAddressInfo(int protocolID, ProtocolAddressInfo addressInfo); - /** - * Add a net device listener to this device. + * Sets the protocol address information for a given protocol. + * + * @param protocolID + */ + public void setProtocolAddressInfo(int protocolID, ProtocolAddressInfo addressInfo); + + /** + * Add a net device listener to this device. + * * @param listener */ public void addEventListener(NetDeviceListener listener); - + /** - * Add a net device listener to this device. + * Add a net device listener to this device. + * * @param listener */ public void removeEventListener(NetDeviceListener listener); Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -27,14 +26,18 @@ /** * Base class for all net device events. - * + * * @author Ewout Prangsma (ep...@us...) */ public abstract class NetDeviceEvent extends EventObject { - /** Identification of the event */ + private static final long serialVersionUID = 1L; + + /** + * Identification of the event + */ private final int id; - + /** * @param source */ @@ -45,14 +48,16 @@ /** * Gets the device that it the source of this event. - * @return + * + * @return the Device */ public final Device getDevice() { - return (Device)getSource(); + return (Device) getSource(); } - + /** * Gets the event ID. + * * @return Returns the id. */ public final int getId() { Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -30,6 +29,7 @@ /** * A net device has fired the given event. + * * @param event */ public void processEvent(NetDeviceEvent event); Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,34 +27,36 @@ */ public class NetworkException extends SocketException { - /** - * - */ - public NetworkException() { - super(); - } + private static final long serialVersionUID = 1L; - /** - * @param message - * @param cause - */ - public NetworkException(String message, Throwable cause) { - super(message); - initCause(cause); - } + /** + * + */ + public NetworkException() { + super(); + } - /** - * @param cause - */ - public NetworkException(Throwable cause) { - super(); - initCause(cause); - } + /** + * @param message + * @param cause + */ + public NetworkException(String message, Throwable cause) { + super(message); + initCause(cause); + } - /** - * @param s - */ - public NetworkException(String s) { - super(s); - } + /** + * @param cause + */ + public NetworkException(Throwable cause) { + super(); + initCause(cause); + } + + /** + * @param s + */ + public NetworkException(String s) { + super(s); + } } Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -25,35 +24,39 @@ /** * Device API for wireless network devices. - * + * * @author Ewout Prangsma (ep...@us...) */ public interface WirelessNetDeviceAPI extends NetDeviceAPI { /** * Gets the current authentication mode. - * @return + * + * @return the authentication mode */ public AuthenticationMode getAuthenticationMode(); - + /** * Sets the current authentication mode. + * * @param mode */ public void setAuthenticationMode(AuthenticationMode mode) - throws NetworkException; - + throws NetworkException; + /** * Gets the current ESS ID. + * * @return A valid ESSID, or null if not ESSID is present. */ public String getESSID(); /** * Sets the current ESS ID. + * * @param essid A valid ESSID, or null for any ESS. */ public void setESSID(String essid) - throws NetworkException; - + throws NetworkException; + } Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -26,95 +25,291 @@ */ public interface _3c90xConstants { - /* Register definitions for the 3c905 ***/ - public static final int regPowerMgmtCtrl_w = 0x7c; /** 905B Revision Only **/ - public static final int regUpMaxBurst_w = 0x7a; /** 905B Revision Only **/ - public static final int regDnMaxBurst_w = 0x78; /** 905B Revision Only **/ - public static final int regDebugControl_w = 0x74; /** 905B Revision Only **/ - public static final int regDebugData_l = 0x70; /** 905B Revision Only **/ - public static final int regRealTimeCnt_l = 0x40; /** Universal **/ - public static final int regUpBurstThresh_b = 0x3e; /** 905B Revision Only **/ - public static final int regUpPoll_b = 0x3d; /** 905B Revision Only **/ - public static final int regUpPriorityThresh_b = 0x3c; /** 905B Revision Only **/ - public static final int regUpListPtr_l = 0x38; /** Universal **/ - public static final int regCountdown_w = 0x36; /** Universal **/ - public static final int regFreeTimer_w = 0x34; /** Universal **/ - public static final int regUpPktStatus_l = 0x30; /** Universal with Exception; pg 130 **/ - public static final int regTxFreeThresh_b = 0x2f; /** 90X Revision Only **/ - public static final int regDnPoll_b = 0x2d; /** 905B Revision Only **/ - public static final int regDnPriorityThresh_b = 0x2c; /** 905B Revision Only **/ - public static final int regDnBurstThresh_b = 0x2a; /** 905B Revision Only **/ - public static final int regDnListPtr_l = 0... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:23:32
|
Revision: 5667 http://jnode.svn.sourceforge.net/jnode/?rev=5667&view=rev Author: crawley Date: 2009-09-09 15:23:20 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (cli) Added Paths: ----------- branches/jikesRVM/cli/ branches/jikesRVM/cli/.classpath branches/jikesRVM/cli/.project branches/jikesRVM/cli/build-tests.xml branches/jikesRVM/cli/build.xml branches/jikesRVM/cli/cli.iml branches/jikesRVM/cli/coreutils/ branches/jikesRVM/cli/coreutils/descriptors/ branches/jikesRVM/cli/coreutils/src/ branches/jikesRVM/cli/coreutils/src/commands/ branches/jikesRVM/cli/coreutils/src/commands/org/ branches/jikesRVM/cli/coreutils/src/commands/org/jnode/ branches/jikesRVM/cli/coreutils/src/commands/org/jnode/command/ branches/jikesRVM/cli/coreutils/src/commands/org/jnode/command/net/ branches/jikesRVM/cli/descriptors/ branches/jikesRVM/cli/descriptors/org.apache.tools.archive.xml branches/jikesRVM/cli/descriptors/org.jnode.command.archive.xml branches/jikesRVM/cli/descriptors/org.jnode.command.argument.xml branches/jikesRVM/cli/descriptors/org.jnode.command.common.xml branches/jikesRVM/cli/descriptors/org.jnode.command.dev.ant.xml branches/jikesRVM/cli/descriptors/org.jnode.command.dev.xml branches/jikesRVM/cli/descriptors/org.jnode.command.file.xml branches/jikesRVM/cli/descriptors/org.jnode.command.net.xml branches/jikesRVM/cli/descriptors/org.jnode.command.system.xml branches/jikesRVM/cli/descriptors/org.jnode.command.util.xml branches/jikesRVM/cli/src/ branches/jikesRVM/cli/src/commands/ branches/jikesRVM/cli/src/commands/org/ branches/jikesRVM/cli/src/commands/org/jnode/ branches/jikesRVM/cli/src/commands/org/jnode/command/ branches/jikesRVM/cli/src/commands/org/jnode/command/archive/ branches/jikesRVM/cli/src/commands/org/jnode/command/archive/ArchiveCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/BUnzipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/BZCatCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/BZip.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/BZipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/GUnzipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/GZip.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/GZipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/TarCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/UnzipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/ZCatCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/Zip.java branches/jikesRVM/cli/src/commands/org/jnode/command/archive/ZipCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/argument/ branches/jikesRVM/cli/src/commands/org/jnode/command/argument/NumberListArgument.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/ branches/jikesRVM/cli/src/commands/org/jnode/command/common/BasenameCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/DateCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/DirnameCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/EchoCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/EnvCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/ExitCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/ExprCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/FalseCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/HelpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/HistoryCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/SleepCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/TimeCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/TrueCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/UnixTestCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/common/UptimeCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/ branches/jikesRVM/cli/src/commands/org/jnode/command/dev/CompileCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/DebugCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/DefaultCompilerCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/DisassembleCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/RemoteOutputCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/dev/ant/ branches/jikesRVM/cli/src/commands/org/jnode/command/dev/ant/AntCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/ branches/jikesRVM/cli/src/commands/org/jnode/command/file/CatCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/CdCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/CpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/CutCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/DFCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/DeleteCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/DirCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/DuCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/FindCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/GrepCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/HeadCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/HexdumpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/Md5SumCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/MkdirCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/PasteCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/PwdCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/SortCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/TailCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/TeeCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/TouchCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/file/WcCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/ branches/jikesRVM/cli/src/commands/org/jnode/command/net/ArpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/BootpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/DhcpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/IfconfigCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/NetstatCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/PingCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/ResolverCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/RouteCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/RpcInfoCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/TcpInoutCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/TftpCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/WLanCtlCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/net/WgetCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/ branches/jikesRVM/cli/src/commands/org/jnode/command/system/AliasCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/BindKeysCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/ClassCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/ClasspathCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/CpuIDCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/GcCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/HaltCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/IsolateCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/JavaCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/KdbCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/KillCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/LoadkeysCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/LocaleCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/Log4jCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/LsIRQCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/MemoryCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/NamespaceCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/OnHeapCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/PageCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/PluginCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/PrintEnvCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/RebootCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/RunCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/SetCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/SyntaxCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/TerminateCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/ThreadCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/system/VmInfoCommand.java branches/jikesRVM/cli/src/commands/org/jnode/command/util/ branches/jikesRVM/cli/src/commands/org/jnode/command/util/AbstractDirectoryWalker.java branches/jikesRVM/cli/src/commands/org/jnode/command/util/IOUtils.java branches/jikesRVM/cli/src/commands/org/jnode/command/util/NumberRange.java branches/jikesRVM/cli/src/test/ branches/jikesRVM/cli/src/test/org/ branches/jikesRVM/cli/src/test/org/jnode/ branches/jikesRVM/cli/src/test/org/jnode/test/ branches/jikesRVM/cli/src/test/org/jnode/test/command/ branches/jikesRVM/cli/src/test/org/jnode/test/command/all-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/argument/ branches/jikesRVM/cli/src/test/org/jnode/test/command/argument/all-argument-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/common/ branches/jikesRVM/cli/src/test/org/jnode/test/command/common/all-common-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/common/basename-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/common/dirname-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/common/posix-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/ branches/jikesRVM/cli/src/test/org/jnode/test/command/file/all-file-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/cat-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/cut-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/grep-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/grep-context-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/head-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/paste-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/sort-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/tail-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/tee-command-tests.xml branches/jikesRVM/cli/src/test/org/jnode/test/command/file/wc-command-tests.xml Added: branches/jikesRVM/cli/.classpath =================================================================== --- branches/jikesRVM/cli/.classpath (rev 0) +++ branches/jikesRVM/cli/.classpath 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/commands"/> + <classpathentry kind="src" path="src/test"/> + <classpathentry combineaccessrules="false" kind="src" path="/shell"/> + <classpathentry combineaccessrules="false" kind="src" path="/core"/> + <classpathentry combineaccessrules="false" kind="src" path="/net"/> + <classpathentry combineaccessrules="false" kind="src" path="/fs"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: branches/jikesRVM/cli/.project =================================================================== --- branches/jikesRVM/cli/.project (rev 0) +++ branches/jikesRVM/cli/.project 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>cli</name> + <comment></comment> + <projects> + <project>core</project> + <project>shell</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: branches/jikesRVM/cli/build-tests.xml =================================================================== --- branches/jikesRVM/cli/build-tests.xml (rev 0) +++ branches/jikesRVM/cli/build-tests.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,56 @@ +<project name="JNode-CLI-Tests" default="all" basedir="."> + + <import file="${basedir}/../all/build.xml"/> + + <target name="help" description="output target descriptions"> + <echo> +The main targets (tests) for this build are as follows: +all Runs all tests for the 'cli' project +all-junit Runs all JUnit tests for the 'cli' project +blackbox-common Runs all blackbox tests in the 'common' package of the 'cli' project +blackbox-file Runs all blackbox tests in the 'file' package of the 'cli' project +all-blackbox Runs all blackbox tests for the 'cli' project +help Output these messages + </echo> + </target> + + <target name="all-junit"> + <delete dir="${basedir}/reports/junit"/> + <mkdir dir="${basedir}/reports/junit"/> + <junit showoutput="on" printsummary="on" fork="on"> + <classpath refid="cp-test"/> + <test name="org.jnode.test.cli.CLITestSuite" todir="${basedir}/reports/junit"/> + </junit> + </target> + + <target name="blackbox-common"> + <java classpathref="cp-test" classname="org.jnode.test.shell.harness.TestHarness"> + <arg value="-E"/> + <arg value="-s"/> + <arg value="${root.dir}"/> + <arg value="${basedir}/src/test/org/jnode/test/command/common/all-common-tests.xml"/> + </java> + </target> + + <target name="blackbox-file"> + <java classpathref="cp-test" classname="org.jnode.test.shell.harness.TestHarness"> + <arg value="-E"/> + <arg value="-s"/> + <arg value="${root.dir}"/> + <arg value="${basedir}/src/test/org/jnode/test/command/file/all-file-tests.xml"/> + </java> + </target> + + <target name="all-blackbox"> + <java classpathref="cp-test" classname="org.jnode.test.shell.harness.TestHarness"> + <arg value="-E"/> + <arg value="-s"/> + <arg value="${root.dir}"/> + <arg value="${basedir}/src/test/org/jnode/test/command/all-tests.xml"/> + </java> + </target> + + <target name="all" depends="all-junit,all-blackbox"/> +</project> + + Added: branches/jikesRVM/cli/build.xml =================================================================== --- branches/jikesRVM/cli/build.xml (rev 0) +++ branches/jikesRVM/cli/build.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,45 @@ +<project name="JNode-CoreUtils" default="all" basedir="."> + + <typedef file="${basedir}/../all/lib/jnode.xml"/> + + <property name="my-build.dir" value="${basedir}/build"/> + <property name="my-classes.dir" value="${my-build.dir}/classes"/> + <property name="my-src.dir" value="${basedir}/src"/> + <property name="my.jar" value="${jnode-cli.jar}"/> + <property name="my-report.dir" value="${my-build.dir}/report"/> + +<!-- Subproject specific classpath --> + <path id="my-cp"> + <pathelement location="${jnode-core.jar}"/> + <pathelement location="${jnode-fs.jar}"/> + <pathelement location="${jnode-shell.jar}"/> + <pathelement location="${jnode-net.jar}"/> + <path refid="cp"/> + </path> + +<!-- Initialize subproject directories --> + <target name="prepare"> + <mkdir dir="${my-classes.dir}"/> + <jnode.copy-descriptors/> + <copy todir="${my-classes.dir}"> + <fileset dir="${my-src.dir}/commands" excludes="**/*.java,**/package.html"/> + <fileset dir="${my-src.dir}/test" excludes="**/*.java,**/package.html"/> + </copy> + </target> + +<!-- Compile subproject --> + <target name="compile" depends="prepare"> + <jnode.compile> + <src path="${my-src.dir}/commands"/> + <classpath refid="my-cp"/> + </jnode.compile> + </target> + + <target name="assemble" depends="compile"/> + + <target name="all" depends="assemble"/> + + <target name="clean"> + <jnode.clean/> + </target> +</project> Added: branches/jikesRVM/cli/cli.iml =================================================================== --- branches/jikesRVM/cli/cli.iml (rev 0) +++ branches/jikesRVM/cli/cli.iml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/commands" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="shell" /> + <orderEntry type="module" module-name="core" /> + <orderEntry type="module" module-name="net" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../core/lib/log4j-1.2.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../net/lib/oncrpc.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="fs" /> + </component> +</module> + Added: branches/jikesRVM/cli/descriptors/org.apache.tools.archive.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.apache.tools.archive.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.apache.tools.archive.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.apache.tools.archive" + name="Ant archive tools" + version="1.7.1" + provider-name="Apache Ant" + provider-url="http://ant.apache.org" + license-name="apache2.0"> + + <runtime> + <library name="ant.jar"> + <export name="org.apache.tools.tar.*" /> + <export name="org.apache.tools.zip.*" /> + <export name="org.apache.tools.bzip2.*" /> + </library> + </runtime> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="readFileDescriptor"/> + <permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.archive.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.archive.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.archive.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.archive" + name="JNode archive commands" + version="@VERSION@" + provider-name="@PROVIDER@" + license-name="lgpl"> + + <requires> + <import plugin="org.apache.tools.archive" /> + <import plugin="org.jnode.shell" /> + <import plugin="org.jnode.shell.syntax" /> + <import plugin="org.jnode.command.util" /> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.archive.*" /> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="bzip2" class="org.jnode.command.archive.BZipCommand" /> + <alias name="bunzip2" class="org.jnode.command.archive.BUnzipCommand" /> + <alias name="bzcat" class="org.jnode.command.archive.BZCatCommand" /> + <alias name="gzip" class="org.jnode.command.archive.GZipCommand" /> + <alias name="gunzip" class="org.jnode.command.archive.GUnzipCommand" /> + <alias name="tar" class="org.jnode.command.archive.TarCommand" /> + <alias name="unzip" class="org.jnode.command.archive.UnzipCommand" /> + <alias name="zcat" class="org.jnode.command.archive.ZCatCommand" /> + <alias name="zip" class="org.jnode.command.archive.ZipCommand" /> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="bunzip2"> + <empty description="decompress stdin to stdout" /> + <sequence description="decompress files"> + <optionSet> + <!-- BZip --> + <option argLabel="compress" shortName="z" longName="compress"/> + <option argLabel="decompress" shortName="d" longName="decompress"/> + <option argLabel="test" shortName="t" longName="test" /> + <option argLabel="keep" shortName="k" longName="keep" /> + <option argLabel="small" shortName="s" longName="small" /> + <!-- ArchiveCommand --> + <option argLabel="stdout" shortName="c" longName="stdout" /> + <option argLabel="force" shortName="f" longName="force" /> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="quiet" shortName="q" longName="quiet" /> + <option argLabel="debug" longName="debug" /> + </optionSet> + <repeat> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="bzcat"> + <empty description="decompress stdin to stdout" /> + <sequence description="decompress files to stdout"> + <optionSet> + <option argLabel="small" shortName="s" longName="small" /> + </optionSet> + <repeat> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="bzip2"> + <empty description="compress stdin to stdout" /> + <sequence description="compress files"> + <optionSet> + <!-- BZipCommand --> + <option argLabel="c1" shortName="1" longName="fast" /> + <option argLabel="c2" shortName="2" /> + <option argLabel="c3" shortName="3" /> + <option argLabel="c4" shortName="4" /> + <option argLabel="c5" shortName="5" /> + <option argLabel="c6" shortName="6" /> + <option argLabel="c7" shortName="7" /> + <option argLabel="c8" shortName="8" /> + <option argLabel="c9" shortName="9" longName="best" /> + <!-- BZip --> + <option argLabel="decompress" shortName="d" longName="decompress" /> + <option argLabel="compress" shortName="z" longName="compress" /> + <option argLabel="test" shortName="t" longName="test" /> + <option argLabel="keep" shortName="k" longName="keep" /> + <option argLabel="small" shortName="s" longName="small" /> + <!-- ArchiveCommand --> + <option argLabel="stdout" shortName="c" longName="stdout" /> + <option argLabel="force" shortName="f" longName="force" /> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="quiet" shortName="q" longName="quiet" /> + <option argLabel="debug" longName="debug" /> + </optionSet> + <repeat> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="gunzip"> + <empty description="decompress standard input to standard output" /> + <sequence description="decompress files"> + <optionSet> + <!-- GZip --> + <option argLabel="test" shortName="t" longName="test" /> + <option argLabel="list" shortName="l" longName="list" /> + <option argLabel="recurse" shortName="r" longName="recursive" /> + <option argLabel="noname" shortName="n" longName="no-name" /> + <option argLabel="name" shortName="N" longName="name" /> + <!-- ArchiveCommand --> + <option argLabel="stdout" shortName="c" longName="stdout" /> + <option argLabel="force" shortName="f" longName="force" /> + <option argLabel="quiet" shortName="q" longName="quiet" /> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="debug" longName="debug" /> + </optionSet> + <optional eager="true"> + <option argLabel="suffix" shortName="S" longName="suffix" /> + </optional> + <repeat minCount="1"> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="gzip"> + <empty description="compress standard input to standard output" /> + <sequence description="compress files"> + <optionSet> + <!-- GZipCommand --> + <option argLabel="c1" shortName="1" longName="fast" /> + <option argLabel="c9" shortName="9" longName="best" /> + <option argLabel="decompress" shortName="d" longName="decompress" /> + <!-- GZip --> + <option argLabel="test" shortName="t" longName="test" /> + <option argLabel="list" shortName="l" longName="list" /> + <option argLabel="recurse" shortName="r" longName="recursive" /> + <option argLabel="noname" shortName="n" longName="no-name" /> + <option argLabel="name" shortName="N" longName="name" /> + <!-- ArchiveCommand --> + <option argLabel="stdout" shortName="c" longName="stdout" /> + <option argLabel="force" shortName="f" longName="force" /> + <option argLabel="quiet" shortName="q" longName="quiet" /> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="debug" longName="debug" /> + </optionSet> + <optional eager="true"> + <option argLabel="suffix" shortName="S" longName="suffix" /> + </optional> + <repeat minCount="1"> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="tar"> + <sequence> + <optionSet description="tar options"> + <!-- Tar Operations --> + <option argLabel="doAppend" shortName="r" longName="append" /> + <option argLabel="doCreate" shortName="c" longName="create" /> + <option argLabel="doConcat" shortName="A" longName="concatenate" /> + <option argLabel="doDiff" shortName="d" longName="diff" /> + <option argLabel="doExtract" shortName="x" longName="extract" /> + <option argLabel="doList" shortName="t" longName="list" /> + <option argLabel="doUpdate" shortName="u" longName="update" /> + <option argLabel="doDelete" longName="delete" /> + <!-- Tar Global Options --> + <option argLabel="archive" shortName="f" longName="file" /> + <option argLabel="bzip" shortName="j" longName="bzip2" /> + <option argLabel="fileList" shortName="T" longName="files-from"/> + <option argLabel="gzip" shortName="z" longName="gzip" /> + <option argLabel="interact" shortName="w" longName="interactive" /> + <option argLabel="keep_old" shortName="k" longName="keep-old-files" /> + <option argLabel="verify" shortName="W" longName="verify" /> + <option argLabel="xfile" shortName="X" longName="exclude-from"/> + <option argLabel="backup" longName="backup" /> + <option argLabel="keep_new" longName="keep-newer-files" /> + <option argLabel="removeFiles" longName="remove-files" /> + <option argLabel="showTotals" longName="totals" /> + <option argLabel="suffix" longName="suffix" /> + <option argLabel="unlink" longName="unlink" /> + <!-- Tar Path Parser Options --> + <option argLabel="dir" shortName="C" longName="directory" /> + <option argLabel="exclude" longName="exclude" label="pattern" /> + <option argLabel="noRecurse" longName="no-recursion" /> + <option argLabel="recurse" longName="recursion" /> + <!-- ArchiveCommand --> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="stdout" shortName="O" longName="to-stdout" /> + <option argLabel="debug" longName="debug" /> + <!-- + <option argLabel="minDate" shortName="N" longName="newer" /> + <option argLabel="minMTime" longName="newer-mtime" /> + --> + </optionSet> + <repeat> + <argument argLabel="paths"/> + </repeat> + </sequence> + </syntax> + <syntax alias="unzip"> + <sequence> + <optionSet> + <!-- UnzipCommand --> + <option argLabel="backup" shortName="B"/> + <option argLabel="ignore-case" shortName="C"/> + <option argLabel="keep" shortName="n"/> + <option argLabel="overwrite" shortName="o"/> + <!-- Zip --> + <option argLabel="no-path" shortName="j"/> + <!-- Zip Operations --> + <option argLabel="freshen" shortName="f"/> + <option argLabel="list" shortName="l"/> + <option argLabel="test" shortName="t"/> + <option argLabel="update" shortName="u"/> + <!-- ArchiveCommand --> + <option argLabel="stdout" shortName="p"/> + <option argLabel="verbose" shortName="v"/> + <option argLabel="quiet" shortName="q"/> + <option argLabel="debug" longName="debug"/> + </optionSet> + <argument argLabel="archive"/> + <repeat> + <argument argLabel="patterns"/> + </repeat> + <!-- TODO + <repeat> + <option argLabel="exclude" shortName="x"/> + </repeat> + <optional> + <option argLabel="extract-dir" shortName="d"/> + </optional> + --> + </sequence> + </syntax> + <syntax alias="zcat"> + <empty description="decompress standard input to standard output" /> + <repeat minCount="1"> + <argument argLabel="files" /> + </repeat> + </syntax> + <syntax alias="zip"> + <sequence> + <optionSet> + <!-- ZipCommand --> + <option argLabel="files-stdin" shortName="@"/> + <option argLabel="tmp-dir" shortName="b"/> + <option argLabel="no-dirs" shortName="D"/> + <option argLabel="no-compress" shortName="n"/> + <option argLabel="recurse" shortName="r"/> + <!--<option argLabel="recurse-cd" shortName="R"/>--> + <option argLabel="newer" shortName="t"/> + <option argLabel="older" longName="tt"/> + <!-- Zip --> + <option argLabel="no-path" shortName="j"/> + <!-- Zip Operations --> + <option argLabel="delete" shortName="d"/> + <option argLabel="freshen" shortName="f"/> + <option argLabel="move" shortName="m"/> + <option argLabel="update" shortName="u"/> + <!-- ArchiveCommand --> + <option argLabel="quiet" shortName="q"/> + <option argLabel="verbose" shortName="v"/> + <option argLabel="debug" longName="debug"/> + </optionSet> + <argument argLabel="archive"/> + <repeat> + <alternatives> + <option argLabel="exclude" shortName="x"/> + <option argLabel="include" shortName="i"/> + <argument argLabel="patterns"/> + </alternatives> + </repeat> + </sequence> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write,delete"/> + <permission class="java.util.PropertyPermission" name="user.dir" actions="read,write"/> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.argument.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.argument.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.argument.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.argument" + name="JNode command arguments" + version="@VERSION@" + provider-name="@PROVIDER@" + license-name="lgpl"> + + <requires> + <import plugin="org.jnode.shell.syntax"/> + <import plugin="org.jnode.command.util"/> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.argument.*"/> + </library> + </runtime> +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.common.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.common.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.common.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.common" + name="JNode common commands" + version="@VERSION@" + provider-name="@PROVIDER@" + license-name="lgpl"> + + <requires> + <import plugin="org.jnode.driver.console"/> + <import plugin="org.jnode.shell"/> + <import plugin="org.jnode.shell.help"/> + <import plugin="org.jnode.shell.syntax"/> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.common.*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="basename" class="org.jnode.command.common.BasenameCommand"/> + <alias name="date" class="org.jnode.command.common.DateCommand"/> + <alias name="dirname" class="org.jnode.command.common.DirnameCommand"/> + <alias name="echo" class="org.jnode.command.common.EchoCommand"/> + <alias name="env" class="org.jnode.command.common.EnvCommand"/> + <alias name="exit" class="org.jnode.command.common.ExitCommand"/> + <alias name="expr" class="org.jnode.command.common.ExprCommand"/> + <alias name="false" class="org.jnode.command.common.FalseCommand"/> + <alias name="help" class="org.jnode.command.common.HelpCommand"/> + <alias name="history" class="org.jnode.command.common.HistoryCommand"/> + <alias name="man" class="org.jnode.command.common.HelpCommand"/> + <alias name="sleep" class="org.jnode.command.common.SleepCommand"/> + <alias name="test" class="org.jnode.command.common.UnixTestCommand"/> + <!-- is not getting FilePermission read --> + <alias name="time" class="org.jnode.command.common.TimeCommand"/> + <alias name="true" class="org.jnode.command.common.TrueCommand"/> + <alias name="uptime" class="org.jnode.command.common.UptimeCommand"/> + <alias name="[" class="org.jnode.command.common.UnixTestCommand"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="basename"> + <sequence description="strip the directory prefix from a filename, as well as an option suffix"> + <argument argLabel="name" /> + <optional><argument argLabel="suffix"/></optional> + </sequence> + </syntax> + <syntax alias="date" description="Print the current date"/> + <syntax alias="dirname"> + <argument argLabel="name"/> + </syntax> + <syntax alias="echo" description="Print the arguments"> + <repeat> + <argument argLabel="text"/> + </repeat> + </syntax> + <syntax alias="env"> + <empty description="Print the system properties"/> + <option argLabel="env" shortName="e" longName="env" + description="Print the system environment variables"/> + <option argLabel="shell" shortName="s" longName="shell" + description="Print the current shell properties"/> + </syntax> + <syntax alias="exit" description="Exit the current shell"/> + <syntax alias="false"> + <empty description="Set a non-zero return code"/> + </syntax> + <syntax alias="help"> + <empty description="Print help about 'help'"/> + <argument argLabel="alias" description="Print help about a command alias or class"/> + </syntax> + <syntax alias="history"> + <empty description="List history entries"/> + <sequence description="Run a history command"> + <alternatives><empty/><option argLabel="test" shortName="t" longName="test"/></alternatives> + <alternatives> + <argument argLabel="index"/> + <argument argLabel="prefix"/> + </alternatives> + </sequence> + </syntax> + <syntax alias="man"> + <empty description="Print help about 'man'"/> + <argument argLabel="alias" description="Print help about a command alias or class"/> + </syntax> + <syntax alias="sleep" description="Sleep for a given number of seconds"> + <argument argLabel="seconds"/> + </syntax> + <syntax alias="time" description="Measures command execution time"> + <sequence> + <argument argLabel="alias"/> + <repeat><argument argLabel="args"/></repeat> + </sequence> + </syntax> + <syntax alias="true"> + <empty description="Set a zero return code"/> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read"/> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.dev.ant.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.dev.ant.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.dev.ant.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.dev.ant" + name="JNode Ant Commands" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.shell.help"/> + <import plugin="org.apache.tools.ant"/> + <import plugin="org.apache.tools.ant-launcher"/> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.dev.ant.*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="ant" class="org.jnode.command.dev.ant.AntCommand"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="setSecurityManager" actions="*" /> + <permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" /> + <permission class="java.lang.RuntimePermission" name="setIO" actions="*" /> + <permission class="java.lang.RuntimePermission" name="exitVM" actions="*" /> + <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" /> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> + +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.dev.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.dev.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.dev.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.dev" + name="JNode developer commands" + version="@VERSION@" + provider-name="@PROVIDER@" + license-name="lgpl"> + + <requires> + <import plugin="org.jnode.debug"/> + <import plugin="org.classpath.ext.jdwp"/> + <import plugin="org.jnode.shell.syntax"/> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.dev.*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="compile" class="org.jnode.command.dev.CompileCommand"/> + <alias name="debug" class="org.jnode.command.dev.DebugCommand"/> + <alias name="defaultCompiler" class="org.jnode.command.dev.DefaultCompilerCommand"/> + <alias name="disasm" class="org.jnode.command.dev.DisassembleCommand"/> + <alias name="netout" class="org.jnode.command.dev.RemoteOutputCommand"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="compile" description="Compile a class to native code"> + <sequence> + <optionSet> + <option argLabel="test" longName="test"/> + <option argLabel="level" longName="level"/> + </optionSet> + <argument argLabel="className"/> + </sequence> + </syntax> + <syntax alias="defaultCompiler" description="Set the default native compiler optimization level"> + <option argLabel="level" longName="level"/> + </syntax> + <syntax alias="disasm" description="Disassemble a native code class"> + <sequence> + <optionSet> + <option argLabel="test" longName="test"/> + <option argLabel="level" longName="level"/> + </optionSet> + <argument argLabel="className"/> + <optional> + <argument argLabel="methodName"/> + </optional> + </sequence> + </syntax> + <syntax alias="debug"> + <optional description="Run a JDWP listener to enable remote debugging"> + <option argLabel="port" shortName="p"/> + </optional> + </syntax> + <syntax alias="remoteout"> + <optionSet description="Redirect output and logging to a remote receiver"> + <option argLabel="host" shortName="h" longName="host"/> + <option argLabel="port" shortName="p" longName="port"/> + <option argLabel="udp" shortName="u" longName="udp"/> + </optionSet> + </syntax> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/> + <permission class="java.lang.RuntimePermission" name="setIO"/> + <permission class="java.lang.RuntimePermission" name="exitVM"/> + <permission class="java.net.SocketPermission" name="*:1-" actions="resolve,listen,connect"/> + <permission class="java.util.PropertyPermission" name="*" actions="read,write"/> + </extension> +</plugin> Added: branches/jikesRVM/cli/descriptors/org.jnode.command.file.xml =================================================================== --- branches/jikesRVM/cli/descriptors/org.jnode.command.file.xml (rev 0) +++ branches/jikesRVM/cli/descriptors/org.jnode.command.file.xml 2009-09-09 15:23:20 UTC (rev 5667) @@ -0,0 +1,400 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.command.file" + name="JNode file commands" + version="@VERSION@" + provider-name="@PROVIDER@" + license-name="lgpl"> + + <requires> + <import plugin="org.jnode.command.argument"/> + <import plugin="org.jnode.command.util"/> + <import plugin="org.jnode.driver"/> + <import plugin="org.jnode.fs"/> + <import plugin="org.jnode.fs.service"/> + <import plugin="org.jnode.shell.syntax"/> + <import plugin="org.jnode.util"/> + </requires> + + <runtime> + <library name="jnode-cli.jar"> + <export name="org.jnode.command.file.*"/> + </library> + </runtime> + + <extension point="org.jnode.shell.aliases"> + <alias name="cat" class="org.jnode.command.file.CatCommand"/> + <alias name="cd" class="org.jnode.command.file.CdCommand" internal="yes"/> + <alias name="cp" class="org.jnode.command.file.CpCommand"/> + <alias name="cut" class="org.jnode.command.file.CutCommand"/> + <alias name="del" class="org.jnode.command.file.DeleteCommand"/> + <alias name="df" class="org.jnode.command.file.DFCommand"/> + <alias name="dir" class="org.jnode.command.file.DirCommand"/> + <alias name="du" class="org.jnode.command.file.DuCommand"/> + <alias name="find" class="org.jnode.command.file.FindCommand"/> + <alias name="grep" class="org.jnode.command.file.GrepCommand"/> + <alias name="head" class="org.jnode.command.file.HeadCommand"/> + <alias name="hexdump" class="org.jnode.command.file.HexdumpCommand"/> + <alias name="ls" class="org.jnode.command.file.DirCommand"/> + <alias name="md5sum" class="org.jnode.command.file.Md5SumCommand"/> + <alias name="mkdir" class="org.jnode.command.file.MkdirCommand"/> + <alias name="paste" class="org.jnode.command.file.PasteCommand"/> + <alias name="pwd" class="org.jnode.command.file.PwdCommand"/> + <alias name="rm" class="org.jnode.command.file.DeleteCommand"/> + <alias name="sort" class="org.jnode.command.file.SortCommand"/> + <alias name="tail" class="org.jnode.command.file.TailCommand"/> + <alias name="tee" class="org.jnode.command.file.TeeCommand"/> + <alias name="touch" class="org.jnode.command.file.TouchCommand"/> + <alias name="wc" class="org.jnode.command.file.WcCommand"/> + </extension> + + <extension point="org.jnode.shell.syntaxes"> + <syntax alias="cat"> + <empty description="copy standard input to standard output"/> + <sequence description="concatenate files to standard output"> + <optionSet> + <option argLabel="num-nonblank" shortName="b" longName="number-nonblank"/> + <option argLabel="num" shortName="n" longName="number"/> + <option argLabel="squeeze" shortName="s" longName="sqeeze-blank"/> + <option argLabel="show-ends" shortName="E" longName="show-ends"/> + </optionSet> + <repeat> + <argument argLabel="file"/> + </repeat> + </sequence> + <sequence description="fetch and concatenate urls to standard output"> + <option argLabel="urls" shortName="u" longName="urls"/> + <repeat minCount="1"> + <argument argLabel="url"/> + </repeat> + </sequence> + </syntax> + <syntax alias="cd"> + <empty description="change the current directory to the 'user.home' directory"/> + <argument argLabel="directory" description="change the current directory to 'directory'"/> + </syntax> + <syntax alias="cp"> + <sequence description="copy files or directories"> + <optionSet> + <option argLabel="force" shortName="f" longName="force"/> + <option argLabel="update" shortName="u" longName="update"/> + <option argLabel="interactive" shortName="i" longName="interactive"/> + <option argLabel="recursive" shortName="r" longName="recursive"/> + <option argLabel="verbose" shortName="v" longName="verbose"/> + </optionSet> + <repeat minCount="1"> + <argument argLabel="source"/> + </repeat> + <argument argLabel="target"/> + </sequence> + </syntax> + <syntax alias="cut"> + <sequence description="select parts of lines"> + <optionSet> + <option argLabel="byte-range" shortName="b" longName="bytes" /> + <option argLabel="char-range" shortName="c" longName="characters"/> + <option argLabel="field-range" shortName="f" longName="fields"/> + <option argLabel="in-delim" shortName="d" longName="delimiter"/> + <option argLabel="suppress" shortName="s" longName="only-delimited"/> + <option argLabel="complement" longName="complement"/> + <option argLabel="out-delim" longName="output-delimiter"/> + </optionSet> + <repeat> + <argument argLabel="files"/> + </repeat> + </sequence> + </syntax> + <syntax alias="del"> + <sequence description="delete files and directories"> + <optionSet> + <option argLabel="recursive" shortName="r" longName="recursive"/> + <option argLabel="force" shortName="f" longName="force" /> + <option argLabel="interactive" shortName="i" longName="interactive" /> + <option argLabel="verbose" shortName="v" longName="verbose" /> + <option argLabel="onefs" longName="one-file-system"/> + </optionSet> + <repeat minCount="1"> + <argument argLabel="paths"/> + </repeat> + </sequence> + </syntax> + <syntax alias="df"> + <sequence description="display disk usage for file systems"> + <optionSet> + <option argLabel="human-read-bin" shortName="h" longName="human-readable"/> + <option argLabel="human-read-dec" shortName="H" longName="si"/> + <option argLabel="show-all" shortName="a" longName="all"/> + <option argLabel="block-size" shortName="B" longName="block-size"/> + <option argLabel="block-size-1k" shortName="k"/> + <!-- + <option argLabel="posix" shortName="P" longName="portability"/> + <option argLabel="inodes" shortName="i" longName="inodes"/> + <option argLabel="local" shortName="l" longName="local"/> + <option argLabel="sync" longName="sync"/> + <option argLabel="no-sync" longName="no-sync"/> + <option argLabel="fs-type" shortName="t" longName="type"/> + <option argLabel="print-type" shortName="T" longName="print-type"/> + <option argLabel="ex-type" shortName="x" longName="exclude-type"/> + --> + </optionSet> + <optional> + <alternatives> + <argument argLabel="path"/> + <argument argLabel="device"/> + </alternatives> + </optional> + </sequence> + </syntax> + <syntax alias="dir"> + <empty description="list the current directory"/> + <argument argLabel="path" description="list a file or directory"/> + </syntax> + <syntax alias="du"> + <sequence description="print file sizes"> + <repeat minCount="0"> + <argument argLabel="directory" description="directory to start printing sizes recursively"/> + </repeat> + <optionSet> + <option argLabel="sum" shortName="s" longName="summarize"/> + <option argLabel="all" shortName="a" longName="all"/> + <option argLabel="human-readable" shortName="h" longName="human-readable"/> + </optionSet> + </sequence> + </syntax> + <syntax alias="find"> + <sequence description="find files or directories"> + <repeat minCount="0"> + <argument argLabel="directory"/> + </repeat> + <optionSet> + <option argLabel="type" shortName="t" longName="type"/> + <option argLabel="maxdepth" shortName="D" longName="maxdepth"/> + <option argLabel="mindepth" shortName="d" longName="mindepth"/> + <option argLabel="name" shortName="n" longName="name"/> + <option argLabel="iname" shortName="N" longName="iname"/> + </optionSet> + </sequence> + </syntax> + <syntax alias="grep"> + <!-- grep [Options] <pattern> [<file>...] or + grep [Options] (-e <pattern> | -f <file>)... [<file>...] --> + <sequence description="Search for lines that match a string or regex"> + <optionSet> + <!-- Matcher type --> + <option argLabel="matcher-fixed" shortName="F" longName="fixed-strings"/> + <option argLabel="matcher-ext" shortName="E" longName="extended-regexp"/> + <option argLabel="matcher-basic" shortName="G" longName="basic-regexp"/> + <option argLabel="matcher-perl" shortName="P" longName="perl-regexp"/> + <!-- Matching options --> + <option argLabel="ignore-case" shortName="i" longName="ignore-case"/> + <option argLabel="invert" shortName="v" longName="invert-match"/> + <option argLabel="word-match" shortName="w" longName="word-regexp"/> + <option argLabel="line-match" shortName="x" longName="line-regexp"/> + <!-- Output options --> + <option argLabel="show-count" shortName="c" longName="count"/> + <option argLabel="show-files-nomatch" shortName="L" longName="files-without-match"/> + <option argLabel="show-files-match" shortName="l" longName="files-with-match"/> + <option argLabel="show-only-match" shortName="o" longName="only-matching"/> + <option argLabel="max-matches" shortName="m" longName="max-count"/> + <option argLabel="quiet" shortName="q" longName="quiet"/> + <option argLabel="quiet" longName="silent"/> + <option argLabel="suppress" shortName="s" longName="no-messages"/> + <!-- Output prefix control --> + <option argLabel="prefix-byte" shortName="b" longName="byte-offset"/> + <option argLabel="prefix-file" shortName="H" longName="with-filename"/> + <option argLabel="prefix-nofile" shortName="h" longName="no-filename"/> + <option argLabel="prefix-label" longName="label"/> + <option argLabel="prefix-line" shortName="n" longName="line-number"/> + <option argLabel="prefix-tab" shortName="T" longName="initial-tab"/> + <option argLabel="prefix-null" shortName="Z" longName="null"/> + <!-- Context lines --> + <option argLabel="show-context-after" shortName="A" longName="after-context"/> + <option argLabel="show-context-before" shortName="B" longName="before-context"/> + <option argLabel="show-context-both" shortName="C" longName="context"/> + <!-- File/Directory selection --> + <option argLabel="mode-binary" longName="binary-files"/> + <option argLabel="mode-binary-text" shortName="a" longName="text"/> + <option argLabel="mode-binary-skip" shortName="I"/> + <option argLabel="mode-device" shortName="D" longName="devices"/> + <option argLabel="mode-dir" shortName="d" longName="directories"/> + <option argLabel="mode-dir-recurse" shortName="r" longName="recursive"/> + <option argLabel="mode-dir-recurse" shortName="R"/> + <option argLabel="pattern-exclude" longName="exclude"/> + <option argLabel="pattern-exclude-file" longName="exclude-from"/> + <option argLabel="pattern-exclude-dir" longName="exclude-dir"/> + <option argLabel="pattern-include" longName="include"/> + <!-- Other options --> + <option argLabel="null-term" shortName="z" longName="null-data"/> + <option argLabel="debug" longName="debug"/> + </optionSet> + <alternatives> + <repeat minCount="1"> + <alternatives> + <option argLabel="patterns" shortName="e"/> + <option argLabel="pattern-files" shortName="f"/> + </alternatives> + </repeat> + <argument argLabel="patterns"/> + </alternatives> + <repeat> + <argument argLabel="files"/> + </repeat> + </sequence> + </syntax> + <syntax alias="head"> + <sequence> + <optionSet> + <option argLabel="quiet" shortName="q" longName="quiet"/> + <option argLabel="quiet" longName="silent"/> + <option argLabel="verbose" shortName="v" longName="verbose"/> + <option argLabel="bytes" shortName="c" longName="bytes"/> + <option argLabel="lines" shortName="n" longName="lines"/> + </optionSet> + <repeat> + <argument argLabel="files" /> + </repeat> + </sequence> + </syntax> + <syntax alias="hexdump"> + <empty description="print a hex dump of standard input"/> + <argument argLabel="file" description="print a hex dump of a file"/> + <option argLabel="url" shortName="u" longName="url" description="print a hex dump of a URL"/> + </syntax> + <syntax alias="ls"> + <empty description="list the current directory"/> + <repeat> + <argument argLabel="path" description="list files or directories"/> + </repeat> + </syntax> + <syntax alias="md5sum"> + <empty description="Calculates the MD5 digest for standard input"/> + <option argLabel="checkfile" shortName="c" longName="check"/> + <sequence description="Calculates the MD5 digests for files"> + <optional eager="true"> + <option argLabel="recursive" shortName="r" longName="recursive"/> + </optional> + <repeat minCount="1"> + <argument argLabel="paths"/> + </repeat> + </sequence> + </syntax> + <syntax alias="mkdir"> + <argument argLabel="directory" description="create a new directory"/> + </syntax> + <syntax alias="paste"> + <empty /> + <sequence> + <optionSet> + <option argLabel="serial" shortName="s" longName="serial"/> + <option argLabel="delims" shortName="d" longName="delimiters"/> + </optionSet> + <repeat> + <argument argLabel="files"/> + </repeat> + </sequence> + </syntax> + <syntax alias="pwd"> + <empty description="show the pathname for the current directory"/> + </syntax> + <syntax alias="rm"> + <sequence description="delete files and directories"> + <optionSet> + <option argLabel="recursive" shortName="r" longName="recursiv... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:19:33
|
Revision: 5666 http://jnode.svn.sourceforge.net/jnode/?rev=5666&view=rev Author: crawley Date: 2009-09-09 15:19:21 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (builder) Modified Paths: -------------- branches/jikesRVM/builder/.classpath branches/jikesRVM/builder/.project branches/jikesRVM/builder/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/builder/build.xml branches/jikesRVM/builder/builder.iml branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Asm.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/BaseDirs.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/CompareTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/Flags.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/classpath/TargetedFileSet.java branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractPluginTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractPluginsTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/AddressFinder.java branches/jikesRVM/builder/src/builder/org/jnode/build/AsmSourceInfo.java branches/jikesRVM/builder/src/builder/org/jnode/build/BootDiskBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/BootFloppyBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/BuildException.java branches/jikesRVM/builder/src/builder/org/jnode/build/BuildObjectResolver.java branches/jikesRVM/builder/src/builder/org/jnode/build/FieldInfo.java branches/jikesRVM/builder/src/builder/org/jnode/build/InitJarBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/InitJarsBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java branches/jikesRVM/builder/src/builder/org/jnode/build/ObjectEmitter.java branches/jikesRVM/builder/src/builder/org/jnode/build/PluginList.java branches/jikesRVM/builder/src/builder/org/jnode/build/PluginTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/VMwareBuilderTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/DotBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/LicenseEntry.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/PackageData.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/PluginData.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/documentation/ToolbarEntry.java branches/jikesRVM/builder/src/builder/org/jnode/build/package.html branches/jikesRVM/builder/src/builder/org/jnode/build/x86/AsmConstBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/x86/Disasm.java branches/jikesRVM/builder/src/builder/org/jnode/build/x86/package.html branches/jikesRVM/builder/src/builder/org/jnode/jnasm/JNAsm.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/Address.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/Assembler.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/AssemblerModule.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/HardwareSupport.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/Identifier.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/Instruction.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/InstructionUtils.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/PseudoInstructions.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/Register.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/x86/AbstractX86Module.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/x86/MMX.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Core.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/assembler/x86/X86Support.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/preprocessor/FileResolver.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/preprocessor/Macro.java branches/jikesRVM/builder/src/builder/org/jnode/jnasm/preprocessor/Preprocessor.java branches/jikesRVM/builder/src/builder/org/jnode/linker/Elf.java branches/jikesRVM/builder/src/builder/org/jnode/linker/ElfLinker.java branches/jikesRVM/builder/src/builder/org/jnode/linker/LoadUtil.java branches/jikesRVM/builder/src/builder/org/jnode/linker/Reloc.java branches/jikesRVM/builder/src/builder/org/jnode/linker/Reloca.java branches/jikesRVM/builder/src/builder/org/jnode/linker/Section.java branches/jikesRVM/builder/src/builder/org/jnode/linker/StoreUtil.java branches/jikesRVM/builder/src/builder/org/jnode/linker/StrTab.java branches/jikesRVM/builder/src/builder/org/jnode/linker/Symbol.java Added Paths: ----------- branches/jikesRVM/builder/.checkstyle branches/jikesRVM/builder/lib/iso9660.jar branches/jikesRVM/builder/lib/jnode-configure-dist.jar branches/jikesRVM/builder/lib/sabre.jar branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.java branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/TemplateTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/natives/ branches/jikesRVM/builder/src/builder/org/jnode/build/natives/NativeStubGenerator.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/ branches/jikesRVM/builder/src/builder/org/jnode/build/packager/MainFinder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PackagerTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PluginBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/ScriptBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/plugins.properties branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/ branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Main.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Plugin.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginList.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginListEditor.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginListModel.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginRepository.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginTreePane.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Project.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/ProjectNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/RootNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Syncable.java branches/jikesRVM/builder/src/configure/ branches/jikesRVM/builder/src/configure/org/ branches/jikesRVM/builder/src/configure/org/jnode/ branches/jikesRVM/builder/src/configure/org/jnode/configure/ branches/jikesRVM/builder/src/configure/org/jnode/configure/Configure.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ConfigureException.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ConfigureScript.java branches/jikesRVM/builder/src/configure/org/jnode/configure/EnumeratedType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PatternType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PropertySet.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PropertyType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/Screen.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ScriptParser.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/ branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/DummyValueCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/FileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/FileAdapterFactory.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/JavaSourceFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/JavaStringLiteralCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/PropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/PropertyValueCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/TextFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLPropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLValueCodec.java Removed Paths: ------------- branches/jikesRVM/builder/src/builder/org/jnode/build/natives/NativeStubGenerator.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/MainFinder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PackagerTask.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PluginBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/ScriptBuilder.java branches/jikesRVM/builder/src/builder/org/jnode/build/packager/plugins.properties branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Main.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Plugin.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginList.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginListEditor.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginListModel.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginRepository.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/PluginTreePane.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Project.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/ProjectNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/RootNode.java branches/jikesRVM/builder/src/builder/org/jnode/pluginlist/Syncable.java branches/jikesRVM/builder/src/configure/org/ branches/jikesRVM/builder/src/configure/org/jnode/ branches/jikesRVM/builder/src/configure/org/jnode/configure/ branches/jikesRVM/builder/src/configure/org/jnode/configure/Configure.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ConfigureException.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ConfigureScript.java branches/jikesRVM/builder/src/configure/org/jnode/configure/EnumeratedType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PatternType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PropertySet.java branches/jikesRVM/builder/src/configure/org/jnode/configure/PropertyType.java branches/jikesRVM/builder/src/configure/org/jnode/configure/Screen.java branches/jikesRVM/builder/src/configure/org/jnode/configure/ScriptParser.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/ branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/DummyValueCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/FileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/FileAdapterFactory.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/JavaSourceFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/JavaStringLiteralCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/PropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/PropertyValueCodec.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/TextFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLPropertyFileAdapter.java branches/jikesRVM/builder/src/configure/org/jnode/configure/adapter/XMLValueCodec.java Copied: branches/jikesRVM/builder/.checkstyle (from rev 5663, trunk/builder/.checkstyle) =================================================================== --- branches/jikesRVM/builder/.checkstyle (rev 0) +++ branches/jikesRVM/builder/.checkstyle 2009-09-09 15:19:21 UTC (rev 5666) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <local-check-config name="JNode checkstyle - javadoc" location="/all/new_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle - javadoc" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="FilesFromPackage" enabled="true"> + <filter-data value="src/builder/org/jnode/jnasm/assembler/gen"/> + </filter> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/builder/.classpath =================================================================== --- branches/jikesRVM/builder/.classpath 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/.classpath 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/builder"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="src" path="/JNode-FS"/> - <classpathentry kind="lib" path="/JNode-Core/lib/ant.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/builder"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/configure"/> + <classpathentry kind="src" path="/core"/> + <classpathentry kind="src" path="/fs"/> + <classpathentry kind="lib" path="/core/lib/ant.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="src" path="/shell"/> <classpathentry kind="lib" path="lib/xml-apis.jar"/> <classpathentry kind="lib" path="lib/bcel-5.1.jar"/> + <classpathentry kind="lib" path="/shell/lib/nanoxml-2.2.3.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/builder/.project =================================================================== --- branches/jikesRVM/builder/.project 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/.project 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-Builder</name> + <name>builder</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-FS</project> </projects> @@ -12,8 +13,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/builder/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/builder/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:08:18 CEST 2005 +#Mon Jul 14 11:34:38 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/builder/build.xml =================================================================== --- branches/jikesRVM/builder/build.xml 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/build.xml 2009-09-09 15:19:21 UTC (rev 5666) @@ -6,7 +6,6 @@ <property name="my-gen.dir" value="${basedir}/build/src"/> <property name="my-classes.dir" value="${my-build.dir}/classes"/> <property name="my-src.dir" value="${basedir}/src"/> - <property name="my.jar" value="${jnode-builder.jar}"/> <property name="javacc.dir" value="${basedir}/lib" /> <property name="jnasm-src.dir" value="${my-src.dir}/builder/org/jnode/jnasm"/> <property name="jnasm-preprocessor-gen.dir" value="${my-gen.dir}/org/jnode/jnasm/preprocessor/gen"/> @@ -18,6 +17,7 @@ <pathelement location="${jnode-fs.jar}"/> <pathelement location="${basedir}/lib/xml-apis.jar"/> <pathelement location="${bcel-5.1.jar}"/> + <pathelement location="${nanoxml-java.jar}"/> <path refid="cp"/> </path> @@ -26,28 +26,85 @@ <mkdir dir="${my-classes.dir}"/> <mkdir dir="${jnasm-preprocessor-gen.dir}"/> <mkdir dir="${jnasm-assembler-gen.dir}"/> + + <copy todir="${my-classes.dir}"> + <fileset dir="${my-src.dir}/builder" includes="**/*.properties"/> + </copy> </target> -<!-- Compile all subproject java files --> - <target name="compile" depends="prepare"> + <!-- Compile the Template ANT task needed for compiling the core --> + <target name="pre-compile" depends="prepare"> + <javac destdir="${my-classes.dir}" + debug="on" + optimize="on" + fork="off" + compiler="modern" + includeJavaRuntime="true" + target="${java.target}" + source="${java.source}" + encoding="${java.encoding}" + excludes="**/*-template.java,**/package-info.java" + srcdir="${my-src.dir}/builder/"> + <bootclasspath path="${jnode-core.jar}"/> + <compilerarg value="${compilerarg}"/> + <filename name="org/jnode/ant/taskdefs/TemplateTask.java" /> + </javac> + <jar jarfile="${jnode-builder.jar}" + basedir="${my-classes.dir}" + includes="org/jnode/ant/taskdefs/**"/> + </target> + + <target name="javacc" depends="prepare" > <javacc target="${jnasm-src.dir}/preprocessor/gen/JNAsmPP.jj" javacchome="${javacc.dir}" outputdirectory="${jnasm-preprocessor-gen.dir}" /> <javacc target="${jnasm-src.dir}/assembler/gen/JNAsm.jj" javacchome="${javacc.dir}" outputdirectory="${jnasm-assembler-gen.dir}" /> + <condition property="run.native2ascii"> + <or> + <isfileselected file="${jnasm-assembler-gen.dir}/JNAsm.java"> + <date datetime="${hotswap.class.tstamp}" pattern="${hotswap.class.tstamp.pattern}" when="after"/> + </isfileselected> + <isfileselected file="${jnasm-preprocessor-gen.dir}/JNAsmPP.java"> + <date datetime="${hotswap.class.tstamp}" pattern="${hotswap.class.tstamp.pattern}" when="after"/> + </isfileselected> + </or> + </condition> + </target> + + <target name="native2ascii" depends="javacc" if="run.native2ascii"> + <!-- Don't swap move & native2ascii tasks ! On Windows, we need to call them + in that order because native2ascii prevent from overwritting its source file --> + <move file="${jnasm-preprocessor-gen.dir}/JNAsmPP.java" + tofile="${jnasm-preprocessor-gen.dir}/JNAsmPP" overwrite="yes"/> + <native2ascii src="${jnasm-preprocessor-gen.dir}" includes="JNAsmPP" + dest="${jnasm-preprocessor-gen.dir}" ext=".java"/> + + <move file="${jnasm-assembler-gen.dir}/JNAsm.java" + tofile="${jnasm-assembler-gen.dir}/JNAsm" overwrite="yes"/> + <native2ascii src="${jnasm-assembler-gen.dir}" includes="JNAsm" + dest="${jnasm-assembler-gen.dir}" ext=".java"/> + </target> + +<!-- Compile all subproject java files --> + <target name="compile" depends="native2ascii"> <jnode.compile> - <src path="${my-src.dir}/builder"/> + <src path="${my-src.dir}/builder"/> + <src path="${my-src.dir}/configure"/> <src path="${my-gen.dir}"/> <classpath refid="my-cp"/> </jnode.compile> </target> -<!-- Assemble the jarfile --> +<!-- Assemble the jarfiles --> <target name="assemble" depends="compile"> - <jar jarfile="${my.jar}"> - <fileset dir="${my-classes.dir}"/> - </jar> + <jar jarfile="${jnode-builder.jar}" + basedir="${my-classes.dir}" + excludes="org/jnode/configure/**"/> + <jar jarfile="${jnode-configure.jar}" + basedir="${my-classes.dir}" + includes="org/jnode/configure/**"/> </target> <!-- Do it all --> Modified: branches/jikesRVM/builder/builder.iml =================================================================== --- branches/jikesRVM/builder/builder.iml 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/builder.iml 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/classes" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/builder" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/configure" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="module" module-name="core" /> @@ -29,20 +29,20 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="core" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/dom4j.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/pmd/xercesImpl-2.6.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="core" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/pmd/xercesImpl-2.6.2.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/pmd/pmd-3.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -51,7 +51,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/pmd/pmd-3.0.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/pmd/saxpath-1.0-fcs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -60,7 +60,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/pmd/saxpath-1.0-fcs.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/pmd/jaxen-core-1.0-fcs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -69,7 +69,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/pmd/jaxen-core-1.0-fcs.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/pmd/xmlParserAPIs-2.6.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -78,7 +78,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/classycle.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -87,7 +87,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/pmd/xmlParserAPIs-2.6.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-attrs-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -96,13 +96,40 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/itext-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-util-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntryProperties /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bcel-5.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="fs" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../core/lib/ant.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../shell/lib/nanoxml-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> </component> </module> Copied: branches/jikesRVM/builder/lib/iso9660.jar (from rev 5663, trunk/builder/lib/iso9660.jar) =================================================================== (Binary files differ) Copied: branches/jikesRVM/builder/lib/jnode-configure-dist.jar (from rev 5663, trunk/builder/lib/jnode-configure-dist.jar) =================================================================== (Binary files differ) Copied: branches/jikesRVM/builder/lib/sabre.jar (from rev 5663, trunk/builder/lib/sabre.jar) =================================================================== (Binary files differ) Copied: branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java (from rev 5663, trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java) =================================================================== --- branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java (rev 0) +++ branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2009-09-09 15:19:21 UTC (rev 5666) @@ -0,0 +1,397 @@ +/* + * $Id$ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jnode.ant.taskdefs; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import org.apache.tools.ant.BuildException; +import org.jnode.annotation.MagicPermission; +import org.jnode.annotation.SharedStatics; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassAdapter; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.objectweb.asm.attrs.Annotation; +import org.objectweb.asm.attrs.Attributes; +import org.objectweb.asm.attrs.RuntimeVisibleAnnotations; +import org.objectweb.asm.util.TraceClassVisitor; + +/** + * That ant task will add some annotations to some compiled classes + * mentioned in a property file. + * For now, it's only necessary to add annotations to some + * openjdk classes to avoid modifying the original source code. + * + * @author Fabien DUMINY (fduminy at jnode dot org) + */ +public class AnnotateTask extends FileSetTask { + private static final String SHAREDSTATICS_TYPE_DESC = Type.getDescriptor(SharedStatics.class); + private static final String MAGICPERMISSION_TYPE_DESC = Type.getDescriptor(MagicPermission.class); + + private File annotationFile; + private String[] classesFiles; + + private String buildStartTime = ""; + private String pattern = ""; + private long startTime = 0; + private String baseDir; + + private Properties annotations = new Properties(); + + protected void doExecute() throws BuildException { + try { + SimpleDateFormat format = new SimpleDateFormat(pattern); + startTime = format.parse(buildStartTime).getTime(); + } catch (Exception e) { + throw new BuildException("invalid buildStartTime or pattern", e); + } + + try { + if (readProperties()) { + for (String file : classesFiles) { + File classFile = new File(baseDir, file); + processFile(classFile); + } + } + } catch (IOException ioe) { + throw new BuildException(ioe); + } + } + + /** + * Defines the annotation property file where are specified annotations to add. + * + * @param annotationFile + */ + public final void setAnnotationFile(File annotationFile) { + this.annotationFile = annotationFile; + } + + /** + * Define the time at which build started. + * + * @param buildStartTime + */ + public final void setBuildStartTime(String buildStartTime) { + this.buildStartTime = buildStartTime; + } + + /** + * Define the pattern with which buildStartTime is defined. + * + * @param pattern + */ + public final void setPattern(String pattern) { + this.pattern = pattern; + } + + public void setBaseDir(String baseDir) { + this.baseDir = baseDir; + } + + /** + * Read the properties file. For now, it simply contains a list of + * classes that need the SharedStatics annotation. + * + * @return + * @throws BuildException + */ + private boolean readProperties() throws BuildException { + readProperties("annotationFile", annotationFile, annotations); + if (annotations.isEmpty()) { + System.err.println("WARNING: annotationFile is empty (or doesn't exist)"); + return false; + } + + classesFiles = (String[]) annotations.keySet().toArray(new String[annotations.size()]); + + // we must sort the classes in reverse order so that + // classes with longest package name will be used first + // (that is only necessary for classes whose name is the same + // but package is different ; typical such class name : "Constants") + Arrays.sort(classesFiles, Collections.reverseOrder()); + + return true; + } + + /** + * Generic method that read properties from a given file. + * + * @param name + * @param file + * @param properties + * @throws BuildException + */ + private void readProperties(String name, File file, Properties properties) throws BuildException { + if (file == null) { + throw new BuildException(name + " is mandatory"); + } + + if (!file.exists()) { + return; + } + + FileInputStream fis = null; + try { + fis = new FileInputStream(file); + properties.load(fis); + } catch (IOException e) { + throw new BuildException(e); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + throw new BuildException(e); + } + } + } + } + + /** + * Get the list of annotations for the given class file. + * + * @param classFile list of annotations with ',' as separator. null if no annotation for that class. + * @return + */ + private String getAnnotations(File classFile) { + String annotations = null; + String classFilePath = classFile.getAbsolutePath(); + for (String f : classesFiles) { + if (classFilePath.endsWith(f)) { + annotations = this.annotations.getProperty(f); + break; + } + } + + return annotations; + } + + /** + * Actually process a class file (called from parent class). + */ + @Override + protected void processFile(File classFile) throws IOException { + if (classFile.lastModified() < startTime) { + return; + } + + String annotations = getAnnotations(classFile); + if (annotations == null) { + return; + } + + File tmpFile = new File(classFile.getParentFile(), classFile.getName() + ".tmp"); + FileInputStream fis = null; + boolean classIsModified = false; + + try { + fis = new FileInputStream(classFile); + classIsModified = addAnnotation(classFile, fis, tmpFile, annotations); + } finally { + if (fis != null) { + fis.close(); + } + } + + if (classIsModified) { + if (trace) { + traceClass(classFile, "before"); + + traceClass(tmpFile, "after"); + } + + if (!classFile.delete()) { + throw new IOException("can't delete " + classFile.getAbsolutePath()); + } + + if (!tmpFile.renameTo(classFile)) { + throw new IOException("can't rename " + tmpFile.getAbsolutePath()); + } + } + } + + /** + * Simple debug method that trace a class file. + * It can be used to visually check that the annotations has been + * properly added + * + * @param file + * @param message + * @throws IOException + */ + private void traceClass(File file, String message) throws IOException { + System.out.println("===== (" + message + ") trace for " + file.getAbsolutePath() + " ====="); + FileInputStream fis = null; + try { + fis = new FileInputStream(file); + + ClassReader cr = new ClassReader(fis); + TraceClassVisitor tcv = new TraceClassVisitor(null, new PrintWriter(System.out)); + cr.accept(tcv, Attributes.getDefaultAttributes(), true); + } finally { + if (fis != null) { + fis.close(); + } + } + System.out.println("----- end trace -----"); + } + + /** + * Add an annotation to a class file. + * + * @param classFile + * @param inputClass + * @param tmpFile + * @param annotations + * @return {@code true} if the class file was modified + * @throws BuildException + */ + private boolean addAnnotation(File classFile, InputStream inputClass, File tmpFile, String annotations) + throws BuildException { + boolean classIsModified = false; + FileOutputStream outputClass = null; + + ClassWriter cw = new ClassWriter(false); + try { + ClassReader cr = new ClassReader(inputClass); + + List<String> annotationTypeDescs = new ArrayList<String>(2); + if (annotations.contains("SharedStatics")) { + annotationTypeDescs.add(SHAREDSTATICS_TYPE_DESC); + } + if (annotations.contains("MagicPermission")) { + annotationTypeDescs.add(MAGICPERMISSION_TYPE_DESC); + } + + MarkerClassVisitor mcv = new MarkerClassVisitor(cw, annotationTypeDescs); + cr.accept(mcv, Attributes.getDefaultAttributes(), true); + + if (mcv.classIsModified()) { + System.out.println("adding annotations " + annotations + " to file " + classFile.getName()); + classIsModified = true; + + outputClass = new FileOutputStream(tmpFile); + + byte[] b = cw.toByteArray(); + outputClass.write(b); + } + } catch (Exception ex) { + ex.printStackTrace(); + throw new BuildException("Unable to add annotations to file " + classFile.getName(), ex); + } finally { + if (outputClass != null) { + try { + outputClass.close(); + } catch (IOException e) { + System.err.println("Can't close stream for file " + classFile.getName()); + } + + long timestamp = classFile.lastModified(); + tmpFile.setLastModified(timestamp); + } + } + + return classIsModified; + } + + /** + * Visitor for a class file that actually do the job of adding annotations in the class. + * + * @author fabien + */ + private static class MarkerClassVisitor extends ClassAdapter { + private final List<String> annotationTypeDescs; + + private boolean classIsModified = false; + + public MarkerClassVisitor(ClassVisitor cv, List<String> annotationTypeDescs) { + super(cv); + + this.annotationTypeDescs = annotationTypeDescs; + } + + @Override + public void visit(int version, int access, String name, + String superName, String[] interfaces, String sourceFile) { + super.visit(org.objectweb.asm.Constants.V1_5, access, + name, superName, interfaces, sourceFile); + } + + @Override + public void visitAttribute(Attribute attr) { + if (attr instanceof RuntimeVisibleAnnotations) { + RuntimeVisibleAnnotations rva = (RuntimeVisibleAnnotations) attr; + for (Object annotation : rva.annotations) { + if (annotation instanceof Annotation) { + Annotation ann = (Annotation) annotation; + for (String annTypeDesc : annotationTypeDescs) { + if (ann.type.equals(annTypeDesc)) { + // we have found one of the annotations -> we won't need to add it again ! + annotationTypeDescs.remove(annTypeDesc); + break; + } + } + } + } + } + + super.visitAttribute(attr); + } + + @SuppressWarnings("unchecked") + public void visitEnd() { + if (!annotationTypeDescs.isEmpty()) { + // we have not found the annotation -> we will add it and so modify the class + classIsModified = true; + RuntimeVisibleAnnotations attr = new RuntimeVisibleAnnotations(); + + for (String annTypeDesc : annotationTypeDescs) { + + Annotation ann = new Annotation(annTypeDesc); + ann.add("name", ""); + + attr.annotations.add(ann); + } + + cv.visitAttribute(attr); + } + + super.visitEnd(); + } + + public boolean classIsModified() { + return classIsModified; + } + } +} Modified: branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Asm.java =================================================================== --- branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,7 +27,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -37,8 +35,8 @@ import org.apache.tools.ant.taskdefs.condition.Os; /** - * Description of the Class - * + * Description of the Class. + * * @author epr * @version $Revision$ */ @@ -56,7 +54,7 @@ /** * Returns the dir. - * + * * @return File */ public File getDir() { @@ -65,9 +63,8 @@ /** * Sets the dir. - * - * @param dir - * The dir to set + * + * @param dir The dir to set */ public void setDir(File dir) { this.dir = dir; @@ -97,12 +94,12 @@ private File srcdir; private boolean enableJNasm; - + private String version; - + /** - * Add an includedir - * + * Add an includedir. + * * @param dir */ public void addConfiguredIncludeDir(IncludeDir dir) { @@ -110,17 +107,15 @@ } /** - * Description of the Method - * + * Description of the Method. + * * @param srcFile * @param dstFile - * @throws BuildException - * Description of Exception - * @throws IOException - * Description of the Exception + * @throws BuildException Description of Exception + * @throws IOException Description of the Exception */ private void doNasm(File srcFile, File dstFile) throws BuildException, - IOException { + IOException { Execute exec = new Execute(); ArrayList<String> cmdLine = new ArrayList<String>(); @@ -136,16 +131,16 @@ cmdLine.add(dstFile.toString()); if (bits == 64) { - cmdLine.add("-m"); - cmdLine.add("amd64"); + cmdLine.add("-m"); + cmdLine.add("amd64"); // Set preprocessor cmdLine.add("-r"); cmdLine.add("nasm"); } - - cmdLine.add("-D"); - cmdLine.add("BITS" + bits); - + + cmdLine.add("-D"); + cmdLine.add("BITS" + bits); + if (version != null) { cmdLine.add("-D"); cmdLine.add("JNODE_VERSION='" + version + "'"); @@ -171,7 +166,7 @@ log("cmdLine=" + cmdLine, Project.MSG_VERBOSE); exec.setCommandline(cmdLine.toArray(new String[cmdLine - .size()])); + .size()])); dstFile.getParentFile().mkdirs(); int rc = exec.execute(); @@ -179,32 +174,31 @@ if (rc != 0) { destdir.delete(); throw new BuildException("Asm failed on " - + srcFile.getAbsolutePath()); + + srcFile.getAbsolutePath()); } } /** - * Description of the Method - * - * @throws BuildException - * Description of Exception + * Description of the Method. + * + * @throws BuildException Description of Exception */ public void execute() throws BuildException { if (srcdir == null) { throw new BuildException("Error: srcdir attribute must be set!", - getLocation()); + getLocation()); } else if (!srcdir.isDirectory()) { throw new BuildException("Error: srcdir directory is not valid!", - getLocation()); + getLocation()); } if (destdir == null) { throw new BuildException("Error: destdir attribute must be set!", - getLocation()); + getLocation()); } else if (!destdir.isDirectory()) { throw new BuildException("Error: destdir directory is not valid!", - getLocation()); + getLocation()); } try { @@ -217,12 +211,10 @@ } /** - * Description of the Method - * - * @throws BuildException - * Description of Exception - * @throws IOException - * Description of the Exception + * Description of the Method. + * + * @throws BuildException Description of Exception + * @throws IOException Description of the Exception */ protected void executeAsm() throws BuildException, IOException { @@ -233,7 +225,7 @@ if (compileMap.size() > 0) { log("Compiling " + compileMap.size() + " source files to " - + destdir); + + destdir); for (File srcFile : compileMap.keySet()) { File dstFile = compileMap.get(srcFile); @@ -244,7 +236,7 @@ /** * Gets the number of bits of the target platform. - * + * * @return 32/64 */ public final int getBits() { @@ -253,7 +245,7 @@ /** * Returns the destdir. - * + * * @return File */ public File getDestdir() { @@ -262,7 +254,7 @@ /** * Returns the ext. - * + * * @return String */ public String getExtension() { @@ -271,7 +263,7 @@ /** * Returns the listFile. - * + * * @return File */ public File getListFile() { @@ -280,7 +272,7 @@ /** * Returns the outputFormat. - * + * * @return String */ public String getOutputFormat() { @@ -289,7 +281,7 @@ /** * Returns the srcdir. - * + * * @return File */ public File getSrcdir() { @@ -299,19 +291,15 @@ /** * Scans the directory looking for source files to be compiled. The results * are returned in the class variable compileList - * - * @param srcDir - * Description of Parameter - * @param destDir - * Description of Parameter - * @param files - * Description of Parameter + * + * @param srcDir Description of Parameter + * @param destDir Description of Parameter + * @param files Description of Parameter * @param compileMap - * @throws IOException - * Description of the Exception + * @throws IOException Description of the Exception */ protected void scanDir(File srcDir, File destDir, String[] files, - Map<File, File> compileMap) throws IOException { + Map<File, File> compileMap) throws IOException { long now = System.currentTimeMillis(); for (int c = 0; c < files.length; c++) { @@ -323,33 +311,33 @@ int diff = fileDirString.compareTo(rootDirString); String destSubDir = fileDirString.substring( - fileDirString.length() - diff, fileDirString.length()) - .replace('\\', '/'); + fileDirString.length() - diff, fileDirString.length()) + .replace('\\', '/'); // log(destSubDir); File fileDir = new File(destDir.toString() + destSubDir); String objName = aFile.getName().substring(0, - aFile.getName().indexOf(".asm")) - + "." + ext; + aFile.getName().indexOf(".asm")) + + "." + ext; File objFile = new File(fileDir, objName); // check if the file has been modified in the future, error? if (aFile.lastModified() > now) { log("Warning: file modified in the future: " + aFile.getName(), - Project.MSG_WARN); + Project.MSG_WARN); } if (!objFile.exists() - || aFile.lastModified() > objFile.lastModified()) { + || aFile.lastModified() > objFile.lastModified()) { if (!objFile.exists()) { log("Compiling " + aFile.getPath() + " because class file " - + objFile.getPath() + " does not exist", - Project.MSG_VERBOSE); + + objFile.getPath() + " does not exist", + Project.MSG_VERBOSE); } else { log("Compiling " + aFile.getPath() - + " because it is out of date with respect to " - + objFile.getPath(), Project.MSG_VERBOSE); + + " because it is out of date with respect to " + + objFile.getPath(), Project.MSG_VERBOSE); } compileMap.put(aFile, objFile); @@ -360,9 +348,8 @@ /** * Sets the number of bits of the target platform. - * - * @param bits - * 32/64 + * + * @param bits 32/64 */ public final void setBits(int bits) { if ((bits != 32) && (bits != 64)) { @@ -372,10 +359,9 @@ } /** - * Sets the Destdir attribute of the JspC object - * - * @param destDir - * The new Destdir value + * Sets the Destdir attribute of the JspC object. + * + * @param destDir The new Destdir value */ public void setDestdir(File destDir) { this.destdir = destDir; @@ -383,9 +369,8 @@ /** * Sets the ext. - * - * @param ext - * The ext to set + * + * @param ext The ext to set */ public void setExtension(String ext) { this.ext = ext; @@ -393,9 +378,8 @@ /** * Sets the listFile. - * - * @param listFile - * The listFile to set + * + * @param listFile The listFile to set */ public void setListFile(File listFile) { this.listFile = listFile; @@ -403,9 +387,8 @@ /** * Sets the outputFormat. - * - * @param outputFormat - * The outputFormat to set + * + * @param outputFormat The outputFormat to set */ public void setOutputFormat(String outputFormat) { this.outputFormat = outputFormat; @@ -413,9 +396,8 @@ /** * Sets the srcdir. - * - * @param srcdir - * The srcdir to set + * + * @param srcdir The srcdir to set */ public void setSrcdir(File srcdir) { this.srcdir = srcdir; Copied: branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java (from rev 5663, trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java) =================================================================== --- branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java (rev 0) +++ branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java 2009-09-09 15:19:21 UTC (rev 5666) @@ -0,0 +1,96 @@ +/* + * $Id$ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jnode.ant.taskdefs; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.FileSet; + +/** + * Abstract class for ant task that process one or more FileSet + * The concrete classes only have to implement the <i>process</i> method + * for doing the concrete work on a file. + * + * @author Fabien DUMINY (fduminy at jnode.org) + */ +public abstract class FileSetTask extends Task { + protected boolean trace = false; + protected boolean failOnError = true; + + private final ArrayList<FileSet> fileSets = new ArrayList<FileSet>(); + + public final void setTrace(boolean trace) { + this.trace = trace; + } + + public final void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } + + public void addFileSet(FileSet fs) { + fileSets.add(fs); + } + + public final void execute() throws BuildException { + try { + doExecute(); + } catch (BuildException be) { + if (failOnError) { + throw be; + } else { + be.printStackTrace(); + } + } catch (Throwable t) { + if (failOnError) { + throw new BuildException(t); + } else { + t.printStackTrace(); + } + } + } + + protected void doExecute() throws BuildException { + // default implementation : simply iterate on all files + processFiles(); + } + + protected final void processFiles() throws BuildException { + final Project project = getProject(); + try { + for (FileSet fs : fileSets) { + final String[] files = fs.getDirectoryScanner(project) + .getIncludedFiles(); + final File projectDir = fs.getDir(project); + for (String fname : files) { + processFile(new File(projectDir, fname)); + } + } + } catch (IOException e) { + throw new BuildException(e); + } + } + + protected abstract void processFile(File file) throws IOException; +} Modified: branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java =================================================================== --- branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2009-09-09 15:13:41 UTC (rev 5665) +++ branches/jikesRVM/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2009-09-09 15:19:21 UTC (rev 5666) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,143 +27,127 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; - import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.FileSet; /** * @author Ewout Prangsma (ep...@us...) */ -public class HeaderTask extends Task { +public class HeaderTask extends FileSetTask { - private final ArrayList<FileSet> fileSets = new ArrayList<FileSet>(); + private File headerFile; + private String[] header; - private File headerFile; - - private boolean update = false; - public void addFileSet(FileSet fs) { - fileSets.add(fs); - } - - private boolean compareHeader(String[] lines, String[] header) { - final int linesCnt = lines.length; - final int hdrCnt = header.length; - - for (int i = 0; i < linesCnt; i++) { - final String line = lines[i]; - if (i < hdrCnt) { - if (!compareLine(line, header[i])) { - return false; - } - } else { - String trimmedLine = line.trim(); - if (trimmedLine.startsWith("package")) { - return true; - } - if (trimmedLine.length() > 0) { - return false; - } - } - } - - return false; - } - - private boolean compareLine(String line, String hdrLine) { - if ((line.indexOf('$') >= 0) && (hdrLine.indexOf('$') >= 0)) { - return true; - } - return line.trim().equals(hdrLine.trim()); - } + private boolean update = false; - public void execute() throws BuildException { - if (headerFile == null) { - throw new BuildException("HeaderFile must be set"); - } - try { - final String[] header = readFile(headerFile); + private boolean compareHeader(String[] lines, String[] header) { + final int linesCnt = lines.length; + final int hdrCnt = header.length; - for (FileSet fs : fileSets) { - final String[] files = fs.getDirectoryScanner(getProject()) - .getIncludedFiles(); - final int fileCount = files.length; - for (int j = 0; j < fileCount; j++) { - final String fname = files[j]; - processFile(new File(fs.getDir(getProject()), fname), header); - } + for (int i = 0; i < linesCnt; i++) { + final String line = lines[i]; + if (i < hdrCnt) { + if (!compareLine(line, header[i])) { + return false; + } + } else { + String trimmedLine = line.trim(); + if (trimmedLine.startsWith("package")) { + ... [truncated message content] |
From: <cr...@us...> - 2009-09-09 15:13:51
|
Revision: 5665 http://jnode.svn.sourceforge.net/jnode/?rev=5665&view=rev Author: crawley Date: 2009-09-09 15:13:41 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (all tree) Modified Paths: -------------- branches/jikesRVM/all/.classpath branches/jikesRVM/all/.project branches/jikesRVM/all/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/all/all.iml branches/jikesRVM/all/build-x86.xml branches/jikesRVM/all/build.xml branches/jikesRVM/all/conf/default-plugin-list.xml branches/jikesRVM/all/conf/full-plugin-list.xml branches/jikesRVM/all/conf/system-plugin-list.xml branches/jikesRVM/all/conf/tests-plugin-list.xml branches/jikesRVM/all/conf/x86/menu-cdrom.lst branches/jikesRVM/all/conf/x86/menu.lst branches/jikesRVM/all/lib/jnode.xml branches/jikesRVM/all/template/header.txt Added Paths: ----------- branches/jikesRVM/all/conf/gui-plugin-list_disabled.xml branches/jikesRVM/all/conf/install-plugin-list_disabled.xml branches/jikesRVM/all/conf/openjdk-annotations.properties branches/jikesRVM/all/conf/shell-plugin-list.xml branches/jikesRVM/all/conf-source/ branches/jikesRVM/all/conf-source/jnode.properties.defaults branches/jikesRVM/all/conf-source/jnode.properties.template branches/jikesRVM/all/conf-source/script.xml branches/jikesRVM/all/jnode_checks.xml branches/jikesRVM/all/lib/ftp.properties branches/jikesRVM/all/lib/x86/eltorito.s2 branches/jikesRVM/all/lib/x86/fat.s15 branches/jikesRVM/all/lib/x86/grub.s1 branches/jikesRVM/all/lib/x86/grub.s2 branches/jikesRVM/all/lib/x86/pxegrub-via_rhine branches/jikesRVM/all/new_checks.xml Removed Paths: ------------- branches/jikesRVM/all/conf/gui-plugin-list.xml branches/jikesRVM/all/conf/install-plugin-list.xml branches/jikesRVM/all/conf-source/jnode.properties.defaults branches/jikesRVM/all/conf-source/jnode.properties.template branches/jikesRVM/all/conf-source/script.xml branches/jikesRVM/all/lib/x86/stage2_eltorito Property Changed: ---------------- branches/jikesRVM/all/ branches/jikesRVM/all/lib/ Property changes on: branches/jikesRVM/all ___________________________________________________________________ Modified: svn:ignore - build + build save Added: svn:mergeinfo + /trunk/all:2906-5663 Modified: branches/jikesRVM/all/.classpath =================================================================== --- branches/jikesRVM/all/.classpath 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/.classpath 2009-09-09 15:13:41 UTC (rev 5665) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="/JNode-Builder"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="src" path="/JNode-FS"/> - <classpathentry kind="src" path="/JNode-GUI"/> - <classpathentry kind="src" path="/JNode-Net"/> - <classpathentry kind="src" path="/JNode-Shell"/> + <classpathentry kind="src" path="/builder"/> + <classpathentry kind="src" path="/core"/> + <classpathentry kind="src" path="/fs"/> + <classpathentry kind="src" path="/gui"/> + <classpathentry kind="src" path="/net"/> + <classpathentry kind="src" path="/shell"/> <classpathentry kind="output" path="build"/> </classpath> Modified: branches/jikesRVM/all/.project =================================================================== --- branches/jikesRVM/all/.project 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/.project 2009-09-09 15:13:41 UTC (rev 5665) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-All</name> + <name>all</name> <comment></comment> <projects> <project>JNode-Builder</project> Modified: branches/jikesRVM/all/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/all/.settings/org.eclipse.jdt.core.prefs 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:13:41 UTC (rev 5665) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:07:44 CEST 2005 +#Mon Jul 14 11:35:05 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/all/all.iml =================================================================== --- branches/jikesRVM/all/all.iml 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/all.iml 2009-09-09 15:13:41 UTC (rev 5665) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/classes" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntryProperties /> </component> </module> Modified: branches/jikesRVM/all/build-x86.xml =================================================================== --- branches/jikesRVM/all/build-x86.xml 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/build-x86.xml 2009-09-09 15:13:41 UTC (rev 5665) @@ -10,7 +10,7 @@ <property name="jnode.disk.pln" value="${my-build.dir}/jnodedisk${jnode.bits}.pln" /> <property name="jnode.disk.geometry" value="64/16/63" /> - <property name="jnode.virtual.memsize" value="768" /> + <property name="jnode.virtual.memsize" value="512" /> <property name="logFile" value="${build.dir}/debugger.txt" /> <property name="grub-ver" value="grub-0.97-i386-pc" /> @@ -78,6 +78,21 @@ <property name="build.native.dir" value="${my-build.dir}/${jnode.bits}bits/native" /> <property name="build.bootimage.dir" value="${my-build.dir}/${jnode.bits}bits/bootimage" /> + <condition property="vmware.vmx.overrides" value=""> + <and> + <not> + <isset property="vmware.vmx.overrides"/> + </not> + </and> + </condition> + <condition property="vmware.vmx.vmdk.image" + value="${jnode.virtual.disk.dir}/${jnode.virtual.disk}" else=""> + <and> + <equals arg1="${jnode.virtualization.platform}" arg2="vmware" casesensitive="false"/> + <isset property="jnode.virtual.disk.dir"/> + <isset property="jnode.virtual.disk"/> + </and> + </condition> </target> <!-- Initialize all project directories --> @@ -115,7 +130,8 @@ <taskdef name="genconst" classname="org.jnode.build.x86.AsmConstBuilder" classpathref="cp-x86" /> <taskdef name="asm" classname="org.jnode.ant.taskdefs.Asm" classpathref="cp-x86" /> - <genconst destfile="${build.native.dir}/src/java.inc" bits="${jnode.bits}" classesURL="file:///${jnode-core.jar}/"> + <genconst destfile="${build.native.dir}/src/java.inc" bits="${jnode.bits}" + classesURL="file:///${jnode-core.jar}/,jar:file:///${classlib.jar}!/,file:///${root.dir}/builder/build/classes/"> <class classname="java.lang.Throwable" /> <class classname="org.jnode.build.x86.BootImageBuilder" static="on" /> <class classname="org.jnode.vm.SoftByteCodes" static="on" /> @@ -255,12 +271,41 @@ <copy todir="@{dir}"> <fileset dir="${initjars.dir}" /> </copy> - <copy file="${my-lib.dir}/stage2_eltorito" todir="@{dir}/boot/grub" /> - <copy file="${grub.menu.cdrom}" tofile="@{dir}/boot/grub/menu.lst" /> - <exec executable="mkisofs"> - <arg line="-o @{destfile} -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" /> - </exec> - </sequential> + <copy file="${my-lib.dir}/eltorito.s2" todir="@{dir}/boot/grub" /> + <copy file="${my-lib.dir}/fat.s15" todir="@{dir}/boot/grub" /> + <copy file="${my-lib.dir}/grub.s1" todir="@{dir}/boot/grub" /> + <copy file="${my-lib.dir}/grub.s2" todir="@{dir}/boot/grub" /> + <copy file="${grub.menu.cdrom}" tofile="@{dir}/boot/grub/menu.lst" /> + <if> + <equals arg1="${jnode.enable.mkisofs}" arg2="true" /> + <then> + <!-- Fail on a Windows platform if there are spaces in the root dir's pathname. It will + lead to mkisofs dying with a misleading error message. bluebit / crawley 2008-05-03 --> + <fail message="Cannot build JNode from a directory with spaces in the pathname."> + <condition> + <and> + <contains string="${os.name}" substring="windows" casesensitive="false" /> + <contains string="${root.dir}" substring=" " casesensitive="false" /> + </and> + </condition> + </fail> + <exec executable="mkisofs"> + <arg line="-o @{destfile} -R -b boot/grub/eltorito.s2 -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" /> + </exec> + </then> + <else> + <taskdef name="jiic-iso" classname="de.tu_darmstadt.informatik.rbg.hatlak.iso9660.ISOTask" classpathref="cp-x86" /> + <jiic-iso basedir="@{dir}" + destfile="@{destfile}" + enableRockRidge="true" + mkisofsCompatibility="true" + bootImage="@{dir}/boot/grub/eltorito.s2" + bootImageSectorCount="4" + genBootInfoTable="true" + /> + </else> + </if> + </sequential> </macrodef> <!-- Create a full distributable bootable CDROM image --> @@ -270,9 +315,12 @@ <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" /> <vmware - isofile="${jnode-x86.iso}" + isoFile="${jnode-x86.iso}" logFile="${logFile}" - memsize="${jnode.virtual.memsize}" + memSize="${jnode.virtual.memsize}" + saveDir="${save.dir}" + vmdkImageFile="${vmware.vmx.vmdk.image}" + overrideFile="${vmware.vmx.overrides}" /> </target> @@ -281,11 +329,13 @@ <create-cdrom destfile="${jnode-x86-lite.iso}" dir="${my-build.dir}/cdrom-lite" /> <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" /> - <vmware - isofile="${jnode-x86-lite.iso}" + isoFile="${jnode-x86-lite.iso}" logFile="${logFile}" - memsize="${jnode.virtual.memsize}" + memSize="${jnode.virtual.memsize}" + saveDir="${save.dir}" + vmdkImageFile="${vmware.vmx.vmdk.image}" + overrideFile="${vmware.vmx.overrides}" /> </target> @@ -293,11 +343,13 @@ <create-cdrom destfile="${jnode-x86_64-lite.iso}" dir="${my-build.dir}/cdrom-lite" /> <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" /> - <vmware - isofile="${jnode-x86_64-lite.iso}" + isoFile="${jnode-x86_64-lite.iso}" logFile="${logFile}" - memsize="${jnode.virtual.memsize}" + memSize="${jnode.virtual.memsize}" + saveDir="${save.dir}" + vmdkImageFile="${vmware.vmx.vmdk.image}" + overrideFile="${vmware.vmx.overrides}" /> </target> Modified: branches/jikesRVM/all/build.xml =================================================================== --- branches/jikesRVM/all/build.xml 2009-09-06 14:00:37 UTC (rev 5664) +++ branches/jikesRVM/all/build.xml 2009-09-09 15:13:41 UTC (rev 5665) @@ -1,26 +1,37 @@ <project name="JNode" default="help" basedir="."> + <property name="root.dir" value="${basedir}/.."/> + + <!-- if task is used from this --> + <taskdef resource="net/sf/antcontrib/antcontrib.properties"/> + <!-- before including jnode.xml, we must set this property --> + <condition property="memoryMaximumSize" value="1512m" else="768m"> + <os arch="amd64"/> + </condition> + <echo message="Setting memoryMaximumSize to ${memoryMaximumSize}"/> + <!-- Include antlib --> - <typedef file="${basedir}/lib/jnode.xml"/> + <typedef file="${root.dir}/all/lib/jnode.xml"/> <!-- JNode version --> - <property name="jnode-ver" value="0.2.5-dev"/> + <property name="jnode-ver" value="0.2.9-dev"/> <!-- Java target and source version --> - <property name="java.target" value="1.5"/> - <property name="java.source" value="1.5"/> + <property name="java.target" value="1.6"/> + <property name="java.source" value="1.6"/> <property name="java.encoding" value="US-ASCII"/> - <property name="root.dir" value="${basedir}/.."/> <property name="build.dir" value="${basedir}/build"/> <property name="reports.dir" value="${build.dir}/reports"/> <property name="cdroms.dir" value="${build.dir}/cdroms"/> <property name="descriptors.dir" value="${build.dir}/descriptors"/> <property name="plugins.dir" value="${build.dir}/plugins"/> <property name="initjars.dir" value="${build.dir}/initjars"/> + <property name="save.dir" value="${basedir}/save"/> <property name="backup.dir" value="${build.dir}/backup"/> <property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/> + <property name="jnode-configure.jar" value="${build.dir}/descriptors/jnode-configure.jar"/> <property name="jnode-core.jar" value="${root.dir}/core/build/classes"/> <property name="jscience.jar" value="${root.dir}/core/lib"/> <property name="scimark2.jar" value="${root.dir}/core/lib"/> @@ -31,41 +42,55 @@ <property name="jnode-textui.jar" value="${root.dir}/textui/build/classes"/> <property name="jnode-net.jar" value="${root.dir}/net/build/classes"/> <property name="jnode-shell.jar" value="${root.dir}/shell/build/classes"/> + <property name="jnode-cli.jar" value="${root.dir}/cli/build/classes"/> <property name="jnode-fonts.jar" value="${build.dir}/descriptors/jnode-fonts.jar"/> - <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/> + <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/> - <property name="jnode-mmtk-genrc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.genrc"/> + <property name="jnode-mmtk-genrc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.genrc"/> <property name="jnode-mmtk-ms.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.ms"/> <property name="jnode-mmtk-nogc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.nogc"/> - <property name="mx4j.jar" value="${root.dir}/core/lib/mx4j.jar"/> - <property name="mx4j-remote.jar" value="${root.dir}/core/lib/mx4j-remote.jar"/> - + <property name="classlib.jar" value="${root.dir}/all/lib/classlib.jar"/> + <property name="classlib-src.jar" value="${root.dir}/all/lib/classlib-src.jar"/> <property name="ant.jar" value="${root.dir}/core/lib/ant.jar"/> <property name="ant-launcher.jar" value="${root.dir}/core/lib/ant-launcher.jar"/> <property name="commons-net.jar" value="${root.dir}/core/lib/commons-net-1.1.0.jar"/> - <property name="dnsjava.jar" value="${root.dir}/net/lib/dnsjava-2.0.1a.jar"/> + <property name="dnsjava.jar" value="${root.dir}/net/lib/dnsjava-1.6.6.jar"/> <property name="jsch.jar" value="${root.dir}/net/lib/jsch-0.1.24.jar"/> - <property name="junit.jar" value="${root.dir}/core/lib/junit.jar"/> + <property name="junit.jar" value="${root.dir}/core/lib/junit-4.5.jar"/> <property name="mmtk.jar" value="${root.dir}/core/lib/mmtk/mmtk.jar"/> <property name="mauve.jar" value="${root.dir}/core/lib/mauve.jar"/> <property name="edtftpj.jar" value="${root.dir}/fs/lib/edtftpj-1.5.2.jar"/> <property name="jcifs.jar" value="${root.dir}/fs/lib/jcifs-1.2.6.jar"/> <property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.jar"/> + <property name="oncrpc.jar" value="${root.dir}/net/lib/oncrpc.jar"/> + <property name="telnetd.jar" value="${root.dir}/distr/lib/telnetd.jar" /> + <property name="commons-logging.jar" value="${root.dir}/distr/lib/commons-logging.jar" /> + <property name="jawk.jar" value="${root.dir}/distr/lib/jawk-1.02.jar"/> + <property name="jetty.jar" value="${root.dir}/distr/lib/jetty-6.1.5.jar" /> + <property name="jetty-util.jar" value="${root.dir}/distr/lib/jetty-util-6.1.5.jar" /> + <property name="jsp.jar" value="${root.dir}/distr/lib/jsp-2.1.jar" /> + <property name="jsp-api.jar" value="${root.dir}/distr/lib/jsp-api-2.1.jar" /> + <property name="servlet.jar" value="${root.dir}/distr/lib/servlet-api-2.5-6.1.5.jar" /> + <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" /> + <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" /> + <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" /> + <property name="nanoxml-java.jar" value="${root.dir}/shell/lib/nanoxml-2.2.3.jar" /> + <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" /> + <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" /> + <!-- libraries needed to run tests --> <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/> <property name="jmock.jar" value="${root.dir}/core/lib/jmock-1.0.1.jar"/> <property name="cglib.jar" value="${root.dir}/core/lib/cglib-2.1.jar"/> - <property name="asm.jar" value="${root.dir}/core/lib/asm.jar"/> - <property name="jcfe.jar" value="${root.dir}/core/lib/jcfe.jar"/> - <property name="jfunc.jar" value="${root.dir}/core/lib/jfunc.jar"/> + <property name="asm.jar" value="${root.dir}/core/lib/asm-1.5.3.jar"/> + <property name="asm-attrs.jar" value="${root.dir}/core/lib/asm-attrs-1.5.3.jar"/> + <property name="asm-util.jar" value="${root.dir}/core/lib/asm-util-1.5.3.jar"/> <property name="log4j.jar" value="${root.dir}/core/lib/log4j-1.2.8.jar"/> - <property name="gnu-crypto.jar" value="${root.dir}/core/lib/gnu-crypto.jar"/> - <property name="javax-crypto.jar" value="${root.dir}/core/lib/javax-crypto.jar"/> - <!-- property name="javax-security.jar" value="${root.dir}/core/lib/javax-security.jar" / --> - <property name="beanshell.jar" value="${root.dir}/shell/lib/bsh-2.0b1.jar"/> + <property name="beanshell.jar" value="${root.dir}/shell/lib/bsh-2.0b5.jar"/> + <property name="js.jar" value="${root.dir}/shell/lib/rhino1.6r5-jsr223.jar"/> <!-- libraries needed to check plugin dependencies --> <property name="bcel-5.1.jar" value="${root.dir}/builder/lib/bcel-5.1.jar" /> @@ -78,29 +103,41 @@ <property name="xmlParserAPIs.jar" value="${root.dir}/builder/pmd/lib/xmlParserAPIs-2.6.2.jar"/> <!-- lists of plugins to use while booting --> - <property name="default-plugin-list" value="${basedir}/conf/default-plugin-list.xml"/> - <property name="full-plugin-list" value="${basedir}/conf/full-plugin-list.xml"/> - <property name="install-plugin-list" value="${basedir}/conf/install-plugin-list.xml"/> - <property name="system-plugin-list" value="${basedir}/conf/system-plugin-list.xml"/> + <property name="default-plugin-list" value="${root.dir}/all/conf/default-plugin-list.xml"/> + <property name="full-plugin-list" value="${root.dir}/all/conf/full-plugin-list.xml"/> + <property name="install-plugin-list" value="${root.dir}/all/conf/install-plugin-list.xml"/> + <property name="system-plugin-list" value="${root.dir}/all/conf/system-plugin-list.xml"/> <property name="sources.dist.tar.gz" value="${build.dir}/jnodesources-${jnode-ver}.tar.gz"/> <property name="jnode-x86.iso" value="${cdroms.dir}/jnode-x86.iso"/> <property name="jnode-x86-lite.iso" value="${cdroms.dir}/jnode-x86-lite.iso"/> <property name="jnode-x86_64-lite.iso" value="${cdroms.dir}/jnode-x86_64-lite.iso"/> <path id="cp"> + <pathelement location="${classlib.jar}"/> + <pathelement location="${mmtk.jar}"/> <pathelement location="${ant.jar}"/> <pathelement location="${junit.jar}"/> <pathelement location="${jmock.jar}"/> <pathelement location="${jmock-cglib.jar}"/> <pathelement location="${asm.jar}"/> + <pathelement location="${asm-attrs.jar}"/> + <pathelement location="${asm-util.jar}"/> <pathelement location="${cglib.jar}"/> <pathelement location="${log4j.jar}"/> - <pathelement location="${gnu-crypto.jar}"/> - <pathelement location="${javax-crypto.jar}"/> - <pathelement location="${basedir}/conf"/> + <pathelement location="${root.dir}/all/conf"/> <pathelement location="${beanshell.jar}"/> - <pathelement location="${jcfe.jar}"/> - <pathelement location="${jfunc.jar}"/> + <pathelement location="${js.jar}"/> + <pathelement location="${oncrpc.jar}"/> + <pathelement location="${edtftpj.jar}"/> + <pathelement location="${jcifs.jar}"/> + <pathelement location="${commons-net.jar}"/> + <pathelement location="${dnsjava.jar}"/> + <pathelement location="${mauve.jar}"/> + <pathelement location="${derby.jar}"/> + <pathelement location="${derbynet.jar}"/> + <pathelement location="${derbytools.jar}"/> + <pathelement location="${iso9660.jar}"/> + <pathelement location="${sabre.jar}"/> </path> <path id="cp-jnode"> @@ -111,13 +148,25 @@ <pathelement location="${jnode-shell.jar}"/> <pathelement location="${jnode-net.jar}"/> <pathelement location="${jnode-gui.jar}"/> + <pathelement location="${jnode-cli.jar}"/> <pathelement location="${thinlet.jar}"/> <pathelement location="${jnode-textui.jar}"/> <pathelement location="${bcel-5.1.jar}"/> - <pathelement location="${mx4j.jar}"/> - <pathelement location="${mx4j-remote.jar}"/> <path refid="cp"/> </path> + + <path id="cp-test"> + <pathelement location="${root.dir}/core/build/classes"/> + <pathelement location="${root.dir}/distr/build/classes"/> + <pathelement location="${root.dir}/fs/build/classes"/> + <pathelement location="${root.dir}/shell/build/classes"/> + <pathelement location="${root.dir}/net/build/classes"/> + <pathelement location="${root.dir}/gui/build/classes"/> + <pathelement location="${root.dir}/cli/build/classes"/> + <pathelement location="${root.dir}/textui/build/classes"/> + <pathelement location="${root.dir}/shell/lib/nanoxml-2.2.3.jar"/> + <path refid="cp"/> + </path> <filterset id="descriptors-filter"> @@ -133,6 +182,25 @@ </patternset> <target name="prepare"> + <!-- Fail on a Windows platform if there are spaces in the root dir's pathname. It will + lead to mkisofs dying with a misleading error message. bluebit / crawley 2008-05-03 --> + <fail message="Cannot build JNode from a directory with spaces in the pathname."> + <condition> + <and> + <os family="windows"/> + <contains string="${root.dir}" substring=" " casesensitive="false" /> + </and> + </condition> + </fail> + + <fail message="Java Runtime version 1.6 needed. Your version is: ${java.runtime.version}"> + <condition> + <not> + <contains string="${java.runtime.version}" substring="1.6" casesensitive="false"/> + </not> + </condition> + </fail> + <!-- Initialize all project directories --> <property file="${root.dir}/jnode.properties"/> <!-- Set overwritable properties --> @@ -144,30 +212,220 @@ <!-- Initialize timestamp --> <tstamp/> + + <property name="hotswap.class.tstamp.pattern" value="MM/dd/yyyy kk:mm:ss.SSS"/> + <tstamp> + <format property="hotswap.class.tstamp" pattern="${hotswap.class.tstamp.pattern}" /> + </tstamp> - <!-- Update default excludes --> + + <!-- Update default excludes --> <defaultexcludes add="**/_svn"/> <defaultexcludes add="**/_svn/**"/> <!-- Create basic build directories --> <mkdir dir="${build.dir}"/> <mkdir dir="${reports.dir}"/> + <mkdir dir="${save.dir}"/> <mkdir dir="${cdroms.dir}"/> <mkdir dir="${descriptors.dir}"/> <mkdir dir="${plugins.dir}"/> <mkdir dir="${initjars.dir}"/> + <property file="${root.dir}/all/lib/ftp.properties"/> + <!-- check for classlib update --> + <if> + <or> + <not> + <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib.pack.gz"/> + </not> + <not> + <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/> + </not> + </or> + <then> + <!-- check if classlib update should be done locally or from the FTP server --> + <if> + <isset property="jnode.local.classlib"/> + <then> + <fail message="classlib is out of date, run copy or quickdeploy in classlib project"> + <condition> + <or> + <not> + <uptodate srcfile="${root.dir}/all/lib/ftp.properties" + targetfile="${root.dir}/all/lib/classlib.jar"/> + </not> + <not> + <uptodate srcfile="${root.dir}/all/lib/ftp.properties" + targetfile="${root.dir}/all/lib/classlib-src.jar"/> + </not> + </or> + </condition> + </fail> + </then> + <else> + <!-- classlib update from the FTP server --> + <delete file="${root.dir}/all/lib/classlib.pack.gz"/> + <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/> + <get src="${classlib.url}/classlib.pack.gz" dest="${root.dir}/all/lib/classlib.pack.gz"/> + <get src="${classlib.url}/classlib-src.jar.bz2" dest="${root.dir}/all/lib/classlib-src.jar.bz2"/> + <!-- verify checksum for downloaded files --> + <if> + <not> + <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib.pack.gz" property="${classlib.md5}"/> + </not> + <then> + <delete file="${root.dir}/all/lib/classlib.pack.gz"/> + <fail message="checksum failed for classlib.pack.gz"/> + </then> + </if> + <if> + <not> + <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib-src.jar.bz2" property="${classlib-src.md5}"/> + </not> + <then> + <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/> + <fail message="checksum failed for classlib-src.jar.bz2"/> + </then> + </if> + </else> + </if> + </then> + </if> + <if> + <or> + <not> + <available file="${classlib.jar}" /> + </not> + <uptodate srcfile="${classlib.jar}" targetfile="${root.dir}/all/lib/classlib.pack.gz"/> + </or> + <then> + <delete file="${classlib.jar}"/> + <echo message="Creating ${classlib.jar}"/> + <exec executable="${java.home}/bin/unpack200"> + <arg file="${root.dir}/all/lib/classlib.pack.gz"/> + <arg file="${classlib.jar}"/> + </exec> + </then> + </if> + <if> + <or> + <not> + <available file="${classlib-src.jar}" /> + </not> + <uptodate srcfile="${classlib-src.jar}" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/> + </or> + <then> + <delete file="${classlib-src.jar}"/> + <echo message="Creating ${classlib-src.jar}"/> + <bunzip2 src="${root.dir}/all/lib/classlib-src.jar.bz2" dest="${classlib-src.jar}"/> + </then> + </if> + <property name="classlib.stamp" value="${root.dir}/all/build/classlib.stamp" /> </target> <!-- Call the assemble target of all subprojects --> <target name="assemble-projects" depends="prepare"> + <!-- pre compile tasks needed for compilation --> + <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" /> <jnode.antall target="assemble"/> </target> <!-- Assemble all plugins --> - <target name="assemble-plugins" depends="assemble-projects"> + <target name="assemble-plugins" depends="assemble-projects,openjdk-annotate"> <!-- Now assemble all plugins --> <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/> + <if> + <or> + <not> + <available file="${classlib.stamp}" /> + </not> + <uptodate srcfile="${classlib.stamp}" targetfile="${classlib.jar}"/> + </or> + <then> + <!-- Now assemble all plugins --> + <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}"> + <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/> + + <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/> + <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/> + <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/> + <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/> + <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/> + <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/> + <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/> + + <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/> + <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/> + <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/> + + <libalias name="mmtk.jar" alias="${mmtk.jar}"/> + + <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/> + <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/> + <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/> + <libalias name="log4j.jar" alias="${log4j.jar}"/> + <libalias name="beanshell.jar" alias="${beanshell.jar}"/> + <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/> + <libalias name="js.jar" alias="${js.jar}"/> + <libalias name="thinlet.jar" alias="${thinlet.jar}"/> + + <libalias name="junit.jar" alias="${junit.jar}"/> + <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/> + <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/> + <libalias name="asm.jar" alias="${asm.jar}"/> + <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/> + <libalias name="asm-util.jar" alias="${asm-util.jar}"/> + <libalias name="cglib.jar" alias="${cglib.jar}"/> + <libalias name="mauve.jar" alias="${mauve.jar}"/> + + <libalias name="ant.jar" alias="${ant.jar}"/> + <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/> + <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/> + <libalias name="jcifs.jar" alias="${jcifs.jar}"/> + <libalias name="ejc.jar" alias="${ejc.jar}"/> + <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/> + <libalias name="telnetd.jar" alias="${telnetd.jar}"/> + <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/> + <libalias name="jawk.jar" alias="${jawk.jar}"/> + <libalias name="jetty.jar" alias="${jetty.jar}"/> + <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/> + <libalias name="jsp.jar" alias="${jsp.jar}"/> + <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/> + <libalias name="servlet.jar" alias="${servlet.jar}"/> + <libalias name="derby.jar" alias="${derby.jar}"/> + <libalias name="derbynet.jar" alias="${derbynet.jar}"/> + <libalias name="derbytools.jar" alias="${derbytools.jar}"/> + <libalias name="classlib.jar" alias="${classlib.jar}"/> + + <descriptors dir="${descriptors.dir}/"> + <include name="org.classpath.core.xml"/> + <include name="org.classpath.ext.awt.xml"/> + <include name="org.classpath.ext.corba.xml"/> + <include name="org.classpath.ext.core.xml"/> + <include name="org.classpath.ext.imageio.xml"/> + <include name="org.classpath.ext.management.xml"/> + <include name="org.classpath.ext.print.xml"/> + <include name="org.classpath.ext.security.xml"/> + <include name="org.classpath.ext.sql.xml"/> + <include name="org.classpath.ext.xml"/> + <include name="org.classpath.ext.xml.ws.tools.xml"/> + <include name="org.classpath.ext.xml.ws.xml"/> + <include name="org.classpath.ext.xml.xml"/> + <include name="org.classpath.tools.xml"/> + <include name="com.sun.tools.javac.xml"/> + <include name="com.sun.tools.jdi.xml"/> + <include name="javax.ext.tools.xml"/> + <include name="sun.tools.xml"/> + </descriptors> + </plugin> + + <touch file="${classlib.stamp}"/> + </then> + </if> + <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}"> + <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/> + <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/> <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/> <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/> @@ -175,47 +433,74 @@ <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/> <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/> <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/> + <libalias name="jnode-cli.jar" alias="${jnode-cli.jar}"/> <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/> <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/> <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/> <libalias name="mmtk.jar" alias="${mmtk.jar}"/> - <libalias name="mx4j.jar" alias="${mx4j.jar}"/> - <libalias name="mx4j-remote.jar" alias="${mx4j-remote.jar}"/> <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/> - <libalias name="dnsjava-1.5.0.jar" alias="${dnsjava.jar}"/> + <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/> <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/> - <libalias name="gnu-crypto.jar" alias="${gnu-crypto.jar}"/> - <libalias name="javax-crypto.jar" alias="${javax-crypto.jar}"/> <libalias name="log4j.jar" alias="${log4j.jar}"/> <libalias name="beanshell.jar" alias="${beanshell.jar}"/> - <libalias name="lw.jar" alias="${lw.jar}"/> + <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/> + <libalias name="js.jar" alias="${js.jar}"/> <libalias name="thinlet.jar" alias="${thinlet.jar}"/> <libalias name="junit.jar" alias="${junit.jar}"/> <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/> <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/> <libalias name="asm.jar" alias="${asm.jar}"/> + <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/> + <libalias name="asm-util.jar" alias="${asm-util.jar}"/> <libalias name="cglib.jar" alias="${cglib.jar}"/> <libalias name="mauve.jar" alias="${mauve.jar}"/> - <libalias name="jcfe.jar" alias="${jcfe.jar}"/> - <libalias name="jfunc.jar" alias="${jfunc.jar}"/> <libalias name="ant.jar" alias="${ant.jar}"/> - <libalias name="ant-commons-net.jar" alias="${ant-commons-net.jar}"/> <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/> - <libalias name="ant-trax.jar" alias="${ant-trax.jar}"/> <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/> <libalias name="jcifs.jar" alias="${jcifs.jar}"/> <libalias name="ejc.jar" alias="${ejc.jar}"/> <libalias name="jscience.jar" alias="${jscience.jar}"/> <libalias name="scimark2.jar" alias="${scimark2.jar}"/> + <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/> + <libalias name="telnetd.jar" alias="${telnetd.jar}"/> + <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/> + <libalias name="jawk.jar" alias="${jawk.jar}"/> + <libalias name="jetty.jar" alias="${jetty.jar}"/> + <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/> + <libalias name="jsp.jar" alias="${jsp.jar}"/> + <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/> + <libalias name="servlet.jar" alias="${servlet.jar}"/> + <libalias name="derby.jar" alias="${derby.jar}"/> + <libalias name="derbynet.jar" alias="${derbynet.jar}"/> + <libalias name="derbytools.jar" alias="${derbytools.jar}"/> <descriptors dir="${descriptors.dir}/"> <include name="*.xml"/> <exclude name="*plugin-list.xml"/> + <exclude name="com.sun.tools.javac.xml"/> + <exclude name="com.sun.tools.jdi.xml"/> + <exclude name="javax.ext.tools.xml"/> + <exclude name="sun.tools.xml"/> + <exclude name="org.classpath.core.xml"/> + <exclude name="org.classpath.core.xml"/> + <exclude name="org.classpath.ext.awt.xml"/> + <exclude name="org.classpath.ext.corba.xml"/> + <exclude name="org.classpath.ext.core.xml"/> + <exclude name="org.classpath.ext.imageio.xml"/> + <exclude name="org.classpath.ext.management.xml"/> + <exclude name="org.classpath.ext.print.xml"/> + <exclude name="org.classpath.ext.security.xml"/> + <exclude name="org.classpath.ext.sql.xml"/> + <exclude name="org.classpath.ext.xml"/> + <exclude name="org.classpath.ext.xml.ws.tools.xml"/> + <exclude name="org.classpath.ext.xml.ws.xml"/> + <exclude name="org.classpath.ext.xml.xml"/> + <exclude name="org.classpath.tools.xml"/> </descriptors> </plugin> </target> @@ -226,8 +511,10 @@ <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> <initjars destdir="${initjars.dir}" pluginDir="${plugins.dir}" - systemPluginList="${basedir}/conf/system-plugin-list.xml"> - <fileset dir="${basedir}/conf"> + systemPluginList="${root.dir}/all/conf/system-plugin-list.xml"> + <insert userApplicationsDir="${user.applications.dir}"/> + + <fileset dir="${root.dir}/all/conf"> <exclude name="system-plugin-list.xml"/> <include name="*plugin-list.xml"/> </fileset> @@ -240,7 +527,7 @@ <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> <initjars destdir="${initjars.dir}" pluginDir="${plugins.dir}" - systemPluginList="${basedir}/conf/system-plugin-list.xml"> + systemPluginList="${root.dir}/all/conf/system-plugin-list.xml"> <fileset dir="${custom.plugin-list.dir}"> <include name="*plugin-list.xml"/> </fileset> @@ -252,7 +539,7 @@ </target> <!-- Give help on possible targets --> - <target name="help"> + <target name="help" description="help on the important targets"> <echo> Welcome to the JNode build system. @@ -272,11 +559,11 @@ 32-bit architecture. cd-x86_64-lite Build the JNode bootable CD-ROM for the X86 64-bit architecture. - +<!-- create-patch Create a patch file containing the differences between the local sources and the cvs HEAD branch. - +--> boot-files-winNT Build the JNode boot files for windows NT/2K/XP used together with NTLDR @@ -326,22 +613,26 @@ </target> <!-- Create a bootable CDROM image containing all x86 bootable images and the sources --> - <target name="cd-x86" depends="assemble"> + <target name="cd-x86" depends="assemble" description="create a bootable JNode CD image with sources included"> <tar destfile="${sources.dist.tar.gz}" compression="gzip" basedir="${root.dir}" excludes="*/build/**"/> <x86-build bits="32" target="java-image"/> - <x86-build bits="64" target="java-image"/> + <!-- TODO enable this when 64 bit support is working --> + <!--x86-build bits="64" target="java-image"/--> + <property name="jnode.bits" value="32" /> <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom"/> </target> <!-- Create a bootable CDROM image for x86 32-bits --> - <target name="cd-x86-lite" depends="assemble"> + <target name="cd-x86-lite" depends="assemble" description="create a bootable JNode CD image"> <x86-build bits="32" target="java-image"/> + <property name="jnode.bits" value="32" /> <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom-lite"/> </target> <!-- Create a bootable CDROM image for x86 64-bits --> <target name="cd-x86_64-lite" depends="assemble"> <x86-build bits="64" target="java-image"/> + <property name="jnode.bits" value="64" /> <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom_64-lite"/> </target> @@ -351,36 +642,59 @@ <mkdir dir="${upload.dir}"/> <gzip src="${jnode-x86.iso}" destfile="${upload.dir}/jnode-x86-${jnode-ver}.iso.gz"/> <copy todir="${upload.dir}" file="${sources.dist.tar.gz}"/> + <checksum algorithm="MD5" forceoverwrite="true"> + <fileset dir="${upload.dir}"> + <include name="jnode-x86-${jnode-ver}.iso.gz" /> + <include name="jnodesources-${jnode-ver}.tar.gz" /> + </fileset> + </checksum> + <echo message="FTP upload disabled. Uploadables are in: ${upload.dir}"/> + <!-- + TODO find a way to automatically upload the files + jsch based scp with sftp fails with an error to sourceforge + FTP uploads are abandone by sourceforge <ftp server="upload.sourceforge.net" remotedir="incoming" passive="yes" newer="yes" verbose="yes" userid="anonymous" password="${user.name}@users.sourceforge.net"> <fileset dir="${upload.dir}"/> </ftp> + --> </target> + + <!-- Save virtualization etc state across 'clean' --> + <target name="save"> + <copy file="${cdroms.dir}/JNode.nvram" todir="${save.dir}" failonerror="no"/> + </target> <!-- Clean everything files --> - <target name="clean"> + <target name="clean" depends="save" description="clean the complete build output"> <jnode.antall target="clean"/> <delete dir="${build.dir}" quiet="on"/> </target> + + <path id="cp-javadoc"> + <path refid="cp"/> + <pathelement location="${bcel-5.1.jar}"/> + <pathelement location="${nanoxml-java.jar}"/> + </path> <!-- Generate only the basic api javadoc files --> - <target name="javadoc-small"> + <target name="javadoc-small" description="generate documentation of the basic JNode APIs"> <jnode.javadoc destdir="${build.dir}/javadoc/small"> <sourcepath> - <pathelement location="${root.dir}/core/src/classpath/gnu"/> - <pathelement location="${root.dir}/core/src/classpath/java"/> - <pathelement location="${root.dir}/core/src/classpath/javax"/> - <pathelement location="${root.dir}/core/src/classpath/org"/> - <pathelement location="${root.dir}/core/src/classpath/5.0"/> + <pathelement location="${root.dir}/core/src/classlib"/> <pathelement location="${root.dir}/core/src/classpath/ext"/> <pathelement location="${root.dir}/core/src/classpath/vm"/> + <pathelement location="${root.dir}/core/src/openjdk/vm"/> + <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/> <pathelement location="${root.dir}/core/src/core"/> + <pathelement location="${root.dir}/core/src/vmmagic"/> <pathelement location="${root.dir}/core/src/driver"/> + <pathelement location="${root.dir}/all/lib/classlib-src.jar"/> </sourcepath> <package name="org.jnode.driver"/> <package name="org.jnode.naming"/> <package name="org.jnode.plugin"/> <package name="org.jnode.system"/> - <bootclasspath refid="cp"/> + <bootclasspath refid="cp-javadoc"/> </jnode.javadoc> </target> @@ -388,30 +702,39 @@ <target name="javadoc-mmtk"> <jnode.javadoc destdir="${build.dir}/javadoc/mmtk"> <sourcepath> + <pathelement location="${root.dir}/core/src/classlib"/> <pathelement location="${root.dir}/core/src/vmmagic"/> <pathelement location="${root.dir}/core/src/mmtk-vm"/> + <pathelement location="${root.dir}/core/src/core"/> + <pathelement location="${root.dir}/core/src/classpath/ext"/> + <pathelement location="${root.dir}/core/src/classpath/vm"/> + <pathelement location="${root.dir}/core/src/openjdk/vm"/> + <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/> + <pathelement location="${root.dir}/all/lib/classlib-src.jar"/> </sourcepath> <package name="org.mmtk.*"/> <package name="org.jnode.vm.memmgr.mmtk.*"/> <package name="org.vmmagic.*"/> - <classpath refid="cp"/> + <classpath refid="cp-javadoc"/> </jnode.javadoc> </target> <!-- Generate all javadoc files --> - <target name="javadoc"> + <target name="javadoc" description="generate documentation of all java source files"> <jnode.javadoc destdir="${build.dir}/javadoc/full"> <sourcepath> - <pathelement location="${root.dir}/core/src/classpath/gnu"/> - <pathelement location="${root.dir}/core/src/classpath/java"/> - <pathelement location="${root.dir}/core/src/classpath/javax"/> - <pathelement location="${root.dir}/core/src/classpath/org"/> - <pathelement location="${root.dir}/core/src/classpath/5.0"/> + <pathelement location="${root.dir}/builder/src/builder"/> + <pathelement location="${root.dir}/builder/src/configure"/> + <pathelement location="${root.dir}/cli/src/commands"/> + <pathelement location="${root.dir}/core/src/classlib"/> <pathelement location="${root.dir}/core/src/classpath/ext"/> <pathelement location="${root.dir}/core/src/classpath/vm"/> + <pathelement location="${root.dir}/core/src/openjdk/vm"/> <pathelement location="${root.dir}/core/src/core"/> <pathelement location="${root.dir}/core/src/driver"/> <pathelement location="${root.dir}/core/src/mmtk-vm"/> + <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/> + <pathelement location="${root.dir}/core/src/test"/> <pathelement location="${root.dir}/core/src/vmmagic"/> <pathelement location="${root.dir}/distr/src/install"/> <pathelement location="${root.dir}/fs/src/fs"/> @@ -419,6 +742,9 @@ <pathelement location="${root.dir}/fs/src/driver"/> <pathelement location="${root.dir}/gui/src/awt"/> <pathelement location="${root.dir}/gui/src/driver"/> + <pathelement location="${root.dir}/gui/src/desktop"/> + <pathelement location="${root.dir}/gui/src/font"/> + <pathelement location="${root.dir}/gui/src/thinlet"/> <pathelement location="${root.dir}/net/src/net"/> <pathelement location="${root.dir}/net/src/driver"/> <pathelement location="${root.dir}/shell/src/shell"/> @@ -426,11 +752,12 @@ <package name="org.jnode.*"/> <package name="org.mmtk.*"/> <package name="org.vmmagic.*"/> - <bootclasspath refid="cp"/> + <bootclasspath refid="cp-javadoc"/> </jnode.javadoc> </target> <!-- Backup CVS files --> + <!-- TODO create replacement SVN task <target name="backup"> <mkdir dir="${backup.dir}"/> <tstamp> @@ -438,6 +765,7 @@ </tstamp> <get src="http://cvs.sourceforge.net/cvstarballs/jnode-cvsroot.tar.bz2" dest="${backup.dir}/jnode-cvsroot-${date}.tar.bz2" usetimestamp="true" verbose="true"/> </target> + --> <!-- Compare classpath version of jnode with real classpath version --> <target name="cp-compare" depends="assemble"> @@ -472,7 +800,7 @@ </patternset> <delete dir="${build.dir}/classpath-compare"/> - <cp-compare destdir="${build.dir}/classpath-compare"> + <cp-compare destdir="${build.dir}/classpath-compare" type="classpath"> <vmsources> <fileset dir="${root.dir}/core/src/classpath/gnu"> <patternset refid="cp-includes-pattern"/> @@ -483,15 +811,12 @@ <fileset dir="${root.dir}/core/src/classpath/javax"> <patternset refid="cp-includes-pattern"/> </fileset> - <fileset dir="${root.dir}/core/src/classpath/org"> + <fileset dir="${root.dir}/core/src/classpath/tools"> <patternset refid="cp-includes-pattern"/> </fileset> - <fileset dir="${root.dir}/core/src/classpath/tools"> + <fileset dir="${root.dir}/core/src/classpath/sun"> <patternset refid="cp-includes-pattern"/> </fileset> - <fileset dir="${root.dir}/core/src/classpath/5.0" target="1.5"> - <patternset refid="cp-includes-pattern"/> - </fileset> </vmsources> <vmspecificsources> <fileset dir="${root.dir}/core/src/classpath/vm"> @@ -503,14 +828,10 @@ <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> - <fileset dir="${root.dir}/../classpath-5.0" target="1.5" ignoremissing="on"> + <fileset dir="${root.dir}/../classpath/external/jsr166"> <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> - <fileset dir="${root.dir}/../classpath-5.0/external/jsr166" target="1.5" ignoremissing="on"> - <patternset refid="cp-includes-pattern"/> - <patternset refid="cp-sources-pattern"/> - </fileset> <fileset dir="${root.dir}/../classpath/resource"> <patternset refid="cp-includes-pattern"/> </fileset> @@ -527,39 +848,202 @@ <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> + <fileset dir="${root.dir}/../classpath/tools/external/asm"> + <patternset refid="cp-includes-pattern"/> + <patternset refid="cp-sources-pattern"/> + </fileset> </classpathsources> </cp-compare> </target> <!-- Compare classpath version of jnode with real classpath version --> <target name="header-fix" depends="assemble"> + <!-- todo clean up the excludes --> <taskdef name="header" classname="org.jnode.ant.taskdefs.HeaderTask" classpathref="cp-jnode"/> <header update="on" headerFile="${root.dir}/all/template/header.txt"> <fileset dir="${root.dir}/builder/src/builder" includes="**/*.java"/> + <fileset dir="${root.dir}/cli/src/commands" includes="**/*.java"/> <fileset dir="${root.dir}/core/src/classpath/ext" includes="**/*.java"/> - <fileset dir="${root.dir}/core/src/classpath/vm" includes="**/*.java"/> - <fileset dir="${root.dir}/core/src/core" includes="**/*.java"/> - <fileset dir="${root.dir}/core/src/vmmagic" includes="**/*.java"/> - <fileset dir="${root.dir}/core/src/mmtk-vm" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/classpath/vm" includes="**/*.java" + excludes="gnu/classpath/jdwp/VMFrame.java, + gnu/classpath/jdwp/VMIdManager.java, + gnu/classpath/jdwp/VMMethod.java, + gnu/classpath/jdwp/VMVirtualMachine.java, + gnu/classpath/VMStackWalker.java, + gnu/java/lang/VMInstrumentationImpl.java, + gnu/java/nio/VMChannel.java, + java/lang/Thread.java, + java/lang/VMProcess.java, + java/lang/VMSystem.java"/> + <fileset dir="${root.dir}/core/src/openjdk/vm" includes="**/*.java" excludes="java/lang/NativeStrictMath.java"/> + <fileset dir="${root.dir}/core/src/core" includes="**/*.java" excludes="org/jnode/imageio/jpeg/JPEGDecoder"/> + <fileset dir="${root.dir}/core/src/mmtk-vm" includes="**/*.java" excludes="org/mmtk/vm/**/*.java"/> <fileset dir="${root.dir}/core/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/core/src/test" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/test" includes="**/*.java" excludes="org/jnode/test/mauve/**/*.java,org/jtestserver/**/*.java"/> <fileset dir="${root.dir}/distr/src/install" includes="**/*.java"/> <fileset dir="${root.dir}/distr/src/apps" includes="**/*.java"/> + <fileset dir="${root.dir}/distr/src/emu" includes="**/*.java"/> + <fileset dir="${root.dir}/distr/src/test" includes="**/*.java"/> <fileset dir="${root.dir}/fs/src/fs" includes="**/*.java"/> <fileset dir="${root.dir}/fs/src/driver" includes="**/*.java"/> <fileset dir="${root.dir}/fs/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/awt" includes="**/*.java"/> + <fileset dir="${root.dir}/gui/src/awt" includes="**/*.java" excludes="org/jnode/awt/font/bdf/**/*.java"/> <fileset dir="${root.dir}/gui/src/desktop" includes="**/*.java"/> <fileset dir="${root.dir}/gui/src/driver" includes="**/*.java"/> <fileset dir="${root.dir}/gui/src/test" includes="**/*.java"/> <fileset dir="${root.dir}/net/src/net" includes="**/*.java"/> <fileset dir="${root.dir}/net/src/driver" includes="**/*.java"/> <fileset dir="${root.dir}/net/src/test" includes="**/*.java"/> + <fileset dir="${root.dir}/shell/src/emu" includes="**/*.java"/> <fileset dir="${root.dir}/shell/src/shell" includes="**/*.java"/> + <fileset dir="${root.dir}/shell/src/test" includes="**/*.java"/> </header> </target> + <target name="check-debugger-properties" depends="prepare"> + <fail message="Please set jnode.debugger.host property in jnode.properties." unless="jnode.debugger.host"/> + <fail message="Please set jnode.debugger.port property in jnode.properties." unless="jnode.debugger.port"/> + </target> + + <target name="hotswap" depends="check-debugger-properties,assemble-projects" description="hotswap the modified classes"> + <taskdef name="hotswap" classname="org.jnode.ant.taskdefs.Hotswap" classpathref="cp-jnode" /> + <hotswap verbose="true" host="${jnode.debugger.host}" port="${jnode.debugger.port}"> + <fileset dir="../core/build/classes/" includes="**/*.class"> + <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> + </fileset> + <fileset dir="../distr/build/classes/" includes="**/*.class"> + <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> + </fileset> + <fileset dir="../fs/build/classes/" includes="**/*.class"> + <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> + </fileset> + <fileset dir="../gui/build/classes/" includes="**/*.class"> + <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> + </fileset> + <fileset dir="../net/build/classes/" includes="**/*.class"> + <date datetime="${hotswap.class.tstamp... [truncated message content] |
From: <cr...@us...> - 2009-09-06 14:01:04
|
Revision: 5664 http://jnode.svn.sourceforge.net/jnode/?rev=5664&view=rev Author: crawley Date: 2009-09-06 14:00:37 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Annotation used by the JikesRVM compiler. Added Paths: ----------- classlib6/core/src/classlib/org/jnode/annotation/NoOptCompile.java Added: classlib6/core/src/classlib/org/jnode/annotation/NoOptCompile.java =================================================================== --- classlib6/core/src/classlib/org/jnode/annotation/NoOptCompile.java (rev 0) +++ classlib6/core/src/classlib/org/jnode/annotation/NoOptCompile.java 2009-09-06 14:00:37 UTC (rev 5664) @@ -0,0 +1,42 @@ +/* + * $Id: NoInline.java 5226 2009-04-06 14:55:27Z lsantha $ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jnode.annotation; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.CLASS; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to inform the compiler not to optimize the method on which + * the annotation is applied. + * + * @author ansari82 + */ +@Documented +@Retention(CLASS) +@Target({CONSTRUCTOR, METHOD }) +public @interface NoOptCompile { + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-26 11:52:52
|
Revision: 5663 http://jnode.svn.sourceforge.net/jnode/?rev=5663&view=rev Author: crawley Date: 2009-08-26 11:52:35 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Removed some dead code and fixed a misleading javadoc comment about how VmProcess.reschedule() gets called. Modified Paths: -------------- trunk/core/src/core/org/jnode/vm/compiler/EntryPoints.java trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java Modified: trunk/core/src/core/org/jnode/vm/compiler/EntryPoints.java =================================================================== --- trunk/core/src/core/org/jnode/vm/compiler/EntryPoints.java 2009-08-24 18:49:03 UTC (rev 5662) +++ trunk/core/src/core/org/jnode/vm/compiler/EntryPoints.java 2009-08-26 11:52:35 UTC (rev 5663) @@ -120,8 +120,6 @@ private final VmWriteBarrier writeBarrier; - private final VmMethod yieldPoint; - private final VmMethod recompileMethod; private final int magic; @@ -243,7 +241,6 @@ "org.jnode.vm.scheduler.VmProcessor", true); vmThreadSwitchIndicatorOffset = ((VmInstanceField) testField(processorClass.getField("threadSwitchIndicator"))).getOffset(); - yieldPoint = testMethod(processorClass.getMethod("yieldPoint", "()V")); vmProcessorMeField = (VmInstanceField) testField(processorClass.getField("me")); vmProcessorStackEnd = (VmInstanceField) testField(processorClass .getField("stackEnd")); @@ -629,14 +626,6 @@ } /** - * @return Returns the yieldPoint. - * @see org.jnode.vm.scheduler.VmProcessor#yieldPoint() - */ - public final VmMethod getYieldPoint() { - return yieldPoint; - } - - /** * @return Returns the recompileMethod. * @see VmMethod#recompileMethod(int, int) */ Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-24 18:49:03 UTC (rev 5662) +++ trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-26 11:52:35 UTC (rev 5663) @@ -349,14 +349,6 @@ } /** - * This method is called by the generated yieldpoints if a threadswitch is - * requested. - */ - final void yieldPoint() { - - } - - /** * Is this processor busy switching threads. * * @return true or false @@ -419,8 +411,8 @@ } /** - * This method is called by the timer interrupt with interrupts disabled. - * Keep this method as short and as fast as possible! + * This method is called by the "yieldpoint" interrupt handler (see "vm-ints.asm") + * with interrupts disabled. Try to keep it as short and as fast as possible! * * @throws org.vmmagic.pragma.UninterruptiblePragma */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-24 18:49:13
|
Revision: 5662 http://jnode.svn.sourceforge.net/jnode/?rev=5662&view=rev Author: fduminy Date: 2009-08-24 18:49:03 +0000 (Mon, 24 Aug 2009) Log Message: ----------- cleanup : removed references to non-existing sub projects/sub directories Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-08-24 14:11:14 UTC (rev 5661) +++ classlib6/all/build.xml 2009-08-24 18:49:03 UTC (rev 5662) @@ -31,13 +31,7 @@ <property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/> <property name="jnode-configure.jar" value="${build.dir}/descriptors/jnode-configure.jar"/> <property name="jnode-core.jar" value="${root.dir}/core/build/classes"/> - <property name="jnode-distr.jar" value="${root.dir}/distr/build/classes"/> - <property name="jnode-fs.jar" value="${root.dir}/fs/build/classes"/> - <property name="jnode-gui.jar" value="${root.dir}/gui/build/classes"/> <property name="thinlet.jar" value="${root.dir}/gui/build/classes"/> - <property name="jnode-textui.jar" value="${root.dir}/textui/build/classes"/> - <property name="jnode-net.jar" value="${root.dir}/net/build/classes"/> - <property name="jnode-shell.jar" value="${root.dir}/shell/build/classes"/> <property name="jnode-fonts.jar" value="${build.dir}/descriptors/jnode-fonts.jar"/> <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/> @@ -48,26 +42,10 @@ <property name="ant.jar" value="${root.dir}/core/lib/ant.jar"/> <property name="ant-launcher.jar" value="${root.dir}/core/lib/ant-launcher.jar"/> <property name="commons-net.jar" value="${root.dir}/core/lib/commons-net-1.1.0.jar"/> - <property name="dnsjava.jar" value="${root.dir}/net/lib/dnsjava-1.6.6.jar"/> - <property name="jsch.jar" value="${root.dir}/net/lib/jsch-0.1.24.jar"/> <property name="junit.jar" value="${root.dir}/core/lib/junit-4.5.jar"/> <property name="mmtk.jar" value="${root.dir}/core/lib/mmtk/mmtk.jar"/> <property name="mauve.jar" value="${root.dir}/core/lib/mauve.jar"/> - <property name="edtftpj.jar" value="${root.dir}/fs/lib/edtftpj-1.5.2.jar"/> - <property name="jcifs.jar" value="${root.dir}/fs/lib/jcifs-1.2.6.jar"/> <property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.jar"/> - <property name="oncrpc.jar" value="${root.dir}/net/lib/oncrpc.jar"/> - <property name="telnetd.jar" value="${root.dir}/distr/lib/telnetd.jar" /> - <property name="commons-logging.jar" value="${root.dir}/distr/lib/commons-logging.jar" /> - <property name="jetty.jar" value="${root.dir}/distr/lib/jetty-6.1.5.jar" /> - <property name="jetty-util.jar" value="${root.dir}/distr/lib/jetty-util-6.1.5.jar" /> - <property name="jsp.jar" value="${root.dir}/distr/lib/jsp-2.1.jar" /> - <property name="jsp-api.jar" value="${root.dir}/distr/lib/jsp-api-2.1.jar" /> - <property name="servlet.jar" value="${root.dir}/distr/lib/servlet-api-2.5-6.1.5.jar" /> - <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" /> - <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" /> - <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" /> - <property name="nanoxml-java.jar" value="${root.dir}/shell/lib/nanoxml-2.2.3.jar" /> <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" /> <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" /> @@ -81,8 +59,6 @@ <property name="asm-util.jar" value="${root.dir}/core/lib/asm-util-1.5.3.jar"/> <property name="log4j.jar" value="${root.dir}/core/lib/log4j-1.2.8.jar"/> - <property name="beanshell.jar" value="${root.dir}/shell/lib/bsh-2.0b5.jar"/> - <property name="js.jar" value="${root.dir}/shell/lib/rhino1.6r5-jsr223.jar"/> <!-- libraries needed to check plugin dependencies --> <property name="bcel-5.1.jar" value="${root.dir}/builder/lib/bcel-5.1.jar" /> @@ -131,13 +107,7 @@ <path id="cp-jnode"> <pathelement location="${jnode-builder.jar}"/> <pathelement location="${jnode-core.jar}"/> - <pathelement location="${jnode-distr.jar}"/> - <pathelement location="${jnode-fs.jar}"/> - <pathelement location="${jnode-shell.jar}"/> - <pathelement location="${jnode-net.jar}"/> - <pathelement location="${jnode-gui.jar}"/> <pathelement location="${thinlet.jar}"/> - <pathelement location="${jnode-textui.jar}"/> <pathelement location="${bcel-5.1.jar}"/> <path refid="cp"/> </path> @@ -380,11 +350,6 @@ <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/> <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/> - <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/> - <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/> - <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/> - <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/> - <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/> <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/> <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/> @@ -596,18 +561,6 @@ <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/> <pathelement location="${root.dir}/core/src/test"/> <pathelement location="${root.dir}/core/src/vmmagic"/> - <pathelement location="${root.dir}/distr/src/install"/> - <pathelement location="${root.dir}/fs/src/fs"/> - <pathelement location="${root.dir}/fs/src/fs"/> - <pathelement location="${root.dir}/fs/src/driver"/> - <pathelement location="${root.dir}/gui/src/awt"/> - <pathelement location="${root.dir}/gui/src/driver"/> - <pathelement location="${root.dir}/gui/src/desktop"/> - <pathelement location="${root.dir}/gui/src/font"/> - <pathelement location="${root.dir}/gui/src/thinlet"/> - <pathelement location="${root.dir}/net/src/net"/> - <pathelement location="${root.dir}/net/src/driver"/> - <pathelement location="${root.dir}/shell/src/shell"/> </sourcepath> <package name="org.jnode.*"/> <package name="org.mmtk.*"/> @@ -716,7 +669,6 @@ </cp-compare> </target> - <!-- Compare classpath version of jnode with real classpath version --> <target name="header-fix" depends="assemble"> <!-- todo clean up the excludes --> <taskdef name="header" classname="org.jnode.ant.taskdefs.HeaderTask" classpathref="cp-jnode"/> @@ -740,23 +692,6 @@ <fileset dir="${root.dir}/core/src/mmtk-vm" includes="**/*.java" excludes="org/mmtk/vm/**/*.java"/> <fileset dir="${root.dir}/core/src/driver" includes="**/*.java"/> <fileset dir="${root.dir}/core/src/test" includes="**/*.java" excludes="org/jnode/test/mauve/**/*.java,org/jtestserver/**/*.java"/> - <fileset dir="${root.dir}/distr/src/install" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/apps" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/emu" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/fs" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/awt" includes="**/*.java" excludes="org/jnode/awt/font/bdf/**/*.java"/> - <fileset dir="${root.dir}/gui/src/desktop" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/net" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/emu" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/shell" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/test" includes="**/*.java"/> </header> </target> @@ -771,24 +706,6 @@ <fileset dir="../core/build/classes/" includes="**/*.class"> <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> </fileset> - <fileset dir="../distr/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../fs/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../gui/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../net/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../shell/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../textui/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> </hotswap> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-24 14:11:24
|
Revision: 5661 http://jnode.svn.sourceforge.net/jnode/?rev=5661&view=rev Author: crawley Date: 2009-08-24 14:11:14 +0000 (Mon, 24 Aug 2009) Log Message: ----------- Shell functions now support arguments and redirection Modified Paths: -------------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-24 10:52:13 UTC (rev 5660) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-24 14:11:14 UTC (rev 5661) @@ -1183,6 +1183,27 @@ } /** + * Evaluate the redirections for this command against a set of streams, saving the context's existing IOs. + * + * @param redirects the redirection nodes to be evaluated + * @param streams the base CommandIOs for the redirection calculation. + * @throws ShellException + */ + void evaluateRedirectionsAndPushHolders(RedirectionNode[] redirects, CommandIO[] streams) + throws ShellException { + if (savedHolders == null) { + savedHolders = new ArrayList<CommandIOHolder[]>(1); + } + savedHolders.add(holders); + holders = new CommandIOHolder[streams.length]; + for (int i = 0; i < holders.length; i++) { + // Don't take ownership of the streams. + holders[i] = new CommandIOHolder(streams[i], false); + } + evaluateRedirections(redirects, holders); + } + + /** * Close the context's current IO, restoring the previous ones. * @throws ShellException */ @@ -1199,8 +1220,8 @@ * @return the stream state after redirections * @throws ShellException */ - void evaluateRedirections( - RedirectionNode[] redirects, CommandIOHolder[] holders) throws ShellException { + void evaluateRedirections(RedirectionNode[] redirects, CommandIOHolder[] holders) + throws ShellException { if (redirects == null) { return; } Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2009-08-24 10:52:13 UTC (rev 5660) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2009-08-24 14:11:14 UTC (rev 5661) @@ -322,27 +322,34 @@ } else { CommandNode body = context.getFunction(commandName); if (body != null) { - // FIXME setup a new context, streams and args. - return body.execute(context); + context.evaluateRedirectionsAndPushHolders(body.getRedirects(), streams); + String[] savedArgs = context.getArgs(); + try { + context.setArgs(cmdLine.getArguments()); + return body.execute(context); + } finally { + context.popHolders(); + context.setArgs(savedArgs); + } } } cmdLine.setStreams(streams); return shell.invoke(cmdLine, sysProps, env); } - public BjorneContext createContext() throws ShellFailureException { + BjorneContext createContext() throws ShellFailureException { return new BjorneContext(this); } - public CommandShell getShell() { + CommandShell getShell() { return shell; } - public PrintStream resolvePrintStream(CommandIO commandIOIF) { + PrintStream resolvePrintStream(CommandIO commandIOIF) { return shell.resolvePrintStream(commandIOIF); } - public InputStream resolveInputStream(CommandIO stream) { + InputStream resolveInputStream(CommandIO stream) { return shell.resolveInputStream(stream); } @@ -350,7 +357,7 @@ return subshellCount++; } - public String getUniqueName() { + String getUniqueName() { return getName() + "-" + getSubshellNumber(); } } Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-24 10:52:13 UTC (rev 5660) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-24 14:11:14 UTC (rev 5661) @@ -976,7 +976,20 @@ } foo </script> - <output >hi + <output>hi </output> </testSpec> + <testSpec title="shell function 2" command="test" runMode="AS_SCRIPT" rc="0"> + <script>#!bjorne + foo() { + echo $1 $2 + } + foo hi there + foo bye mum >&2 + </script> + <output>hi there +</output> + <error>bye mum +</error> + </testSpec> </testSet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-24 10:52:25
|
Revision: 5660 http://jnode.svn.sourceforge.net/jnode/?rev=5660&view=rev Author: fduminy Date: 2009-08-24 10:52:13 +0000 (Mon, 24 Aug 2009) Log Message: ----------- extracted heap iteration from getHeapStatistics() to allow reuse for other ObjectVisitors Modified Paths: -------------- trunk/core/src/core/org/jnode/vm/memmgr/def/DefaultHeapManager.java Modified: trunk/core/src/core/org/jnode/vm/memmgr/def/DefaultHeapManager.java =================================================================== --- trunk/core/src/core/org/jnode/vm/memmgr/def/DefaultHeapManager.java 2009-08-22 14:37:39 UTC (rev 5659) +++ trunk/core/src/core/org/jnode/vm/memmgr/def/DefaultHeapManager.java 2009-08-24 10:52:13 UTC (rev 5660) @@ -22,11 +22,12 @@ import java.io.PrintWriter; +import org.jnode.annotation.Inline; +import org.jnode.annotation.MagicPermission; import org.jnode.vm.MemoryBlockManager; +import org.jnode.vm.ObjectVisitor; import org.jnode.vm.VmArchitecture; import org.jnode.vm.VmMagic; -import org.jnode.annotation.Inline; -import org.jnode.annotation.MagicPermission; import org.jnode.vm.classmgr.ObjectFlags; import org.jnode.vm.classmgr.ObjectLayout; import org.jnode.vm.classmgr.VmClassLoader; @@ -451,17 +452,21 @@ final HeapStatisticsVisitor heapStatisticsVisitor = new HeapStatisticsVisitor( heapStatistics); + accept(heapStatisticsVisitor, false); + + return heapStatistics; + } + + private void accept(ObjectVisitor visitor, boolean locking) { VmDefaultHeap heap = firstNormalHeap; final Word zero = Word.zero(); while (heap != null) { - heap.walk(heapStatisticsVisitor, false, zero, zero); + heap.walk(visitor, locking, zero, zero); heap = heap.getNext(); } - - return heapStatistics; } - + /** * @see org.jnode.vm.memmgr.VmHeapManager#createProcessorHeapData(org.jnode.vm.scheduler.VmProcessor) */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-22 14:37:48
|
Revision: 5659 http://jnode.svn.sourceforge.net/jnode/?rev=5659&view=rev Author: crawley Date: 2009-08-22 14:37:39 +0000 (Sat, 22 Aug 2009) Log Message: ----------- Partial implementation of shell functions. (Arguments, redirections and the context / variables are not yet implemented when a function is run.) Modified Paths: -------------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java trunk/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java trunk/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -48,12 +48,6 @@ /** * Temporary adapter method. Unconverted builtin classes override this. - * - * @param command - * @param interpreter - * @param context - * @return - * @throws ShellException */ int invoke(CommandLine command, BjorneInterpreter interpreter, BjorneContext context) throws ShellException { Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -90,8 +90,10 @@ private final BjorneInterpreter interpreter; private Map<String, VariableSlot> variables; + + private TreeMap<String, String> aliases; - private TreeMap<String, String> aliases; + private TreeMap<String, CommandNode> functions; private String command = ""; @@ -122,6 +124,7 @@ this.holders = holders; this.variables = new HashMap<String, VariableSlot>(); this.aliases = new TreeMap<String, String>(); + this.functions = new TreeMap<String, CommandNode>(); initVariables(); } @@ -157,6 +160,7 @@ this.holders = copyStreamHolders(parent.holders); this.variables = copyVariables(parent.variables); this.aliases = new TreeMap<String, String>(parent.aliases); + this.functions = new TreeMap<String, CommandNode>(parent.functions); this.globbing = parent.globbing; this.tildeExpansion = parent.tildeExpansion; this.echoExpansions = parent.echoExpansions; @@ -406,15 +410,8 @@ * @param tokens the tokens to be expanded and split into words * @throws ShellException */ - public List<BjorneToken> expandAndSplit(BjorneToken ... tokens) - throws ShellException { - List<BjorneToken> wordTokens = new LinkedList<BjorneToken>(); - for (BjorneToken token : tokens) { - dollarBacktickSplit(token, wordTokens); - } - wordTokens = fileExpand(wordTokens); - wordTokens = dequote(wordTokens); - return wordTokens; + public List<BjorneToken> expandAndSplit(BjorneToken ... tokens) throws ShellException { + return expandAndSplit(Arrays.asList(tokens)); } /** @@ -1061,7 +1058,7 @@ return new BjorneArithmeticEvaluator(this).evaluateExpression(tmp); } - int execute(CommandLine command, CommandIO[] streams, boolean isBuiltin) throws ShellException { + int execute(CommandLine command, CommandIO[] streams) throws ShellException { if (isEchoExpansions()) { StringBuilder sb = new StringBuilder(); sb.append(" + ").append(command.getCommandName()); @@ -1071,7 +1068,7 @@ resolvePrintStream(streams[Command.STD_ERR]).println(sb); } Map<String, String> env = buildEnvFromExports(); - lastReturnCode = interpreter.executeCommand(command, this, streams, null, env, isBuiltin); + lastReturnCode = interpreter.executeCommand(command, this, streams, null, env); return lastReturnCode; } @@ -1390,4 +1387,12 @@ return variables.keySet(); } + void defineFunction(BjorneToken name, CommandNode body) { + functions.put(name.getText(), body); + } + + CommandNode getFunction(String name) { + return functions.get(name); + } + } Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -122,7 +122,7 @@ public static final int FLAG_PIPE = 0x0010; public static final CommandNode EMPTY = - new SimpleCommandNode(CMD_EMPTY, new BjorneToken[0], false); + new SimpleCommandNode(CMD_EMPTY, new BjorneToken[0]); static HashMap<String, BjorneBuiltin.Factory> BUILTINS = new HashMap<String, BjorneBuiltin.Factory>(); @@ -313,13 +313,19 @@ } int executeCommand(CommandLine cmdLine, BjorneContext context, CommandIO[] streams, - Properties sysProps, Map<String, String> env, boolean isBuiltin) + Properties sysProps, Map<String, String> env) throws ShellException { - if (isBuiltin) { - BjorneBuiltinCommandInfo builtin = - BUILTINS.get(cmdLine.getCommandName()).buildCommandInfo(context); + String commandName = cmdLine.getCommandName(); + if (isBuiltin(commandName)) { + BjorneBuiltinCommandInfo builtin = BUILTINS.get(commandName).buildCommandInfo(context); cmdLine.setCommandInfo(builtin); - } + } else { + CommandNode body = context.getFunction(commandName); + if (body != null) { + // FIXME setup a new context, streams and args. + return body.execute(context); + } + } cmdLine.setStreams(streams); return shell.invoke(cmdLine, sysProps, env); } Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneParser.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -145,7 +145,7 @@ } else { noLineBreaks(); if (optNext(TOK_END_OF_LINE_BIT) != null) { - command = new SimpleCommandNode(CMD_COMMAND, new BjorneToken[0], false); + command = new SimpleCommandNode(CMD_COMMAND, new BjorneToken[0]); } } return command; @@ -292,7 +292,6 @@ List<BjorneToken> assignments = new LinkedList<BjorneToken>(); List<RedirectionNode> redirects = new LinkedList<RedirectionNode>(); List<BjorneToken> words = new LinkedList<BjorneToken>(); - boolean builtin = false; // Deal with cmd_prefix'es before the command name; i.e. assignments and // redirections @@ -338,21 +337,17 @@ redirects.add(parseRedirect()); } } - String commandWord = words.get(0).getText(); - builtin = BjorneInterpreter.isBuiltin(commandWord); - // FIXME ... built-in commands should use the Syntax mechanisms so - // that completion, help, etc will work as expected. } } catch (ShellSyntaxException ex) { if (completer != null) { completer.setCommand(words.size() == 0 ? null : new SimpleCommandNode(CMD_COMMAND, - words.toArray(new BjorneToken[words.size()]), builtin)); + words.toArray(new BjorneToken[words.size()]))); } throw ex; } SimpleCommandNode res = new SimpleCommandNode(CMD_COMMAND, - words.toArray(new BjorneToken[words.size()]), builtin); + words.toArray(new BjorneToken[words.size()])); if (completer != null) { completer.setCommand(words.size() == 0 ? null : res); } @@ -382,8 +377,6 @@ } private CommandNode parseFunctionBody() throws ShellSyntaxException { - // TODO ... need to set the context to 'rule 9' while parsing the - // function body CommandNode body = parseCompoundCommand(); body.setRedirects(parseOptRedirects()); return body; Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/FunctionDefinitionNode.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -56,7 +56,8 @@ @Override public int execute(BjorneContext context) { - return -1; + context.defineFunction(name, body); + return 0; } @Override Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/SimpleCommandNode.java 2009-08-22 14:37:39 UTC (rev 5659) @@ -38,12 +38,10 @@ private final BjorneToken[] words; - private final boolean builtin; - public SimpleCommandNode(int nodeType, BjorneToken[] words, boolean builtin) { + public SimpleCommandNode(int nodeType, BjorneToken[] words) { super(nodeType); this.words = words; - this.builtin = builtin; } public void setAssignments(BjorneToken[] assignments) { @@ -58,10 +56,6 @@ return assignments; } - public boolean isBuiltin() { - return builtin; - } - public String toString() { StringBuilder sb = new StringBuilder(); sb.append("SimpleCommand{").append(super.toString()); @@ -69,9 +63,6 @@ sb.append(",assignments="); appendArray(sb, assignments); } - if (builtin) { - sb.append(",builtin=true"); - } if (words != null) { sb.append(",words="); appendArray(sb, words); @@ -110,7 +101,7 @@ throw new ShellFailureException( "asynchronous execution (&) not implemented yet"); } else { - rc = childContext.execute(command, ios, builtin); + rc = childContext.execute(command, ios); } } } catch (BjorneControlException ex) { @@ -153,9 +144,10 @@ throws CompletionException { try { CommandLine command = context.buildCommandLine(words); - if (builtin) { + String commandName = command.getCommandName(); + if (commandName != null && BjorneInterpreter.isBuiltin(commandName)) { BjorneBuiltinCommandInfo commandInfo = - BjorneInterpreter.BUILTINS.get(command.getCommandName()).buildCommandInfo(context); + BjorneInterpreter.BUILTINS.get(commandName).buildCommandInfo(context); command.setCommandInfo(commandInfo); } command.setArgumentAnticipated(argumentAnticipated); Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml 2009-08-22 14:37:39 UTC (rev 5659) @@ -74,26 +74,6 @@ <output>fred='ls' </output> </testSpec> - <testSpec title="builtins recognized early" command="test" runMode="AS_SCRIPT" rc="0"> - <script>#!bjorne - alias fred=ls - alias - unalias -a - echo done - UNALIAS=unalias - alias fred=dir - alias - $UNALIAS -a - echo done - </script> - <output>fred='ls' -done -fred='dir' -done -</output> - <error>Cannot find an alias or load a command class for 'unalias' -</error> - </testSpec> <testSpec title="readonly" runMode="AS_SCRIPT" rc="0"> <script>#!bjorne readonly A Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-21 13:24:37 UTC (rev 5658) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-22 14:37:39 UTC (rev 5659) @@ -969,4 +969,14 @@ <error>Cannot find an alias or load a command class for 'foo' </error> </testSpec> + <testSpec title="shell function" command="test" runMode="AS_SCRIPT" rc="0"> + <script>#!bjorne + foo() { + echo hi + } + foo + </script> + <output >hi +</output> + </testSpec> </testSet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-21 13:24:47
|
Revision: 5658 http://jnode.svn.sourceforge.net/jnode/?rev=5658&view=rev Author: crawley Date: 2009-08-21 13:24:37 +0000 (Fri, 21 Aug 2009) Log Message: ----------- Arithmetic Expression evaluation using $((...)) now works ... modulo that the POSIX spec is so unclear that it is difficult to figure out exactly what is correct in edge-cases. Modified Paths: -------------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-20 15:31:54 UTC (rev 5657) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-21 13:24:37 UTC (rev 5658) @@ -1029,10 +1029,6 @@ } private CharSequence dollarParenParenExpand(CharIterator ci) throws ShellException { - // Different shells handle $(( ... )) differently, but dash seems to do what - // the POSIX spec seems to say. In the first phase, we look for the matching '))' - // keeping track of nested parentheses and performing any $ expansions. Double - // quotes should be treated as literal. StringBuilder sb = new StringBuilder(); int nesting = 0; boolean done = false; @@ -1054,16 +1050,15 @@ sb.append(')'); } break; - case '$': - sb.append(dollarExpand(ci, '\000')); - break; case -1: throw new ShellSyntaxException("Unmatched \"((\" (double left parenthesis)"); default: sb.append((char) ch); } + ci.nextCh(); } while (!done); - return new BjorneArithmeticEvaluator(this).evaluateExpression(sb); + CharSequence tmp = dollarBacktickExpand(new CharIterator(sb), '\000'); + return new BjorneArithmeticEvaluator(this).evaluateExpression(tmp); } int execute(CommandLine command, CommandIO[] streams, boolean isBuiltin) throws ShellException { Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-20 15:31:54 UTC (rev 5657) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml 2009-08-21 13:24:37 UTC (rev 5658) @@ -98,6 +98,20 @@ 1 1 </output> </testSpec> + <testSpec title="$((...))" command="test" runMode="AS_SCRIPT" rc="0"> + <script>#!bjorne +A=1 +echo $A +B="$((A + 1))" +echo $B +C="$(($B + 1))" +echo $C +</script> + <output>1 +2 +3 +</output> + </testSpec> <testSpec title="if ... then ... fi" command="test" runMode="AS_SCRIPT" rc="0"> <script>#!bjorne if true ; then echo HI ; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-20 15:32:02
|
Revision: 5657 http://jnode.svn.sourceforge.net/jnode/?rev=5657&view=rev Author: crawley Date: 2009-08-20 15:31:54 +0000 (Thu, 20 Aug 2009) Log Message: ----------- More work on the expression evaluator. Modified Paths: -------------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java 2009-08-20 11:24:38 UTC (rev 5656) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java 2009-08-20 15:31:54 UTC (rev 5657) @@ -90,6 +90,15 @@ public long getValue() throws ShellSyntaxException { return name != null ? evalName(name) : value; } + + @Override + public String toString() { + try { + return Long.toString(getValue()); + } catch (ShellException ex) { + return "OOPS"; + } + } } private final BjorneContext context; @@ -112,6 +121,7 @@ } private Primary evalExpression(CharIterator ci) throws ShellException { + int mark = opStack.size(); int ch = skipWhiteSpace(ci); while ((ch = skipWhiteSpace(ci)) != -1 && ch != ')') { int prefixOp = parseExpressionOperator(ci); @@ -129,16 +139,17 @@ } skipWhiteSpace(ci); pushOperand(evalPrimary(ci)); + if (prefixOp != NONE) { + pushOperator(prefixOp, mark); + } skipWhiteSpace(ci); int op = parseExpressionOperator(ci); - if (prefixOp != NONE) { - if (op == PLUSPLUS || op == MINUSMINUS) { - pushOperator(op); - skipWhiteSpace(ci); - op = parseExpressionOperator(ci); - } - pushOperator(prefixOp); + if (op == PLUSPLUS || op == MINUSMINUS) { + pushOperator(op, mark); + skipWhiteSpace(ci); + op = parseExpressionOperator(ci); } + ch = skipWhiteSpace(ci); if (op == NONE) { if (ch != -1 && ch != ')') { @@ -150,19 +161,19 @@ } else if (ch == ')') { throw new ShellSyntaxException("Expected a number or variable name in expression"); } - pushOperator(op); + pushOperator(op, mark); } if (valStack.size() == 0) { throw new ShellSyntaxException("No expression within \"$((...))\""); } - while (!opStack.isEmpty()) { + while (opStack.size() > mark) { evalOperation(); } - return valStack.getFirst(); + return valStack.removeFirst(); } - private void pushOperator(int op) throws ShellException { - while (!opStack.isEmpty() && opStack.getFirst() <= op) { + private void pushOperator(int op, int mark) throws ShellException { + while (opStack.size() > mark && precedence.get(opStack.getFirst()) <= precedence.get(op)) { evalOperation(); } opStack.addFirst(op); @@ -180,7 +191,6 @@ operand1 = valStack.removeFirst(); operand2 = null; } else { - System.err.println(op); operand2 = valStack.removeFirst(); operand1 = valStack.removeFirst(); } @@ -198,7 +208,7 @@ if (operand1.name == null) { throw new ShellSyntaxException("Cannot apply ++ or -- to a number or a subexpression"); } - value = evalName(operand1.name) + (op == PLUSPLUS ? 1 : -1); + value = evalName(operand1.name) + (op == PLUSPLUS + PREFIX ? 1 : -1); context.setVariable(operand1.name, Long.toString(value)); res = new Primary(null, value); break; @@ -207,8 +217,8 @@ if (operand1.name == null) { throw new ShellSyntaxException("Cannot apply ++ or -- to a number or a subexpression"); } - value = evalName(operand1.name) + (op == PLUSPLUS ? 1 : -1); - context.setVariable(operand1.name, Long.toString(value)); + value = evalName(operand1.name); + context.setVariable(operand1.name, Long.toString(value + (op == PLUSPLUS ? 1 : -1))); res = new Primary(null, value); break; case PLUS: @@ -233,7 +243,7 @@ case PERCENT: value = operand2.getValue(); if (value == 0) { - throw new ShellException("Divide by zero in expression"); + throw new ShellException("Remainder by zero in expression"); } res = new Primary(null, operand1.getValue() % value); break; @@ -252,7 +262,8 @@ } else if (ch == '(') { ci.nextCh(); Primary res = evalExpression(ci); - if (ci.nextCh() != ')') { + skipWhiteSpace(ci); + if ((ch = ci.nextCh()) != ')') { throw new ShellSyntaxException("Unmatched \"(\" (left parenthesis) in arithmetic expression"); } return res; @@ -304,7 +315,12 @@ return SLASH; case '*': ci.nextCh(); - return STAR; + if (ci.peekCh() == '*') { + ci.nextCh(); + return STARSTAR; + } else { + return STAR; + } case '%': ci.nextCh(); return PERCENT; @@ -315,9 +331,11 @@ private long parseNumber(CharIterator ci) { StringBuilder sb = new StringBuilder(); - int ch; - while (Character.isDigit((char) (ch = ci.nextCh()))) { + int ch = ci.peekCh(); + while (ch != -1 && Character.isDigit((char) ch)) { + ci.nextCh(); sb.append((char) ch); + ch = ci.peekCh(); } return Long.parseLong(sb.toString()); } Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-20 11:24:38 UTC (rev 5656) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-20 15:31:54 UTC (rev 5657) @@ -951,8 +951,7 @@ return sb.toString(); } - - String variable(String parameter) throws ShellSyntaxException { + protected String variable(String parameter) throws ShellSyntaxException { if (BjorneToken.isName(parameter)) { VariableSlot var = variables.get(parameter); return (var != null) ? var.getValue() : null; Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java 2009-08-20 11:24:38 UTC (rev 5656) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java 2009-08-20 15:31:54 UTC (rev 5657) @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.jnode.shell.ShellException; +import org.jnode.shell.ShellSyntaxException; import org.jnode.shell.bjorne.BjorneArithmeticEvaluator; import org.jnode.shell.bjorne.BjorneContext; import org.jnode.shell.io.CommandIOHolder; @@ -44,13 +45,15 @@ super(null, null); } - /** - * Expose method for testing - */ @Override protected void setVariable(String name, String value) { super.setVariable(name, value); } + + @Override + protected String variable(String name) throws ShellSyntaxException { + return super.variable(name); + } } private static class TestBjorneArithmeticEvaluator extends BjorneArithmeticEvaluator { @@ -97,4 +100,65 @@ assertEquals("0", ev.evaluateExpression(" - B")); } + public void testInfixOperators() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("2", ev.evaluateExpression("1 + 1")); + assertEquals("2", ev.evaluateExpression("A + 1")); + assertEquals("0", ev.evaluateExpression("1 - 1")); + assertEquals("0", ev.evaluateExpression("1 - A")); + assertEquals("4", ev.evaluateExpression("2 * 2")); + assertEquals("2", ev.evaluateExpression("4 / 2")); + assertEquals("1", ev.evaluateExpression("4 % 3")); + assertEquals("27", ev.evaluateExpression("3 ** 3")); + try { + ev.evaluateExpression("4 / 0"); + fail("no exception for '4 / 0'"); + } catch (ShellException ex) { + // expected + } + try { + ev.evaluateExpression("4 % 0"); + fail("no exception for '4 % 0'"); + } catch (ShellException ex) { + // expected + } + } + + public void testInfixPrecedence() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("0", ev.evaluateExpression("-1 * 2 + 2")); + assertEquals("4", ev.evaluateExpression("1 * 2 + 2")); + assertEquals("5", ev.evaluateExpression("1 + 2 * 2")); + assertEquals("9", ev.evaluateExpression("1 + 2 * 2 ** 2")); + assertEquals("8", ev.evaluateExpression("1 + 2 * 2 ** 2 + -A")); + } + + public void testParentheses() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("-4", ev.evaluateExpression("-1 * (2 + 2)")); + assertEquals("4", ev.evaluateExpression("(1 * 2 + 2)")); + assertEquals("6", ev.evaluateExpression("((1) + 2) * 2")); + assertEquals("17", ev.evaluateExpression("1 + (2 * 2) ** 2")); + assertEquals("10", ev.evaluateExpression("1 + 2 * 2 ** 2 + -(-1)")); + } + + public void testIncDec() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("1", ev.evaluateExpression("A++")); + assertEquals("2", context.variable("A")); + assertEquals("3", ev.evaluateExpression("++A")); + assertEquals("3", context.variable("A")); + assertEquals("3", ev.evaluateExpression("A--")); + assertEquals("2", context.variable("A")); + assertEquals("1", ev.evaluateExpression("--A")); + assertEquals("1", context.variable("A")); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-08-20 11:24:49
|
Revision: 5656 http://jnode.svn.sourceforge.net/jnode/?rev=5656&view=rev Author: crawley Date: 2009-08-20 11:24:38 +0000 (Thu, 20 Aug 2009) Log Message: ----------- Working on support for $((expression)) ... Modified Paths: -------------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java Added Paths: ----------- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java Added: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java (rev 0) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneArithmeticEvaluator.java 2009-08-20 11:24:38 UTC (rev 5656) @@ -0,0 +1,324 @@ +/* + * $Id$ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.jnode.shell.bjorne; + +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; + +import org.jnode.shell.ShellException; +import org.jnode.shell.ShellFailureException; +import org.jnode.shell.ShellSyntaxException; + +/** + * This class parses and evaluates the bjorne shell's arithmetic expression sublanguage. + * + * @author cr...@jn... + */ +public class BjorneArithmeticEvaluator { + + private static final int NONE = 1; + private static final int PERCENT = 2; + private static final int MINUS = 3; + private static final int PLUS = 4; + private static final int STAR = 5; + private static final int SLASH = 6; + private static final int PLUSPLUS = 7; + private static final int MINUSMINUS = 8; + private static final int PLING = 9; + private static final int TWIDDLE = 10; + private static final int STARSTAR = 11; + + private static final int PREFIX = 16; + + private static final HashMap<Integer, Integer> precedence = new HashMap<Integer, Integer>(); + private static final HashSet<Integer> unaryOps; + static { + precedence.put(PLUSPLUS, 1); + precedence.put(MINUSMINUS, 1); + precedence.put(PLUSPLUS + PREFIX, 2); + precedence.put(MINUSMINUS + PREFIX, 2); + precedence.put(PLUS + PREFIX, 3); + precedence.put(MINUS + PREFIX, 3); + precedence.put(PLING + PREFIX, 4); + precedence.put(TWIDDLE + PREFIX, 4); + precedence.put(STARSTAR, 5); + precedence.put(STAR, 6); + precedence.put(SLASH, 6); + precedence.put(PERCENT, 6); + precedence.put(PLUS, 7); + precedence.put(MINUS, 7); + unaryOps = new HashSet<Integer>(Arrays.asList(new Integer[]{ + PLUS + PREFIX, PLUSPLUS, PLUSPLUS + PREFIX, + MINUS + PREFIX, MINUSMINUS, MINUSMINUS + PREFIX})); + }; + + + private class Primary { + private final String name; + private final long value; + + public Primary(String name, long value) { + super(); + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public long getValue() throws ShellSyntaxException { + return name != null ? evalName(name) : value; + } + } + + private final BjorneContext context; + private final Deque<Integer> opStack = new ArrayDeque<Integer>(); + private final Deque<Primary> valStack = new ArrayDeque<Primary>(); + + + public BjorneArithmeticEvaluator(BjorneContext context) { + super(); + this.context = context; + } + + protected synchronized String evaluateExpression(CharSequence source) + throws ShellException { + opStack.clear(); + valStack.clear(); + CharIterator ci = new CharIterator(source); + Primary res = evalExpression(ci); + return Long.toString(res.getValue()); + } + + private Primary evalExpression(CharIterator ci) throws ShellException { + int ch = skipWhiteSpace(ci); + while ((ch = skipWhiteSpace(ci)) != -1 && ch != ')') { + int prefixOp = parseExpressionOperator(ci); + switch (prefixOp) { + case NONE: + break; + case PLUS: + case MINUS: + case PLUSPLUS: + case MINUSMINUS: + prefixOp += PREFIX; + break; + default: + throw new ShellSyntaxException("Unexpected infix operator"); + } + skipWhiteSpace(ci); + pushOperand(evalPrimary(ci)); + skipWhiteSpace(ci); + int op = parseExpressionOperator(ci); + if (prefixOp != NONE) { + if (op == PLUSPLUS || op == MINUSMINUS) { + pushOperator(op); + skipWhiteSpace(ci); + op = parseExpressionOperator(ci); + } + pushOperator(prefixOp); + } + ch = skipWhiteSpace(ci); + if (op == NONE) { + if (ch != -1 && ch != ')') { + throw new ShellSyntaxException("Expected an infix operator in expression"); + } + break; + } else if (op == PLUSPLUS || op == MINUSMINUS) { + throw new ShellSyntaxException("Expected an infix operator in expression"); + } else if (ch == ')') { + throw new ShellSyntaxException("Expected a number or variable name in expression"); + } + pushOperator(op); + } + if (valStack.size() == 0) { + throw new ShellSyntaxException("No expression within \"$((...))\""); + } + while (!opStack.isEmpty()) { + evalOperation(); + } + return valStack.getFirst(); + } + + private void pushOperator(int op) throws ShellException { + while (!opStack.isEmpty() && opStack.getFirst() <= op) { + evalOperation(); + } + opStack.addFirst(op); + } + + private void pushOperand(Primary operand) { + valStack.addFirst(operand); + } + + private void evalOperation() throws ShellException { + Integer op = opStack.removeFirst(); + Primary operand1; + Primary operand2; + if (unaryOps.contains(op)) { + operand1 = valStack.removeFirst(); + operand2 = null; + } else { + System.err.println(op); + operand2 = valStack.removeFirst(); + operand1 = valStack.removeFirst(); + } + long value; + Primary res; + switch (op) { + case PLUS + PREFIX: + res = new Primary(null, operand1.getValue()); + break; + case MINUS + PREFIX: + res = new Primary(null, -operand1.getValue()); + break; + case PLUSPLUS + PREFIX: + case MINUSMINUS + PREFIX: + if (operand1.name == null) { + throw new ShellSyntaxException("Cannot apply ++ or -- to a number or a subexpression"); + } + value = evalName(operand1.name) + (op == PLUSPLUS ? 1 : -1); + context.setVariable(operand1.name, Long.toString(value)); + res = new Primary(null, value); + break; + case PLUSPLUS: + case MINUSMINUS: + if (operand1.name == null) { + throw new ShellSyntaxException("Cannot apply ++ or -- to a number or a subexpression"); + } + value = evalName(operand1.name) + (op == PLUSPLUS ? 1 : -1); + context.setVariable(operand1.name, Long.toString(value)); + res = new Primary(null, value); + break; + case PLUS: + res = new Primary(null, operand1.getValue() + operand2.getValue()); + break; + case MINUS: + res = new Primary(null, operand1.getValue() - operand2.getValue()); + break; + case STAR: + res = new Primary(null, operand1.getValue() * operand2.getValue()); + break; + case STARSTAR: + res = new Primary(null, Math.round(Math.pow(operand1.getValue(), operand2.getValue()))); + break; + case SLASH: + value = operand2.getValue(); + if (value == 0) { + throw new ShellException("Divide by zero in expression"); + } + res = new Primary(null, operand1.getValue() / value); + break; + case PERCENT: + value = operand2.getValue(); + if (value == 0) { + throw new ShellException("Divide by zero in expression"); + } + res = new Primary(null, operand1.getValue() % value); + break; + default: + throw new ShellFailureException("operator not supported"); + } + valStack.addFirst(res); + } + + private Primary evalPrimary(CharIterator ci) throws ShellException { + int ch = ci.peekCh(); + if (Character.isLetter(ch) || ch == '_') { + return new Primary(context.parseParameter(ci), 0L); + } else if (Character.isDigit(ch)) { + return new Primary(null, parseNumber(ci)); + } else if (ch == '(') { + ci.nextCh(); + Primary res = evalExpression(ci); + if (ci.nextCh() != ')') { + throw new ShellSyntaxException("Unmatched \"(\" (left parenthesis) in arithmetic expression"); + } + return res; + } else { + throw new ShellSyntaxException("Expected a number or variable name"); + } + } + + private long evalName(String name) throws ShellSyntaxException { + try { + String value = context.variable(name); + return value == null ? 0L : Long.parseLong(value); + } catch (NumberFormatException ex) { + throw new ShellSyntaxException( + "expression syntax error: '" + context.variable(name) + "' is not an integer"); + } + } + + private int skipWhiteSpace(CharIterator ci) { + int ch = ci.peekCh(); + while (ch == ' ' || ch == '\t' || ch == '\n') { + ci.nextCh(); + ch = ci.peekCh(); + } + return ch; + } + + private int parseExpressionOperator(CharIterator ci) throws ShellSyntaxException { + int ch = ci.peekCh(); + switch (ch) { + case '+': + ci.nextCh(); + if (ci.peekCh() == '+') { + ci.nextCh(); + return PLUSPLUS; + } else { + return PLUS; + } + case '-': + ci.nextCh(); + if (ci.peekCh() == '-') { + ci.nextCh(); + return MINUSMINUS; + } else { + return MINUS; + } + case '/': + ci.nextCh(); + return SLASH; + case '*': + ci.nextCh(); + return STAR; + case '%': + ci.nextCh(); + return PERCENT; + default: + return NONE; + } + } + + private long parseNumber(CharIterator ci) { + StringBuilder sb = new StringBuilder(); + int ch; + while (Character.isDigit((char) (ch = ci.nextCh()))) { + sb.append((char) ch); + } + return Long.parseLong(sb.toString()); + } +} Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java 2009-08-16 15:07:51 UTC (rev 5655) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneBuiltin.java 2009-08-20 11:24:38 UTC (rev 5656) @@ -17,7 +17,6 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.jnode.shell.bjorne; import org.jnode.shell.AbstractCommand; Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-16 15:07:51 UTC (rev 5655) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-20 11:24:38 UTC (rev 5656) @@ -74,29 +74,17 @@ public class BjorneContext { private static final int NONE = 1; - private static final int HASH = 2; - private static final int DHASH = 3; - private static final int PERCENT = 4; - private static final int DPERCENT = 5; - - private static final int HYPHEN = 6; - - private static final int COLONHYPHEN = 7; - + private static final int MINUS = 6; + private static final int COLONMINUS = 7; private static final int EQUALS = 8; - private static final int COLONEQUALS = 9; - private static final int PLUS = 10; - private static final int COLONPLUS = 11; - private static final int QUERY = 12; - private static final int COLONQUERY = 13; private final BjorneInterpreter interpreter; @@ -835,7 +823,7 @@ operator = COLONQUERY; break; case '-': - operator = COLONHYPHEN; + operator = COLONMINUS; break; default: throw new ShellSyntaxException("bad substitution operator"); @@ -852,7 +840,7 @@ operator = PLUS; break; case '-': - operator = HYPHEN; + operator = MINUS; break; default: throw new ShellSyntaxException("unrecognized substitution operator (\"" + (char) ch + "\")"); @@ -866,9 +854,9 @@ throw new ShellSyntaxException("Unmatched \"{\""); } switch (operator) { - case HYPHEN: + case MINUS: return (value == null) ? word : value; - case COLONHYPHEN: + case COLONMINUS: return (value == null || value.length() == 0) ? word : value; case PLUS: return (value == null) ? "" : word; @@ -917,7 +905,7 @@ } } - private String parseParameter(CharIterator ci) throws ShellSyntaxException { + String parseParameter(CharIterator ci) throws ShellSyntaxException { StringBuilder sb = new StringBuilder(); int ch = ci.peekCh(); while (Character.isLetterOrDigit((char) ch) || ch == '_') { @@ -1040,82 +1028,45 @@ return runBacktickCommand(commandLine); } } - - private CharSequence dollarParenParenExpand(CharIterator ci) { - // TODO Auto-generated method stub - return null; + + private CharSequence dollarParenParenExpand(CharIterator ci) throws ShellException { + // Different shells handle $(( ... )) differently, but dash seems to do what + // the POSIX spec seems to say. In the first phase, we look for the matching '))' + // keeping track of nested parentheses and performing any $ expansions. Double + // quotes should be treated as literal. + StringBuilder sb = new StringBuilder(); + int nesting = 0; + boolean done = false; + do { + int ch = ci.peekCh(); + switch (ch) { + case '(': + nesting++; + sb.append('('); + break; + case ')': + if (nesting > 0) { + nesting--; + sb.append(')'); + } else if (ci.peekCh() == ')') { + ci.nextCh(); + done = true; + } else { + sb.append(')'); + } + break; + case '$': + sb.append(dollarExpand(ci, '\000')); + break; + case -1: + throw new ShellSyntaxException("Unmatched \"((\" (double left parenthesis)"); + default: + sb.append((char) ch); + } + } while (!done); + return new BjorneArithmeticEvaluator(this).evaluateExpression(sb); } -// private String dollarParenExpand(CharIterator ci) throws ShellException { -// StringBuilder sb = extractToMatchingParen(ci); -// if (sb.length() > 0 && sb.charAt(sb.length()) == ')') { -// throw new ShellSyntaxException( -// "There should be a space between the two ')'s in '$(...))'"); -// } -// return runBacktickCommand(sb.toString()).toString(); -// } -// -// private StringBuilder extractToMatchingParen(CharIterator ci) throws ShellSyntaxException { -// StringBuilder sb = new StringBuilder(40); -// Deque<Character> stack = new ArrayDeque<Character>(); -// int ch; -// boolean more = true; -// do { -// ch = ci.nextCh(); -// switch (ch) { -// case -1: -// if (!stack.isEmpty()) { -// throw new ShellSyntaxException("unmatched '('"); -// } -// more = false; -// break; -// case ')': -// if (stack.isEmpty()) { -// more = false; -// } else { -// sb.append(')'); -// if (stack.peekFirst() == '(') { -// stack.removeFirst(); -// } -// } -// break; -// case '(': -// if (stack.isEmpty() || stack.peekFirst() == '(') { -// stack.addFirst('('); -// } -// sb.append('('); -// break; -// case '"': -// case '\'': -// case '`': -// sb.append((char) ch); -// if (stack.isEmpty()) { -// stack.addFirst((char) ch); -// } else { -// char top = stack.peekFirst(); -// if (top != '"' && top != '\'' && top != '`') { -// stack.addFirst('"'); -// } else if (top == ch) { -// stack.removeFirst(); -// } -// } -// break; -// case '\\': -// sb.append('\\'); -// ch = ci.nextCh(); -// if (ch == -1) { -// more = false; -// } else { -// sb.append((char) ch); -// } -// break; -// default: -// sb.append((char) ch); -// } -// } while (more); -// return sb; -// } - int execute(CommandLine command, CommandIO[] streams, boolean isBuiltin) throws ShellException { if (isEchoExpansions()) { StringBuilder sb = new StringBuilder(); Added: trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java =================================================================== --- trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java (rev 0) +++ trunk/shell/src/test/org/jnode/test/shell/bjorne/BjorneArithmeticEvaluatorTest.java 2009-08-20 11:24:38 UTC (rev 5656) @@ -0,0 +1,100 @@ +/* + * $Id$ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jnode.test.shell.bjorne; + +import junit.framework.TestCase; + +import org.jnode.shell.ShellException; +import org.jnode.shell.bjorne.BjorneArithmeticEvaluator; +import org.jnode.shell.bjorne.BjorneContext; +import org.jnode.shell.io.CommandIOHolder; + +/** + * Some unit tests for the BjorneArithmeticEvaluator class. + * + * @author cr...@jn... + */ +public class BjorneArithmeticEvaluatorTest extends TestCase { + + // This class simply allows us to call the setVariable method directly + private static class TestBjorneContext extends BjorneContext { + TestBjorneContext(CommandIOHolder[] holders) { + super(null, holders); + } + + TestBjorneContext() { + super(null, null); + } + + /** + * Expose method for testing + */ + @Override + protected void setVariable(String name, String value) { + super.setVariable(name, value); + } + } + + private static class TestBjorneArithmeticEvaluator extends BjorneArithmeticEvaluator { + public TestBjorneArithmeticEvaluator(BjorneContext context) { + super(context); + } + + @Override + public synchronized String evaluateExpression(CharSequence source) throws ShellException { + return super.evaluateExpression(source); + } + } + + + public void testConstructor() { + new BjorneArithmeticEvaluator(new TestBjorneContext()); + } + + public void testLiterals() throws ShellException { + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(new TestBjorneContext()); + assertEquals("1", ev.evaluateExpression("1")); + assertEquals("1", ev.evaluateExpression(" 1 ")); + assertEquals("42", ev.evaluateExpression("42")); + } + + public void testVariable() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("1", ev.evaluateExpression("A")); + assertEquals("1", ev.evaluateExpression(" A ")); + assertEquals("0", ev.evaluateExpression(" B")); + } + + public void testUnaryPlusMinus() throws ShellException { + TestBjorneContext context = new TestBjorneContext(); + context.setVariable("A", "1"); + TestBjorneArithmeticEvaluator ev = new TestBjorneArithmeticEvaluator(context); + assertEquals("1", ev.evaluateExpression("+A")); + assertEquals("1", ev.evaluateExpression(" + A ")); + assertEquals("0", ev.evaluateExpression(" + B")); + assertEquals("-1", ev.evaluateExpression("-A")); + assertEquals("-1", ev.evaluateExpression(" - A ")); + assertEquals("0", ev.evaluateExpression(" - B")); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-16 15:07:58
|
Revision: 5655 http://jnode.svn.sourceforge.net/jnode/?rev=5655&view=rev Author: fduminy Date: 2009-08-16 15:07:51 +0000 (Sun, 16 Aug 2009) Log Message: ----------- fixed comment Modified Paths: -------------- trunk/core/src/native/x86/vm.asm Modified: trunk/core/src/native/x86/vm.asm =================================================================== --- trunk/core/src/native/x86/vm.asm 2009-08-16 15:07:12 UTC (rev 5654) +++ trunk/core/src/native/x86/vm.asm 2009-08-16 15:07:51 UTC (rev 5655) @@ -113,7 +113,7 @@ ret ; ----------------------------------------------- -; Print a char array in who's reference is in EAX +; Print a char array who's reference is in EAX ; ----------------------------------------------- vm_print_chararray: SPINLOCK_ENTER console_lock This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-16 15:07:23
|
Revision: 5654 http://jnode.svn.sourceforge.net/jnode/?rev=5654&view=rev Author: fduminy Date: 2009-08-16 15:07:12 +0000 (Sun, 16 Aug 2009) Log Message: ----------- added comment Modified Paths: -------------- trunk/core/src/native/x86/kdb.asm Modified: trunk/core/src/native/x86/kdb.asm =================================================================== --- trunk/core/src/native/x86/kdb.asm 2009-08-16 14:26:53 UTC (rev 5653) +++ trunk/core/src/native/x86/kdb.asm 2009-08-16 15:07:12 UTC (rev 5654) @@ -78,7 +78,7 @@ mov edx,[kdb_port] mov eax,ebx - out dx,al + out dx,al ; Send the character IODELAY jmp %%ret This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-16 14:27:01
|
Revision: 5653 http://jnode.svn.sourceforge.net/jnode/?rev=5653&view=rev Author: fduminy Date: 2009-08-16 14:26:53 +0000 (Sun, 16 Aug 2009) Log Message: ----------- moved kernel debugger (kdb) stuff from VmScheduler to its own class : KernelDebugger Modified Paths: -------------- trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java Added Paths: ----------- trunk/core/src/core/org/jnode/vm/scheduler/KernelDebugger.java Added: trunk/core/src/core/org/jnode/vm/scheduler/KernelDebugger.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/KernelDebugger.java (rev 0) +++ trunk/core/src/core/org/jnode/vm/scheduler/KernelDebugger.java 2009-08-16 14:26:53 UTC (rev 5653) @@ -0,0 +1,217 @@ +/* + * $Id: VmProcessor.java 5226 2009-04-06 14:55:27Z lsantha $ + * + * Copyright (C) 2003-2009 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jnode.vm.scheduler; + +import org.jnode.annotation.Inline; +import org.jnode.annotation.KernelSpace; +import org.jnode.annotation.Uninterruptible; +import org.jnode.vm.LoadCompileService; +import org.jnode.vm.Unsafe; +import org.jnode.vm.VmMagic; +import org.jnode.vm.VmStackReader; + +/** + * This is the Kernel Debugger (also known as kdb). + * + * @author Ewout Prangsma (ep...@us...) + * @author Fabien DUMINY (fd...@jn...) + * + */ +public class KernelDebugger { + private final VmScheduler vmScheduler; + + KernelDebugger(VmScheduler vmScheduler) { + this.vmScheduler = vmScheduler; + } + + /** + * Process all waiting KDB commands. + */ + @Uninterruptible + @KernelSpace + @Inline + final void processAllKdbInput() { + int ch; + while ((ch = readKdbInput()) >= 0) { + processKdbInput(ch); + } + } + + /** + * Process the input from the kernel debugger. + * + * @param input + * @throws org.vmmagic.pragma.UninterruptiblePragma + */ + @Uninterruptible + @KernelSpace + private final void processKdbInput(int input) { + switch ((char) input) { + case '?': + case 'h': + debug("Commands:\n"); + debug("l Show Load/Compile queue\n"); + debug("p Ping\n"); + debug("q Print thread queues\n"); + debug("r Print stacktraces of ready-queue\n"); + debug("t Print current thread\n"); + debug("v Verify thread\n"); + debug("w Print waiting threads\n"); + debug("W Print stacktraces of waiting threads\n"); + break; + case 'l': + debug("<load-compile-service: "); + debug("\n"); + LoadCompileService.showInfo(); + debug("/>\n"); + break; + case 'p': + debug("<ping/>"); + break; + case 'q': { + final VmThread currentThread = VmMagic.currentProcessor().currentThread; + debug("<queues: current-thread name='"); + debug(currentThread.getName()); + debug("' state='"); + debug(currentThread.getThreadStateName()); + debug("\n"); + vmScheduler.getReadyQueue().dump(false, null); + vmScheduler.getSleepQueue().dump(false, null); + debug("/>\n"); + break; + } + case 'r': + debug("<traces: "); + debug("\n"); + vmScheduler.getReadyQueue().dump(true, vmScheduler.getStackReader()); + debug("/>\n"); + break; + case 'v': + debug("<verify: "); + debug("\n"); + verifyThreads(); + debug("/>\n"); + break; + case 'w': + debug("<waiting: "); + debug("\n"); + dumpWaitingThreads(false, null); + debug("/>\n"); + break; + case 'W': + debug("<waiting: "); + debug("\n"); + dumpWaitingThreads(true, vmScheduler.getStackReader()); + debug("/>\n"); + break; + case 't': { + final VmThread currentThread = VmMagic.currentProcessor().currentThread; + debug("<currentthread name='"); + debug(currentThread.getName()); + debug("' state='"); + debug(currentThread.getThreadStateName()); + debug("'/>\n"); + break; + } + case 'T': { + final VmThread currentThread = VmMagic.currentProcessor().currentThread; + debug("<currentthread name='"); + debug(currentThread.getName()); + debug("' state='"); + debug(currentThread.getThreadStateName()); + vmScheduler.getStackReader().debugStackTrace(currentThread); + debug("'/>\n"); + break; + } + case '#': + debug("Halt for ever\n"); + while (true) + ; + + // default: + // debug(input); + } + } + + /** + * Dump the status of this queue on debug. + */ + @KernelSpace + private final void dumpWaitingThreads(boolean dumpStack, VmStackReader stackReader) { + VmThreadQueueEntry e = vmScheduler.getAllThreadsQueue().first; + while (e != null) { + if (e.thread.isWaiting()) { + debug(e.thread.getName()); + debug(" id0x"); + debug(e.thread.getId()); + debug(" s0x"); + debug(e.thread.getThreadState()); + debug(" p0x"); + debug(e.thread.priority); + debug(" wf:"); + VmThread waitFor = e.thread.getWaitForThread(); + debug((waitFor != null) ? waitFor.getName() : "none"); + debug("\n"); + if (dumpStack && (stackReader != null)) { + stackReader.debugStackTrace(e.thread); + debug("\n"); + } + } + e = e.next; + } + } + + /** + * Dump the status of this queue on debug. + */ + @KernelSpace + private final void verifyThreads() { + VmThreadQueueEntry e = vmScheduler.getAllThreadsQueue().first; + while (e != null) { + e.thread.verifyState(); + e = e.next; + } + } + + /** + * Print the given string to the output. + */ + @Inline + private final void debug(String str) { + Unsafe.debug(str); + } + + /** + * Print the given integer to the output. + */ + @Inline + private final void debug(int i) { + Unsafe.debug(i); + } + + /** + * Read a keystroke from the input. + */ + @Inline + private final int readKdbInput() { + return Unsafe.readKdbInput(); + } +} Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-16 13:47:45 UTC (rev 5652) +++ trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-16 14:26:53 UTC (rev 5653) @@ -124,6 +124,11 @@ private final VmScheduler scheduler; /** + * The kernel debugger that is used. + */ + private final KernelDebugger kernelDebugger; + + /** * The architecture of this processor. */ private final VmArchitecture architecture; @@ -228,6 +233,7 @@ this.me = this; this.architecture = architecture; this.scheduler = scheduler; + this.kernelDebugger = new KernelDebugger(scheduler); this.staticsTable = sharedStatics.getTable(); this.isolatedStatics = isolatedStatics; this.isolatedStaticsTable = isolatedStatics.getTable(); @@ -431,7 +437,7 @@ // Process kernel debugger data if (Unsafe.isKdbEnabled()) { - scheduler.processAllKdbInput(); + kernelDebugger.processAllKdbInput(); } // Dispatch interrupts if we already have an IRQ manager. Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java 2009-08-16 13:47:45 UTC (rev 5652) +++ trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java 2009-08-16 14:26:53 UTC (rev 5653) @@ -20,18 +20,17 @@ package org.jnode.vm.scheduler; -import org.jnode.vm.LoadCompileService; +import org.jnode.annotation.Inline; +import org.jnode.annotation.Internal; +import org.jnode.annotation.KernelSpace; +import org.jnode.annotation.MagicPermission; +import org.jnode.annotation.Uninterruptible; import org.jnode.vm.Unsafe; import org.jnode.vm.Vm; import org.jnode.vm.VmArchitecture; import org.jnode.vm.VmMagic; import org.jnode.vm.VmStackReader; import org.jnode.vm.VmSystem; -import org.jnode.annotation.Inline; -import org.jnode.annotation.Internal; -import org.jnode.annotation.KernelSpace; -import org.jnode.annotation.MagicPermission; -import org.jnode.annotation.Uninterruptible; /** * Thread scheduler. This scheduler is used by all processors in the system, so @@ -104,18 +103,6 @@ } /** - * Dump the status of this queue on Unsafe.debug. - */ - @KernelSpace - final void verifyThreads() { - VmThreadQueueEntry e = allThreadsQueue.first; - while (e != null) { - e.thread.verifyState(); - e = e.next; - } - } - - /** * Register a thread in the list of all live threads. * * @param thread @@ -167,34 +154,6 @@ } /** - * Dump the status of this queue on Unsafe.debug. - */ - @KernelSpace - final void dumpWaitingThreads(boolean dumpStack, VmStackReader stackReader) { - VmThreadQueueEntry e = allThreadsQueue.first; - while (e != null) { - if (e.thread.isWaiting()) { - Unsafe.debug(e.thread.getName()); - Unsafe.debug(" id0x"); - Unsafe.debug(e.thread.getId()); - Unsafe.debug(" s0x"); - Unsafe.debug(e.thread.getThreadState()); - Unsafe.debug(" p0x"); - Unsafe.debug(e.thread.priority); - Unsafe.debug(" wf:"); - VmThread waitFor = e.thread.getWaitForThread(); - Unsafe.debug((waitFor != null) ? waitFor.getName() : "none"); - Unsafe.debug("\n"); - if (dumpStack && (stackReader != null)) { - stackReader.debugStackTrace(e.thread); - Unsafe.debug("\n"); - } - } - e = e.next; - } - } - - /** * Add the given thread to the ready queue to the scheduler and remove it * from the sleep queue (if it still was on the sleep queue). * @@ -319,129 +278,52 @@ } /** - * Process all waiting KDB commands. + * Lock the queues for access by the current processor. */ - @Uninterruptible - @KernelSpace @Inline - final void processAllKdbInput() { - int ch; - while ((ch = Unsafe.readKdbInput()) >= 0) { - processKdbInput(ch); - } + @Uninterruptible + final void lock() { + queueLock.lock(); } /** - * Process the input from the kernel debugger. - * - * @param input - * @throws org.vmmagic.pragma.UninterruptiblePragma + * Unlock the queues. */ + @Inline @Uninterruptible - @KernelSpace - private final void processKdbInput(int input) { - switch ((char) input) { - case '?': - case 'h': - Unsafe.debug("Commands:\n"); - Unsafe.debug("l Show Load/Compile queue\n"); - Unsafe.debug("p Ping\n"); - Unsafe.debug("q Print thread queues\n"); - Unsafe.debug("r Print stacktraces of ready-queue\n"); - Unsafe.debug("t Print current thread\n"); - Unsafe.debug("v Verify thread\n"); - Unsafe.debug("w Print waiting threads\n"); - Unsafe.debug("W Print stacktraces of waiting threads\n"); - break; - case 'l': - Unsafe.debug("<load-compile-service: "); - Unsafe.debug("\n"); - LoadCompileService.showInfo(); - Unsafe.debug("/>\n"); - break; - case 'p': - Unsafe.debug("<ping/>"); - break; - case 'q': { - final VmThread currentThread = VmMagic.currentProcessor().currentThread; - Unsafe.debug("<queues: current-thread name='"); - Unsafe.debug(currentThread.getName()); - Unsafe.debug("' state='"); - Unsafe.debug(currentThread.getThreadStateName()); - Unsafe.debug("\n"); - readyQueue.dump(false, null); - sleepQueue.dump(false, null); - Unsafe.debug("/>\n"); - break; - } - case 'r': - Unsafe.debug("<traces: "); - Unsafe.debug("\n"); - readyQueue.dump(true, architecture.getStackReader()); - Unsafe.debug("/>\n"); - break; - case 'v': - Unsafe.debug("<verify: "); - Unsafe.debug("\n"); - verifyThreads(); - Unsafe.debug("/>\n"); - break; - case 'w': - Unsafe.debug("<waiting: "); - Unsafe.debug("\n"); - dumpWaitingThreads(false, null); - Unsafe.debug("/>\n"); - break; - case 'W': - Unsafe.debug("<waiting: "); - Unsafe.debug("\n"); - dumpWaitingThreads(true, architecture.getStackReader()); - Unsafe.debug("/>\n"); - break; - case 't': { - final VmThread currentThread = VmMagic.currentProcessor().currentThread; - Unsafe.debug("<currentthread name='"); - Unsafe.debug(currentThread.getName()); - Unsafe.debug("' state='"); - Unsafe.debug(currentThread.getThreadStateName()); - Unsafe.debug("'/>\n"); - break; - } - case 'T': { - final VmThread currentThread = VmMagic.currentProcessor().currentThread; - Unsafe.debug("<currentthread name='"); - Unsafe.debug(currentThread.getName()); - Unsafe.debug("' state='"); - Unsafe.debug(currentThread.getThreadStateName()); - architecture.getStackReader().debugStackTrace(currentThread); - Unsafe.debug("'/>\n"); - break; - } - case '#': - Unsafe.debug("Halt for ever\n"); - while (true) - ; + final void unlock() { + queueLock.unlock(); + } - // default: - // Unsafe.debug(input); - } + /** + * @return The queue containing all ready threads. + */ + @Inline + final VmThreadQueue.ScheduleQueue getReadyQueue() { + return readyQueue; } /** - * Lock the queues for access by the current processor. + * @return The queue containing all sleeping threads. */ @Inline - @Uninterruptible - final void lock() { - queueLock.lock(); + final VmThreadQueue.SleepQueue getSleepQueue() { + return sleepQueue; } /** - * Unlock the queues. + * @return The queue containing all threads. */ @Inline - @Uninterruptible - final void unlock() { - queueLock.unlock(); + final VmThreadQueue.AllThreadsQueue getAllThreadsQueue() { + return allThreadsQueue; } + + /** + * @return The {@link VmStackReader} from the current architecture. + */ + @Inline + final VmStackReader getStackReader() { + return architecture.getStackReader(); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-16 13:47:53
|
Revision: 5652 http://jnode.svn.sourceforge.net/jnode/?rev=5652&view=rev Author: fduminy Date: 2009-08-16 13:47:45 +0000 (Sun, 16 Aug 2009) Log Message: ----------- fixed comments & warnings in javadoc Modified Paths: -------------- trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-16 11:48:25 UTC (rev 5651) +++ trunk/core/src/core/org/jnode/vm/scheduler/VmProcessor.java 2009-08-16 13:47:45 UTC (rev 5652) @@ -64,27 +64,27 @@ private volatile Word threadSwitchIndicator; /** - * Reference to myself; used in assembly code + * Reference to myself; used in assembly code. */ final VmProcessor me; /** - * The current thread on this processor + * The current thread on this processor. */ protected volatile VmThread currentThread; /** - * The isolated statics table of the current thread (int[]) + * The isolated statics table of the current thread (int[]). */ private volatile Object isolatedStaticsTable; /** - * The isolated statics table of the current thread + * The isolated statics table of the current thread. */ private volatile VmIsolatedStatics isolatedStatics; /** - * The next thread to schedule on this processor + * The next thread to schedule on this processor. */ volatile VmThread nextThread; @@ -99,54 +99,54 @@ protected volatile Address kernelStackEnd; /** - * The identifier of this processor + * The identifier of this processor. */ private int id; /** - * The identifier of this processor as string + * The identifier of this processor as string. */ private String idString; /** - * IRQ manager for this processor + * IRQ manager for this processor. */ private IRQManager irqMgr; /** - * Address of threadSwitchIndicator + * Address of threadSwitchIndicator. */ private Address tsiAddress; /** - * The scheduler that is used + * The scheduler that is used. */ private final VmScheduler scheduler; /** - * The architecture of this processor + * The architecture of this processor. */ private final VmArchitecture architecture; /** - * The idle thread + * The idle thread. */ private IdleThread idleThread; private int lockCount; /** - * CPU identification + * CPU identification. */ private transient CpuID cpuId; /** - * The statics table (int[]) + * The statics table (int[]). */ private volatile Object staticsTable; /** - * The processor speed indication + * The processor speed indication. */ private float jnodeMips; @@ -155,12 +155,12 @@ private int sameThreadPriorityCount; /** - * The data specific to this processor used by the heap manager + * The data specific to this processor used by the heap manager. */ private final Object heapData; /** - * Per processor MathSupport memory structures + * Per processor MathSupport memory structures. */ private final MathSupport mathSupport = new MathSupport(); @@ -177,27 +177,27 @@ private final int[] compilerIds; /** - * Indicate the a thread switch is needed + * Indicate the a thread switch is needed. */ public static final int TSI_SWITCH_NEEDED = 0x0001; /** - * Indicate that the system is ready for thread switching + * Indicate that the system is ready for thread switching. */ public static final int TSI_SYSTEM_READY = 0x0002; /** - * Indicate the a thread switch is in progress + * Indicate the a thread switch is in progress. */ public static final int TSI_SWITCH_ACTIVE = 0x0004; /** - * Indicate the a thread switch cannot occur + * Indicate the a thread switch cannot occur. */ public static final int TSI_BLOCK_SWITCH = 0x0008; /** - * Indicate the a thread switch is requested + * Indicate the a thread switch is requested. */ public static final int TSI_SWITCH_REQUESTED = TSI_SWITCH_NEEDED | TSI_SYSTEM_READY; @@ -215,7 +215,7 @@ } /** - * Initialize this instance + * Initialize this instance. * * @param id * @param architecture @@ -256,7 +256,7 @@ } /** - * Gets the current thread on this processor + * Gets the current thread on this processor. * * @return The current thread on this processor * @throws org.vmmagic.pragma.UninterruptiblePragma @@ -298,7 +298,7 @@ } /** - * Create an ID string for the given id + * Create an ID string for the given id. * * @param id * @return the ID string @@ -501,14 +501,14 @@ } /** - * Create a new thread + * Create a new thread. * * @return The new thread */ protected abstract VmThread createThread(VmIsolatedStatics isolatedStatics); /** - * Create a new thread + * Create a new thread. * * @param javaThread * @return The new thread @@ -518,7 +518,7 @@ } /** - * Create a new thread + * Create a new thread. * * @param javaThread * @return The new thread @@ -536,7 +536,7 @@ protected abstract int[] getIrqCounters(); /** - * Mark the system are ready for thread switching + * Mark the system as ready for thread switching. */ @Internal public final void systemReadyForThreadSwitch() { @@ -548,8 +548,8 @@ } /** - * Gets the address of the threadSwitchIndicator field in this object. It is - * assumed the this field is the first field of this class! + * Gets the address of the threadSwitchIndicator field in this object. <b>It is + * assumed this field is the first field of this class!</b> * * @return The address of the thread switch indicator */ @@ -590,7 +590,7 @@ /** * Load the CPU id. * - * @param id The idenfication returned by Unsafe.getCpuID + * @param id The identification returned by Unsafe.getCpuID * @return CpuID */ protected abstract CpuID loadCPUID(int[] id); @@ -630,7 +630,7 @@ } /** - * Calculate the processor speed and delay loops. + * Calculate the processor speed in "JNodeMips" and delay loops. */ @Internal public final void calibrate() { @@ -643,7 +643,7 @@ /** * Gets the processor speed indication. * - * @return the notional processor speed. + * @return the processor speed in "JNodeMips". */ public final float getJNodeMips() { return jnodeMips; Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java =================================================================== --- trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java 2009-08-16 11:48:25 UTC (rev 5651) +++ trunk/core/src/core/org/jnode/vm/scheduler/VmScheduler.java 2009-08-16 13:47:45 UTC (rev 5652) @@ -43,32 +43,32 @@ public final class VmScheduler { /** - * Reference to current architecture + * Reference to current architecture. */ private final VmArchitecture architecture; /** - * Lock for the allThreadsQueue + * Lock for the allThreadsQueue. */ private final ProcessorLock allThreadsLock; /** - * Queue holding all threads + * Queue holding all threads. */ private final VmThreadQueue.AllThreadsQueue allThreadsQueue; /** - * My ready queue + * My ready queue. */ private final VmThreadQueue.ScheduleQueue readyQueue; /** - * My sleep queue + * My sleep queue. */ private final VmThreadQueue.SleepQueue sleepQueue; /** - * Lock used to protect the ready and sleep queue + * Lock used to protect the ready and sleep queue. */ private final ProcessorLock queueLock; @@ -196,7 +196,7 @@ /** * Add the given thread to the ready queue to the scheduler and remove it - * from the sleep queue (if it still was on the sleep queue) + * from the sleep queue (if it still was on the sleep queue). * * @param thread * @param ignorePriority If true, the thread is always added to the back of the list, @@ -437,7 +437,7 @@ } /** - * Unlock the queues + * Unlock the queues. */ @Inline @Uninterruptible This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |