Menu
▾
▴
jnode-svn-commits
|
From: <ls...@us...> - 2009-04-11 09:22:13
|
Revision: 5243
http://jnode.svn.sourceforge.net/jnode/?rev=5243&view=rev
Author: lsantha
Date: 2009-04-11 09:22:10 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Removing non-classlib classes.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/all/lib/jnode.xml
Removed Paths:
-------------
classlib6/builder/src/builder/org/jnode/build/BootDiskBuilder.java
classlib6/builder/src/builder/org/jnode/build/BootFloppyBuilder.java
classlib6/builder/src/configure/
classlib6/distr/
classlib6/fs/
classlib6/gui/
classlib6/net/
classlib6/shell/
classlib6/sound/
classlib6/textui/
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2009-04-11 07:29:01 UTC (rev 5242)
+++ classlib6/all/build.xml 2009-04-11 09:22:10 UTC (rev 5243)
@@ -1,4 +1,4 @@
-<project name="JNode" default="help" basedir=".">
+<project name="JNode" default="assemble-plugins" basedir=".">
<!-- if task is used from this -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
<!-- before including jnode.xml, we must set this property -->
@@ -371,35 +371,6 @@
<ant antfile="build-jop.xml" inheritall="on" inheritrefs="on"/>
</target>
- <!-- Build the boot files for windows NT/2K/XP (with NTLDR) -->
- <target name="boot-files-winNT" depends="assemble">
- <x86-build bits="32" target="boot-files-winNT"/>
- </target>
-
- <!-- Create a bootable CDROM image containing all x86 bootable images and the sources -->
- <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"/>
- <!-- 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" 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>
-
<!-- Upload a distribution -->
<target name="upload">
<property name="upload.dir" value="${build.dir}/upload"/>
@@ -922,90 +893,7 @@
</target>
- <target name="checkstyle" description="check the mandatory code conventions">
- <taskdef resource="checkstyletask.properties" classpath="../core/lib/checkstyle-all-4.4.jar"/>
- <checkstyle config="jnode_checks.xml">
- <fileset dir="../builder/src/builder" includes="**/*.java"/>
- <fileset dir="../builder/src/configure" includes="**/*.java"/>
- <fileset dir="../core/src/core" includes="**/*.java"/>
- <fileset dir="../core/src/driver" includes="**/*.java"/>
- <fileset dir="../core/src/test" includes="**/*.java"/>
- <fileset dir="../distr/src/apps" includes="**/*.java"/>
- <fileset dir="../distr/src/emu" includes="**/*.java"/>
- <fileset dir="../distr/src/install" includes="**/*.java"/>
- <fileset dir="../distr/src/test" includes="**/*.java"/>
- <fileset dir="../fs/src/fs" includes="**/*.java"/>
- <fileset dir="../fs/src/driver" includes="**/*.java"/>
- <fileset dir="../fs/src/test" includes="**/*.java"/>
- <fileset dir="../gui/src/test" includes="**/*.java"/>
- <fileset dir="../gui/src/desktop" includes="**/*.java"/>
- <fileset dir="../gui/src/driver" includes="**/*.java"/>
- <fileset dir="../gui/src/awt" includes="**/*.java"/>
- <fileset dir="../net/src/net" includes="**/*.java"/>
- <fileset dir="../net/src/driver" includes="**/*.java"/>
- <fileset dir="../net/src/test" includes="**/*.java"/>
- <fileset dir="../shell/src/test" includes="**/*.java"/>
- <fileset dir="../shell/src/shell" includes="**/*.java"/>
- </checkstyle>
- </target>
- <target name="checkstyle-new" description="check the recommanded code conventions">
- <taskdef resource="checkstyletask.properties" classpath="../core/lib/checkstyle-all-4.4.jar"/>
- <checkstyle config="new_checks.xml">
- <!--
- <fileset dir="../builder/src/builder" includes="**/*.java"/>
- <fileset dir="../builder/src/configure" includes="**/*.java"/>
- <fileset dir="../core/src/core" includes="**/*.java"/>
- <fileset dir="../core/src/driver" includes="**/*.java"/>
- <fileset dir="../core/src/test" includes="**/*.java"/>
- -->
- <fileset dir="../distr/src/apps" includes="**/*.java"/>
- <fileset dir="../distr/src/emu" includes="**/*.java"/>
- <fileset dir="../distr/src/install" includes="**/*.java"/>
- <fileset dir="../distr/src/test" includes="**/*.java"/>
- <!--
- <fileset dir="../fs/src/fs" includes="**/*.java"/>
- <fileset dir="../fs/src/driver" includes="**/*.java"/>
- <fileset dir="../fs/src/test" includes="**/*.java"/>
- <fileset dir="../gui/src/test" includes="**/*.java"/>
- <fileset dir="../gui/src/desktop" includes="**/*.java"/>
- <fileset dir="../gui/src/driver" includes="**/*.java"/>
- <fileset dir="../gui/src/awt" includes="**/*.java"/>
- <fileset dir="../net/src/net" includes="**/*.java"/>
- <fileset dir="../net/src/driver" includes="**/*.java"/>
- <fileset dir="../net/src/test" includes="**/*.java"/>
- <fileset dir="../shell/src/test" includes="**/*.java"/>
- <fileset dir="../shell/src/shell" includes="**/*.java"/>
- -->
- </checkstyle>
- </target>
-
- <target name="findbugs" depends="assemble-plugins">
- <taskdef name="findbugs" classpath="../core/lib/findbugs/lib/findbugs-ant.jar"
- classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
- <findbugs home="../core/lib/findbugs/" output="html" outputFile="./build/findbugs.html" >
- <auxclasspath>
- <pathelement location="./build/plugins/rt_${jnode-ver}.jar" />
- <pathelement location="./build/plugins/org.classpath.ext.core_${jnode-ver}.jar" />
- <pathelement location="./build/plugins/nanoxml_1.4.jar" />
- <pathelement location="${nanoxml-java.jar}" />
- <pathelement location="${log4j.jar}" />
- </auxclasspath>
- <sourcepath>
- <pathelement path="../core/src/core/"/>
- </sourcepath>
- <class location="./build/plugins/org.jnode.vm_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.vm.core_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.vm.memmgr.def_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.driver_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.runtime_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.runtime.core_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.util_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.work_${jnode-ver}.jar"/>
- <class location="./build/plugins/org.jnode.security_${jnode-ver}.jar"/>
- </findbugs>
- </target>
-
<!-- Create a patch -->
<!-- TODO create replacement SVN task
<target name="create-patch">
Modified: classlib6/all/lib/jnode.xml
===================================================================
--- classlib6/all/lib/jnode.xml 2009-04-11 07:29:01 UTC (rev 5242)
+++ classlib6/all/lib/jnode.xml 2009-04-11 09:22:10 UTC (rev 5243)
@@ -63,13 +63,7 @@
<attribute name="target"/>
<sequential>
<ant target="@{target}" dir="${root.dir}/core" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/shell" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/net" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/fs" inheritall="on" inheritrefs="on" />
<ant target="@{target}" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/gui" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/textui" inheritall="on" inheritrefs="on" />
- <ant target="@{target}" dir="${root.dir}/distr" inheritall="on" inheritrefs="on" />
</sequential>
</macrodef>
Deleted: classlib6/builder/src/builder/org/jnode/build/BootDiskBuilder.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/build/BootDiskBuilder.java 2009-04-11 07:29:01 UTC (rev 5242)
+++ classlib6/builder/src/builder/org/jnode/build/BootDiskBuilder.java 2009-04-11 09:22:10 UTC (rev 5243)
@@ -1,189 +0,0 @@
-/*
- * $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.build;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.StringTokenizer;
-import org.apache.tools.ant.Project;
-import org.jnode.driver.ApiNotFoundException;
-import org.jnode.driver.Device;
-import org.jnode.driver.DriverException;
-import org.jnode.driver.block.BlockDeviceAPI;
-import org.jnode.driver.block.Geometry;
-import org.jnode.driver.block.MappedFSBlockDeviceSupport;
-import org.jnode.fs.FileSystemException;
-import org.jnode.fs.fat.FatType;
-import org.jnode.fs.fat.GrubBootSector;
-import org.jnode.fs.fat.GrubFatFormatter;
-import org.jnode.partitions.ibm.IBMPartitionTableEntry;
-import org.jnode.partitions.ibm.IBMPartitionTypes;
-
-/**
- * @author Ewout Prangsma (ep...@us...)
- */
-public class BootDiskBuilder extends BootFloppyBuilder {
-
- private File plnFile;
-
- int bytesPerSector = 512;
-
- int spc = 1;
-
- private Geometry geom = new Geometry(64, 16, 32);
-
- private MappedFSBlockDeviceSupport part0;
-
- public BootDiskBuilder() {
- }
-
- /**
- * Create the actual bootfloppy.
- *
- * @throws IOException
- * @throws DriverException
- * @throws FileSystemException
- */
- public void createImage() throws IOException, DriverException,
- FileSystemException {
- super.createImage();
-
- FileWriter fw = new FileWriter(plnFile);
- PrintWriter pw = new PrintWriter(fw);
- pw.println("DRIVETYPE ide");
- pw.println("CYLINDERS " + geom.getCylinders());
- pw.println("HEADS " + geom.getHeads());
- pw.println("SECTORS " + geom.getSectors());
- pw.println("CAPACITY " + geom.getTotalSectors());
- pw.println("ACCESS \"" + getDestFile().getCanonicalPath()
- + "\" 0 102400");
- pw.flush();
- fw.flush();
- pw.close();
- fw.close();
- System.out.println("Wrote " + plnFile);
- }
-
- /**
- * Format the given device.
- *
- * @param device
- * @throws IOException
- */
- protected void formatDevice(Device device) throws IOException {
-
- /* Format the MBR & partitiontable */
- GrubBootSector mbr = (GrubBootSector) (createFormatter()
- .getBootSector());
-
- IBMPartitionTableEntry pte = mbr.initPartitions(geom, IBMPartitionTypes.PARTTYPE_DOS_FAT16_LT32M);
-
- /*
- * System.out.println("partition table:"); for (int i = 0; i < 4; i++) {
- * System.out.println("" + i + " " + mbr.getPartition(i)); }
- */
-
- /* Format partition 0 */
- part0 = new MappedFSBlockDeviceSupport(device, pte.getStartLba()
- * bytesPerSector, pte.getNrSectors() * bytesPerSector);
- GrubFatFormatter ff = createFormatter();
- ff.setInstallPartition(0x0000FFFF);
- ff.format(part0);
- GrubBootSector part0bs = (GrubBootSector) ff.getBootSector();
-
- /* Fixup stage2 sector in MBR */
- mbr.setStage2Sector(pte.getStartLba() + part0bs.getStage2Sector());
- try {
- mbr.write(device.getAPI(BlockDeviceAPI.class));
- } catch (ApiNotFoundException ex) {
- final IOException ioe = new IOException("BlockDeviceAPI not found on device");
- ioe.initCause(ex);
- throw ioe;
- }
- //System.out.println("mbr stage2 sector=" + mbr.getStage2Sector());
- }
-
- /**
- * @return The formatter
- * @throws IOException
- * @see org.jnode.build.BootFloppyBuilder#createFormatter()
- */
- protected GrubFatFormatter createFormatter() throws IOException {
- return new GrubFatFormatter(bytesPerSector, spc, geom, FatType.FAT16, 1,
- getStage1ResourceName(), getStage2ResourceName());
- }
-
- /**
- * @return The device length
- * @see org.jnode.build.BootFloppyBuilder#getDeviceLength()
- */
- protected long getDeviceLength() {
- return geom.getTotalSectors() * bytesPerSector;
- }
-
- /**
- * @return File
- */
- public File getPlnFile() {
- return plnFile;
- }
-
- /**
- * Sets the plnFile.
- *
- * @param plnFile The plnFile to set
- */
- public void setPlnFile(File plnFile) {
- this.plnFile = plnFile;
- }
-
- /**
- * @param rootDevice
- * @return The device
- * @see org.jnode.build.BootFloppyBuilder#getSystemDevice(Device)
- */
- protected Device getSystemDevice(Device rootDevice) {
- return part0;
- }
-
- /**
- * Used by ant to set the geometry property.
- *
- * @param geometryString String in the format 'cylinder/heads/sectors',
- * e.g. '64/16/32'.
- */
- public void setGeometry(String geometryString) {
- try {
- log("Setting bootdisk geometry to " + geometryString, Project.MSG_VERBOSE);
- StringTokenizer tokenizer = new StringTokenizer(geometryString, "/");
- geom = new Geometry(Integer.parseInt(tokenizer.nextToken()),
- Integer.parseInt(tokenizer.nextToken()), Integer
- .parseInt(tokenizer.nextToken()));
- } catch (Exception e) {
- throw new IllegalArgumentException(
- "Invalid geometry "
- + geometryString
- + ". Must correspond to pattern '<cylinders>/<heads>/<sectors>' e.g. '64/16/32'.");
- }
- }
-}
Deleted: classlib6/builder/src/builder/org/jnode/build/BootFloppyBuilder.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/build/BootFloppyBuilder.java 2009-04-11 07:29:01 UTC (rev 5242)
+++ classlib6/builder/src/builder/org/jnode/build/BootFloppyBuilder.java 2009-04-11 09:22:10 UTC (rev 5243)
@@ -1,333 +0,0 @@
-/*
- * $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.build;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-import org.jnode.driver.ApiNotFoundException;
-import org.jnode.driver.Device;
-import org.jnode.driver.DriverException;
-import org.jnode.driver.block.BlockDeviceAPI;
-import org.jnode.driver.block.FileDevice;
-import org.jnode.fs.FSDirectory;
-import org.jnode.fs.FSEntry;
-import org.jnode.fs.FSFile;
-import org.jnode.fs.FileSystemException;
-import org.jnode.fs.fat.FatFileSystem;
-import org.jnode.fs.fat.FatFileSystemType;
-import org.jnode.fs.fat.GrubFatFormatter;
-import org.jnode.util.FileUtils;
-
-/**
- * Builder for the boot floppy (in fact, it's not a floppy but a cdrom image in the iso format).
- *
- * @author epr
- */
-public class BootFloppyBuilder extends Task {
-
- private File destFile;
-
- private String stage1ResourceName;
-
- private String stage2ResourceName;
-
- private ArrayList<FileSet> fileSets = new ArrayList<FileSet>();
-
- /**
- * Build the boot floppy.
- *
- * @throws BuildException
- */
- public void execute() throws BuildException {
-
- try {
- if (isExecuteNeeded()) {
- createImage();
- }
- } catch (Throwable ex) {
- ex.printStackTrace(System.err);
- throw new BuildException(ex);
- }
- }
-
- protected boolean isExecuteNeeded() {
- final long lmDest = destFile.lastModified();
- return (getLastModified() > lmDest);
- }
-
- /**
- * Create the actual bootfloppy.
- *
- * @throws IOException
- * @throws DriverException
- * @throws FileSystemException
- */
- public void createImage() throws IOException, DriverException,
- FileSystemException {
-
- final FileDevice newFd = new FileDevice(destFile, "rw");
- try {
- newFd.setLength(getDeviceLength());
- formatDevice(newFd);
- final Device sysDev = getSystemDevice(newFd);
- final BlockDeviceAPI sysDevApi = sysDev
- .getAPI(BlockDeviceAPI.class);
- copySystemFiles(sysDev);
- sysDevApi.flush();
- } catch (ApiNotFoundException ex) {
- final IOException ioe = new IOException("BlockDeviceAPI not found on device");
- ioe.initCause(ex);
- throw ioe;
- } finally {
- newFd.close();
- }
- }
-
- /**
- * Format the given device.
- *
- * @param dev
- * @throws IOException
- */
- protected void formatDevice(Device dev) throws IOException {
- GrubFatFormatter ff = createFormatter();
- try {
- ff.format(dev.getAPI(BlockDeviceAPI.class));
- } catch (ApiNotFoundException ex) {
- final IOException ioe = new IOException("BlockDeviceAPI not found on device");
- ioe.initCause(ex);
- throw ioe;
- }
- }
-
- /**
- * Gets the device the system files must be copied onto. This enabled a
- * disk to be formatted with partitions.
- *
- * @param rootDevice
- * @return BlockDevice
- */
- protected Device getSystemDevice(Device rootDevice) {
- return rootDevice;
- }
-
- /**
- * Copy the system files to the given device.
- *
- * @param device
- * @throws IOException
- * @throws FileSystemException
- */
- protected void copySystemFiles(Device device) throws IOException,
- FileSystemException {
- final FatFileSystem fs = new FatFileSystem(device, false, new FatFileSystemType());
-
- for (FileSet fset : fileSets) {
- processFileSet(fs, fset);
- }
-
- fs.close();
- }
-
- private void processFileSet(FatFileSystem fs, FileSet fset) throws IOException {
- final DirectoryScanner ds = fset.getDirectoryScanner(getProject());
- final String[] dirs = ds.getIncludedDirectories();
- for (int i = 0; i < dirs.length; i++) {
- getOrCreateDir(fs, dirs[i]);
- }
- final String[] files = ds.getIncludedFiles();
- for (int i = 0; i < files.length; i++) {
- final String fn = files[i];
- final int idx = fn.lastIndexOf(File.separatorChar);
- final FSDirectory dir;
- final String name;
- if (idx >= 0) {
- dir = getOrCreateDir(fs, fn.substring(0, idx));
- name = fn.substring(idx + 1);
- } else {
- dir = getOrCreateDir(fs, "");
- name = fn;
- }
- final File f = new File(ds.getBasedir(), fn);
- addFile(dir, f, name);
- }
- }
-
- /**
- * Gets the last modification date of all parameters.
- *
- * @return
- */
- protected long getLastModified() {
- long lm = 0l;
- for (FileSet fset : fileSets) {
- lm = Math.max(lm, getLastModified(fset));
- }
- return lm;
- }
-
- private long getLastModified(FileSet fset) {
- final DirectoryScanner ds = fset.getDirectoryScanner(getProject());
- final File baseDir = ds.getBasedir();
- long lm = 0l;
- final String[] dirs = ds.getIncludedDirectories();
- for (int i = 0; i < dirs.length; i++) {
- lm = Math.max(lm, new File(baseDir, dirs[i]).lastModified());
- }
- final String[] files = ds.getIncludedFiles();
- for (int i = 0; i < files.length; i++) {
- lm = Math.max(lm, new File(baseDir, files[i]).lastModified());
- }
- return lm;
-
- }
-
- private FSDirectory getOrCreateDir(FatFileSystem fs, String dirName)
- throws IOException {
- FSDirectory dir = fs.getRootDir();
- while (dirName.length() > 0) {
- final int idx = dirName.indexOf(File.separatorChar);
- final String part;
- if (idx >= 0) {
- part = dirName.substring(0, idx);
- dirName = dirName.substring(idx + 1);
- } else {
- part = dirName;
- dirName = "";
- }
- FSEntry entry;
- try {
- entry = dir.getEntry(part);
- } catch (IOException ex) {
- // Ignore
- entry = null;
- }
- if (entry == null) {
- entry = dir.addDirectory(part);
- }
- dir = entry.getDirectory();
- }
- return dir;
- }
-
- /**
- * Add a given file to a given directory with a given filename.
- *
- * @param dir
- * @param src
- * @param fname
- * @throws IOException
- */
- private void addFile(FSDirectory dir, File src, String fname)
- throws IOException {
-
- long size = src.length();
- /*
- * log.info( "Adding " + src + " as " + fname + " size " + (size /
- * 1024) + "Kb");
- */
-
- //final byte[] buf = new byte[ (int) size];
- final ByteBuffer buf = ByteBuffer.allocate((int) size);
- InputStream is = new FileInputStream(src);
- FileUtils.copy(is, buf.array());
- is.close();
-
- final FSFile fh = dir.addFile(fname).getFile();
- fh.setLength(size);
- //fh.write(0, buf, 0, buf.length);
- fh.write(0, buf);
-
- log("Added " + src + " as " + fname + " size " + (size / 1024) + "Kb");
- }
-
- /**
- * Returns the destFile.
- *
- * @return File
- */
- public File getDestFile() {
- return destFile;
- }
-
- /**
- * Sets the destFile.
- *
- * @param destFile The destFile to set
- */
- public void setDestFile(File destFile) {
- this.destFile = destFile;
- }
-
- protected GrubFatFormatter createFormatter() throws IOException {
- return new GrubFatFormatter(0, stage1ResourceName, stage2ResourceName);
- }
-
- protected long getDeviceLength() {
- return 1440 * 1024;
- }
-
- /**
- * @return Returns the stage1ResourceName.
- */
- public final String getStage1ResourceName() {
- return this.stage1ResourceName;
- }
-
- /**
- * @param stage1ResourceName The stage1ResourceName to set.
- */
- public final void setStage1ResourceName(String stage1ResourceName) {
- this.stage1ResourceName = stage1ResourceName;
- }
-
- /**
- * @return Returns the stage2ResourceName.
- */
- public final String getStage2ResourceName() {
- return this.stage2ResourceName;
- }
-
- /**
- * @param stage2ResourceName The stage2ResourceName to set.
- */
- public final void setStage2ResourceName(String stage2ResourceName) {
- this.stage2ResourceName = stage2ResourceName;
- }
-
- /**
- * Add a fileset to this task.
- *
- * @return
- */
- public FileSet createFileset() {
- final FileSet fs = new FileSet();
- fileSets.add(fs);
- return fs;
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-04-11 11:08:29
|
Revision: 5244
http://jnode.svn.sourceforge.net/jnode/?rev=5244&view=rev
Author: lsantha
Date: 2009-04-11 11:08:25 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Fixed build problem and project files.
Modified Paths:
--------------
classlib6/JNode.ipr
classlib6/builder/build.xml
classlib6/builder/builder.iml
classlib6/jnode.iml
Modified: classlib6/JNode.ipr
===================================================================
--- classlib6/JNode.ipr 2009-04-11 09:22:10 UTC (rev 5243)
+++ classlib6/JNode.ipr 2009-04-11 11:08:25 UTC (rev 5244)
@@ -352,21 +352,14 @@
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectKey">
- <option name="state" value="https://jnode.svn.sourceforge.net/svnroot/jnode/trunk/JNode.ipr" />
+ <option name="state" value="https://jnode.svn.sourceforge.net/svnroot/jnode/classlib6/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$/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" />
- <module fileurl="file://$PROJECT_DIR$/gui/gui.iml" filepath="$PROJECT_DIR$/gui/gui.iml" />
<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" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 - jnode" project-jdk-type="JavaSDK" />
Modified: classlib6/builder/build.xml
===================================================================
--- classlib6/builder/build.xml 2009-04-11 09:22:10 UTC (rev 5243)
+++ classlib6/builder/build.xml 2009-04-11 11:08:25 UTC (rev 5244)
@@ -88,7 +88,6 @@
<target name="compile" depends="native2ascii">
<jnode.compile>
<src path="${my-src.dir}/builder"/>
- <src path="${my-src.dir}/configure"/>
<src path="${my-gen.dir}"/>
<classpath refid="my-cp"/>
</jnode.compile>
Modified: classlib6/builder/builder.iml
===================================================================
--- classlib6/builder/builder.iml 2009-04-11 09:22:10 UTC (rev 5243)
+++ classlib6/builder/builder.iml 2009-04-11 11:08:25 UTC (rev 5244)
@@ -111,7 +111,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="fs" />
<orderEntry type="module-library">
<library>
<CLASSES>
Modified: classlib6/jnode.iml
===================================================================
--- classlib6/jnode.iml 2009-04-11 09:22:10 UTC (rev 5243)
+++ classlib6/jnode.iml 2009-04-11 11:08:25 UTC (rev 5244)
@@ -8,13 +8,7 @@
<excludeFolder url="file://$MODULE_DIR$/all" />
<excludeFolder url="file://$MODULE_DIR$/builder" />
<excludeFolder url="file://$MODULE_DIR$/core" />
- <excludeFolder url="file://$MODULE_DIR$/distr" />
<excludeFolder url="file://$MODULE_DIR$/docs" />
- <excludeFolder url="file://$MODULE_DIR$/fs" />
- <excludeFolder url="file://$MODULE_DIR$/gui" />
- <excludeFolder url="file://$MODULE_DIR$/net" />
- <excludeFolder url="file://$MODULE_DIR$/shell" />
- <excludeFolder url="file://$MODULE_DIR$/textui" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-04-11 13:57:52
|
Revision: 5245
http://jnode.svn.sourceforge.net/jnode/?rev=5245&view=rev
Author: lsantha
Date: 2009-04-11 13:57:39 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Removing non-classlib classes.
Modified Paths:
--------------
classlib6/builder/build.xml
classlib6/core/build.xml
classlib6/core/src/core/org/jnode/vm/VmSystem.java
Removed Paths:
-------------
classlib6/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java
classlib6/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.java
classlib6/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
classlib6/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
classlib6/builder/src/builder/org/jnode/build/AbstractPluginsTask.java
classlib6/builder/src/builder/org/jnode/build/AddressFinder.java
classlib6/builder/src/builder/org/jnode/build/BuildObjectResolver.java
classlib6/builder/src/builder/org/jnode/build/FieldInfo.java
classlib6/builder/src/builder/org/jnode/build/InitJarBuilder.java
classlib6/builder/src/builder/org/jnode/build/InitJarsBuilder.java
classlib6/builder/src/builder/org/jnode/build/ObjectEmitter.java
classlib6/builder/src/builder/org/jnode/build/PluginList.java
classlib6/builder/src/builder/org/jnode/build/dependencies/
classlib6/builder/src/builder/org/jnode/build/documentation/
classlib6/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java
classlib6/builder/src/builder/org/jnode/build/x86/
classlib6/builder/src/builder/org/jnode/jnasm/
classlib6/builder/src/builder/org/jnode/linker/
classlib6/builder/src/builder/org/jnode/pluginlist/
classlib6/core/descriptors/org.jnode.vm.memmgr.mmtk.genrc.xml
classlib6/core/descriptors/org.jnode.vm.memmgr.mmtk.ms.xml
classlib6/core/descriptors/org.jnode.vm.memmgr.mmtk.nogc.xml
classlib6/core/src/core/org/jnode/debugger/
classlib6/core/src/core/org/jnode/log4j/config/
classlib6/core/src/core/org/jnode/security/JNodeSecurityManager.java
classlib6/core/src/core/org/jnode/security/SecurityPlugin.java
classlib6/core/src/template/
Modified: classlib6/builder/build.xml
===================================================================
--- classlib6/builder/build.xml 2009-04-11 11:08:25 UTC (rev 5244)
+++ classlib6/builder/build.xml 2009-04-11 13:57:39 UTC (rev 5245)
@@ -54,38 +54,8 @@
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">
- <native2ascii src="${jnasm-preprocessor-gen.dir}" includes="JNAsmPP.java"
- dest="${jnasm-preprocessor-gen.dir}" ext=".tmp"/>
- <move file="${jnasm-preprocessor-gen.dir}/JNAsmPP.tmp"
- tofile="${jnasm-preprocessor-gen.dir}/JNAsmPP.java" overwrite="yes"/>
- <native2ascii src="${jnasm-assembler-gen.dir}" includes="JNAsm.java"
- dest="${jnasm-assembler-gen.dir}" ext=".tmp"/>
- <move file="${jnasm-assembler-gen.dir}/JNAsm.tmp"
- tofile="${jnasm-assembler-gen.dir}/JNAsm.java" overwrite="yes"/>
- </target>
-
<!-- Compile all subproject java files -->
- <target name="compile" depends="native2ascii">
+ <target name="compile" depends="prepare">
<jnode.compile>
<src path="${my-src.dir}/builder"/>
<src path="${my-gen.dir}"/>
Deleted: classlib6/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java 2009-04-11 11:08:25 UTC (rev 5244)
+++ classlib6/builder/src/builder/org/jnode/ant/taskdefs/Native2AsciiTask.java 2009-04-11 13:57:39 UTC (rev 5245)
@@ -1,88 +0,0 @@
-/*
- * $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.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.Execute;
-
-/**
- * @author Ewout Prangsma (ep...@us...)
- */
-public class Native2AsciiTask extends FileSetTask {
-
- private boolean update = false;
-
- public final boolean isUpdate() {
- return update;
- }
-
- @Override
- protected void processFile(File file) throws IOException {
- if (containsNonAscii(file)) {
- final File tmp = File.createTempFile("jnode", "n2a");
- try {
- final String[] cmd = {"native2ascii", file.getAbsolutePath(),
- tmp.getAbsolutePath()};
- final Execute exe = new Execute();
- exe.setCommandline(cmd);
- final int rc = exe.execute();
- if (rc != 0) {
- throw new BuildException("native2ascii failed");
- }
- if (file.length() != tmp.length()) {
- // We have a changed file
- if (update) {
- getProject().copyFile(tmp, file);
- log("Updated " + file);
- } else {
- log("Update needed " + file);
- }
- }
- } finally {
- tmp.delete();
- }
- }
- }
-
- private boolean containsNonAscii(File file) throws IOException {
- final FileInputStream is = new FileInputStream(file);
- try {
- final BufferedInputStream bis = new BufferedInputStream(is);
- int v;
- while ((v = bis.read()) >= 0) {
- if ((v & 0xFF) > 128) {
- return true;
- }
- }
- return false;
- } finally {
- is.close();
- }
- }
-
- public final void setUpdate(boolean update) {
- this.update = update;
- }
-}
Deleted: classlib6/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.java 2009-04-11 11:08:25 UTC (rev 5244)
+++ classlib6/builder/src/builder/org/jnode/ant/taskdefs/NativeCheckTask.java 2009-04-11 13:57:39 UTC (rev 5245)
@@ -1,294 +0,0 @@
-/*
- * $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.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import org.apache.tools.ant.BuildException;
-import org.jnode.vm.VmUtils;
-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.CodeVisitor;
-import org.objectweb.asm.attrs.Attributes;
-
-/**
- * That ant task will check that native methods are properly implemented
- * for JNode.
- *
- * @author Fabien DUMINY (fduminy at jnode.org)
- */
-public class NativeCheckTask extends FileSetTask {
- /**
- * potential implementation of the native methods for JNode.
- * key: className (String)
- * value: native methods for the class (List<NativeMethod>)
- */
- private Map<String, List<NativeMethod>> jnodeNativeMethods = new HashMap<String, List<NativeMethod>>();
-
- /**
- * native methods per class.
- * key: className (String)
- * value: native methods for the class (List<NativeMethod>)
- */
- private Map<String, List<NativeMethod>> nativeMethods = new HashMap<String, List<NativeMethod>>();
-
- private Set<String> missingClasses = new TreeSet<String>();
- private Map<String, List<NativeMethod>> missingMethods = new HashMap<String, List<NativeMethod>>();
-
- protected void doExecute() throws BuildException {
- // process all classes to find native methods
- // and classes that could potentially implement native methods
- // for JNode
- processFiles();
-
- // now, check all native methods are properly implemented
- // for JNode
- int nbNativeMethods = 0;
- for (String className : nativeMethods.keySet()) {
- List<NativeMethod> methods = nativeMethods.get(className);
- for (NativeMethod method : methods) {
- nbNativeMethods++;
- checkNativeMethod(className, method);
- }
- }
-
- // report
- final String INDENT = " ";
-
- int nbMissingClasses = missingClasses.size();
- if (!missingClasses.isEmpty()) {
- System.err.println("Missing classes:");
- for (String missingClass : missingClasses) {
- System.err.println(INDENT + missingClass);
- }
- }
-
- int nbMissingMethods = 0;
- if (!missingMethods.isEmpty()) {
- System.err.println("Missing methods:");
- for (String cls : missingMethods.keySet()) {
- System.err.println(INDENT + " class " + cls);
- for (NativeMethod m : missingMethods.get(cls)) {
- System.err.println(INDENT + INDENT + m.getName());
- nbMissingMethods++;
- }
- }
- }
-
- System.out.println("Found " + nbNativeMethods + " native methods in " + nativeMethods.size() + " classes");
- if ((nbMissingMethods != 0) || (nbMissingClasses != 0)) {
- System.err.println(missingClasses.size() + " missing classes. " + nbMissingMethods + " missing methods");
-
- String message = "Some native methods are not properly implemented (see errors above)";
- if (failOnError) {
- throw new BuildException(message);
- } else {
- System.err.println("[FAILED] " + message);
- }
- } else {
- System.out.println("[OK] All native methods are properly defined");
- }
- }
-
- private boolean checkNativeMethod(String className, NativeMethod method) {
- boolean hasError = false;
- String jnodeNativeClass = VmUtils.getNativeClassName(className.replace('/', '.'));
-
- if (jnodeNativeMethods.containsKey(jnodeNativeClass)) {
- List<NativeMethod> methods = jnodeNativeMethods.get(jnodeNativeClass);
- boolean found = false;
- for (NativeMethod nvMethod : methods) {
- if (method.getName().equals(nvMethod.getName())) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- List<NativeMethod> methodList = missingMethods.get(jnodeNativeClass);
- if (methodList == null) {
- methodList = new ArrayList<NativeMethod>();
- missingMethods.put(jnodeNativeClass, methodList);
- }
-
- methodList.add(method);
- hasError = true;
- }
- } else {
- missingClasses.add(jnodeNativeClass);
- hasError = true;
- }
-
- return hasError;
- }
-
- @Override
- protected void processFile(File file) throws IOException {
- FileInputStream fis = null;
-
- try {
- fis = new FileInputStream(file);
- NativeMethodClassVisitor v = getNativeMethods(file, fis);
- if ((v != null) && !v.getNativeMethods().isEmpty()) {
- if (v.couldImplementNativeMethods()) {
- jnodeNativeMethods.put(v.getClassName(), v.getNativeMethods());
- } else {
- nativeMethods.put(v.getClassName(), v.getNativeMethods());
- }
- }
- } finally {
- if (fis != null) {
- fis.close();
- }
- }
- }
-
- private NativeMethodClassVisitor getNativeMethods(File file, InputStream inputClass) throws BuildException {
- ClassWriter cw = new ClassWriter(false);
- NativeMethodClassVisitor v = null;
- try {
- ClassReader cr = new ClassReader(inputClass);
- v = new NativeMethodClassVisitor(file, cw);
- cr.accept(v, Attributes.getDefaultAttributes(), true);
-
- if (v.allowNatives()) {
- // if natives are allowed for that class, no need to check
- // for a pure java implementation
- v = null;
- }
- } catch (Exception ex) {
- System.err.println("Unable to load class in file " + file.getAbsolutePath() + " : " + ex.getMessage());
- }
- return v;
- }
-
- private static class NativeMethodClassVisitor extends ClassAdapter {
- private String className;
- private boolean couldImplementNativeMethods;
- private boolean allowNatives = false;
- private List<NativeMethod> nativeMethods = new ArrayList<NativeMethod>();
-
- public NativeMethodClassVisitor(File file, ClassVisitor cv) {
- super(cv);
- }
-
- @Override
- public void visit(int version,
- int access,
- String name,
- String superName,
- String[] interfaces,
- String sourceFile) {
- this.className = name.replace('/', '.');
- this.allowNatives = VmUtils.allowNatives(className, "x86"); //TODO hard coded architecture: change that !
- this.couldImplementNativeMethods = VmUtils.couldImplementNativeMethods(className);
-
- super.visit(version, access, name, superName, interfaces, sourceFile);
- }
-
- @Override
- public CodeVisitor visitMethod(int access,
- String name,
- String desc,
- String[] exceptions,
- Attribute attrs) {
- if (!allowNatives) {
- // we don't allow native for that class =>
- // we must have a pure java implementation for that method
-
- if ((couldImplementNativeMethods && isStatic(access)) ||
- isNative(access)) {
- nativeMethods.add(new NativeMethod(access, name, desc));
- }
- }
-
- return null; // we don't to visit inside the method
- }
-
- public String getClassName() {
- return className;
- }
-
- public List<NativeMethod> getNativeMethods() {
- return nativeMethods;
- }
-
- public boolean couldImplementNativeMethods() {
- return couldImplementNativeMethods;
- }
-
- public boolean allowNatives() {
- return allowNatives;
- }
- }
-
- private static class NativeMethod {
- private final int access;
- private final String name;
- private final String desc;
-
- public NativeMethod(int access, String name, String desc) {
- super();
- this.access = access;
- this.name = name;
- this.desc = desc;
- }
-
- public int getAccess() {
- return access;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public String toString() {
- return name + " " + desc;
- }
- }
-
- public static boolean isNative(int access) {
- return isSet(access, org.objectweb.asm.Constants.ACC_NATIVE);
- }
-
- public static boolean isStatic(int access) {
- return isSet(access, org.objectweb.asm.Constants.ACC_STATIC);
- }
-
- private static boolean isSet(int access, int flag) {
- return ((access & flag) == flag);
- }
-}
Deleted: classlib6/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java 2009-04-11 11:08:25 UTC (rev 5244)
+++ classlib6/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java 2009-04-11 13:57:39 UTC (rev 5245)
@@ -1,245 +0,0 @@
-/*
- * $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.build;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import org.jnode.vm.Vm;
-import org.jnode.vm.VmArchitecture;
-import org.jnode.vm.VmSystemClassLoader;
-import org.jnode.vm.classmgr.VmField;
-import org.jnode.vm.classmgr.VmInstanceField;
-import org.jnode.vm.classmgr.VmNormalClass;
-import org.jnode.vm.classmgr.VmType;
-
-/**
- * TODO describe the class.
- *
- * @author epr
- */
-public abstract class AbstractAsmConstBuilder {
-
- private File destFile;
- private URL classesURL;
- private ArrayList<ClassName> classes = new ArrayList<ClassName>();
-
- /**
- * Execute this task.
- *
- * @throws BuildException
- */
- public void execute() throws BuildException {
- try {
- doExecute();
- } catch (Throwable ex) {
- ex.printStackTrace();
- throw new BuildException(ex);
- }
- }
-
- /**
- * Execute this task.
- *
- * @throws BuildException
- * @throws ClassNotFoundException
- * @throws IllegalAccessException
- * @throws IOException
- * @throws InstantiationException
- */
- private void doExecute()
- throws BuildException, ClassNotFoundException, IllegalAccessException, IOException, InstantiationException {
-
- final VmArchitecture arch = getArchitecture();
- final int slotSize = arch.getReferenceSize();
- final VmSystemClassLoader cl = new VmSystemClassLoader(classesURL, arch);
- final Vm vm = new Vm("?", arch, cl.getSharedStatics(), false, cl, null);
- vm.toString(); // Just to avoid compiler warnings
- VmType.initializeForBootImage(cl);
- long lastModified = 0;
-
- FileWriter fw = new FileWriter(destFile);
- PrintWriter out = new PrintWriter(fw);
- out.println("; " + destFile.getPath());
- out.println("; THIS file has been generated automatically on " + new Date());
- out.println();
-
- for (ClassName cn : classes) {
- final URL classUrl = cn.getURL(classesURL);
- lastModified = Math.max(lastModified, classUrl.openConnection().getLastModified());
- out.println("; Constants for " + cn.getClassName());
-
- if (cn.isStatic()) {
- Class<?> cls = Class.forName(cn.getClassName());
- Field fields[] = cls.getDeclaredFields();
- for (int i = 0; i < fields.length; i++) {
- Field f = fields[i];
- if (Modifier.isStatic(f.getModifiers()) && Modifier.isPublic(f.getModifiers())) {
- Object value = f.get(null);
- if (value instanceof Number) {
- String cname = cls.getName();
- int idx = cname.lastIndexOf('.');
- if (idx > 0) {
- cname = cname.substring(idx + 1);
- }
- String name = cname + "_" + f.getName();
- out.println(name + " equ " + value);
- }
- }
- }
- out.println();
- } else {
-
- out.println("; VmClass: " + cn.getClassName());
- VmType vmClass = cl.loadClass(cn.getClassName(), true);
- vmClass.link();
- String cname = vmClass.getName().replace('/', '.');
- int idx = cname.lastIndexOf('.');
- if (idx > 0) {
- cname = cname.substring(idx + 1);
- }
- int cnt = vmClass.getNoDeclaredFields();
- for (int i = 0; i < cnt; i++) {
- final VmField f = vmClass.getDeclaredField(i);
- if (!f.isStatic()) {
- final VmInstanceField instF = (VmInstanceField) f;
- String name = cname + "_" + f.getName().toUpperCase();
- if (f.getTypeSize() < 4) {
- name = name + "_S" + f.getTypeSize();
- }
- name = name + "_OFS";
- out.println(name + " equ " + instF.getOffset());
- }
- }
- // The size
- if (vmClass instanceof VmNormalClass) {
- final VmNormalClass cls = (VmNormalClass) vmClass;
- out.println(cname + "_SIZE equ " + cls.getObjectSize());
- }
- //
- out.println();
- }
- }
-
- out.flush();
- fw.flush();
- out.close();
- fw.close();
- destFile.setLastModified(lastModified);
- }
-
- public void addClass(ClassName cn) {
- classes.add(cn);
- }
-
- /**
- * Returns the destFile.
- *
- * @return File
- */
- public File getDestFile() {
- return destFile;
- }
-
- /**
- * Sets the destFile.
- *
- * @param destFile The destFile to set
- */
- public void setDestFile(File destFile) {
- this.destFile = destFile;
- }
-
- public static class ClassName {
- private String className;
- private boolean _static = false;
-
- public ClassName() {
- }
-
- /**
- * Returns the className.
- *
- * @return String
- */
- public String getClassName() {
- return className;
- }
-
- /**
- * Sets the className.
- *
- * @param className The className to set
- */
- public void setClassName(String className) {
- this.className = className;
- }
-
- /**
- * Returns the _static.
- *
- * @return boolean
- */
- public boolean isStatic() {
- return _static;
- }
-
- /**
- * Sets the _static.
- *
- * @param _static The _static to set
- */
- public void setStatic(boolean _static) {
- this._static = _static;
- }
-
- public URL getURL(URL root) throws MalformedURLException {
- return new URL(root.toExternalForm() + "/" + className.replace('.', '/') + ".class");
- }
- }
-
- /**
- * Returns the classesURL.
- *
- * @return URL
- */
- public URL getClassesURL() {
- return classesURL;
- }
-
- /**
- * Sets the classesURL.
- *
- * @param classesURL The classesURL to set
- */
- public void setClassesURL(URL classesURL) {
- this.classesURL = classesURL;
- }
-
- protected abstract VmArchitecture getArchitecture();
-}
Deleted: classlib6/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- classlib6/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2009-04-11 11:08:25 UTC (rev 5244)
+++ classlib6/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2009-04-11 13:57:39 UTC (rev 5245)
@@ -1,1685 +0,0 @@
-/*
- * $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.build;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.apache.tools.ant.Project;
-import org.jnode.assembler.Label;
-import org.jnode.assembler.NativeStream;
-import org.jnode.assembler.UnresolvedObjectRefException;
-import org.jnode.assembler.NativeStream.ObjectRef;
-import org.jnode.assembler.x86.X86BinaryAssembler;
-import org.jnode.plugin.PluginDescriptor;
-import org.jnode.plugin.PluginException;
-import org.jnode.plugin.PluginRegistry;
-import org.jnode.plugin.model.Factory;
-import org.jnode.plugin.model.PluginDescriptorModel;
-import org.jnode.plugin.model.PluginJar;
-import org.jnode.plugin.model.PluginRegistryModel;
-import org.jnode.util.BootableHashMap;
-import org.jnode.util.NumberUtils;
-import org.jnode.vm.JvmType;
-import org.jnode.vm.Unsafe;
-import org.jnode.vm.VirtualMemoryRegion;
-import org.jnode.vm.Vm;
-import org.jnode.vm.VmArchitecture;
-import org.jnode.vm.VmSystemClassLoader;
-import org.jnode.vm.VmSystemObject;
-import org.jnode.vm.bytecode.BytecodeParser;
-import org.jnode.vm.classmgr.Modifier;
-import org.jnode.vm.classmgr.ObjectLayout;
-import org.jnode.vm.classmgr.VmArray;
-import org.jnode.vm.classmgr.VmArrayClass;
-import org.jnode.vm.classmgr.VmClassType;
-import org.jnode.vm.classmgr.VmCompiledCode;
-import org.jnode.vm.classmgr.VmField;
-import org.jnode.vm.classmgr.VmIsolatedStatics;
-import org.jnode.vm.classmgr.VmMethodCode;
-import org.jnode.vm.classmgr.VmNormalClass;
-import org.jnode.vm.classmgr.VmSharedStatics;
-import org.jnode.vm.classmgr.VmStaticField;
-import org.jnode.vm.classmgr.VmStatics;
-import org.jnode.vm.classmgr.VmType;
-import org.jnode.vm.compiler.NativeCodeCompiler;
-import org.jnode.vm.memmgr.HeapHelper;
-import org.jnode.vm.memmgr.VmHeapManager;
-import org.jnode.vm.scheduler.VmProcessor;
-import org.vmmagic.unboxed.UnboxedObject;
-
-/**
- * Build the boot image from an assembler compiled bootstrap (in ELF format)
- * combined with the precompiled Java classes.
- */
-public abstract class AbstractBootImageBuilder extends AbstractPluginsTask {
-
- protected static final Label bootHeapEnd = new Label("$$bootHeapEnd");
-
- protected static final Label bootHeapStart = new Label("$$bootHeapStart");
-
- /**
- * System property set to indicate build time.
- */
- public static final String BUILDTIME_PROPERTY = "org.jnode.buildtime";
-
- protected static final Label imageEnd = new Label("$$image_end");
-
- protected static final Label initialStack = new Label("$$initialStack");
-
- protected static final Label initialStackPtr = new Label(
- "$$initialStackPtr");
-
- private static final String zero8 = "00000000";
-
- private static final String zero16 = zero8 + zero8;
-
- /**
- * Set of jbects that should not yet be emitted.
- */
- private final Set<Object> blockedObjects = new HashSet<Object>();
-
- private VmSystemClassLoader clsMgr;
-
- /**
- * Classname/packagename of those classes/packages that need highly
- * optimized compilation.
- */
- private final HashSet<String> compileHighOptLevelPackages = new HashSet<String>();
-
- private final HashSet<String> preloadPackages = new HashSet<String>();
-
- protected boolean debug = true;
-
- private File debugFile;
-
- private File destFile;
-
- private String jnodeCompiler;
-
- private File kernelFile;
-
- private Set<String> legalInstanceClasses;
-
- private File listFile;
-
- private int totalHighMethods;
-
- private int totalHighMethodSize;
-
- private int totalLowMethods;
-
- private int totalLowMethodSize;
-
- private String version;
-
- /**
- * Plugin id of the memory manager plugin.
- */
- private String memMgrPluginId;
-
- /**
- * Nano-kernel source information.
- */
- private final AsmSourceInfo asmSourceInfo;
-
- /**
- * Enable the compilation of the nano-kernel source via jnasm.
- */
- private boolean enableJNasm = false;
-
- /**
- * Construct a new BootImageBuilder.
- */
- public AbstractBootImageBuilder() {
- asmSourceInfo = new AsmSourceInfo();
- legalInstanceClasses = setupLegalInstanceClasses();
- }
-
- /**
- * Create the kernel-sources element.
- *
- * @return
- */
- public AsmSourceInfo createNanokernelsources() {
- return asmSourceInfo;
- }
-
- protected final void addCompileHighOptLevel(String name) {
- compileHighOptLevelPackages.add(name);
- }
-
- protected final void addPreloadPackage(String name) {
- preloadPackages.add(name);
- }
-
- protected void cleanup() {
- clsMgr = null;
- blockedObjects.clear();
- }
-
- /**
- * Compile the methods in the given class to native code.
- *
- * @param os
- * @throws ClassNotFoundException
- */
- private final void compileClasses(NativeStream os, VmArchitecture arch)
- throws ClassNotFoundException {
- final NativeCodeCompiler[] compilers = arch.getCompilers();
- final int optLevel = compilers.length - 1;
- // Use the most optimizing compiler here
- final NativeCodeCompiler compiler = compilers[optLevel];
-
- int oldCount;
- int newCount;
- boolean again;
- do {
- again = false;
- oldCount = clsMgr.getLoadedClassCount();
- for (VmType<?> vmClass : clsMgr.getLoadedClasses()) {
- vmClass.link();
- final boolean compHigh = isCompileHighOptLevel(vmClass);
- try {
- if (!vmClass.isCpRefsResolved() && compHigh) {
- // log("Resolving CP of " + vmClass.getName(),
- // Project.MSG_VERBOSE);
- vmClass.resolveCpRefs(/*clsMgr*/);
- again = true;
- }
- final int mcnt;
- final int startLength = os.getLength();
- if (compHigh) {
- log("Full Compile " + vmClass.getName(),
- Project.MSG_VERBOSE);
- mcnt = vmClass.compileBootstrap(compiler, os, optLevel);
- totalHighMethods += mcnt;
- totalHighMethodSize += (os.getLength() - startLength);
- } else {
- log("Min. Compile " + vmClass.getName(),
- Project.MSG_VERBOSE);
- mcnt = vmClass.compileBootstrap(compilers[0], os, 0);
- totalLowMethods += mcnt;
- totalLowMethodSize += (os.getLength() - startLength);
- }
- again |= (mcnt > 0);
- } catch (Throwable ex) {
- throw new BuildException("Compile of " + vmClass.getName()
- + " failed", ex);
- }
- if (!vmClass.isCompiled()) {
- throw new BuildException(
- "Class should have been compiled by now");
- }
-
- }
- newCount = clsMgr.getLoadedClassCount();
- if (false) {
- log("oldCount " + oldCount + ", newCount " + newCount,
- Project.MSG_INFO);
- }
- } while ((oldCount != newCount) || again);
- log("End of compileClasses", Project.MSG_VERBOSE);
- }
-
- /**
- * Copy the jnode.jar file into a byte array that is added to the java
- * image.
- *
- * @param blockedObjects
- * @return The loaded resource names
- * @throws BuildException
- */
- protected final Collection<String> copyJarFile(Set<Object> blockedObjects, PluginRegistryModel piRegistry)
- throws BuildException {
-
- final BootableHashMap<String, byte[]> resources = new BootableHashMap<String, byte[]>();
-// try {
-// final JarFile jar = new JarFile(jarFile);
-// for (Enumeration< ? > e = jar.entries(); e.hasMoreElements();) {
-// final JarEntry entry = (JarEntry) e.nextElement();
-// final byte[] data = read(jar.getInputStream(entry));
-// resources.put(entry.getName().intern(), data);
-// }
-// } catch (IOException ex) {
-// throw new BuildException(ex);
-// }
-
- // Load all resources of all plugins
- for (PluginDescriptor descr : piRegistry) {
- if (!descr.isSystemPlugin()) {
- throw new BuildException("Non system plugin found " + descr.getId());
- }
- final PluginJar piJar = ((PluginDescriptorModel) descr).getJarFile();
- log("Plugin: " + descr.getId() + piJar.resourceNames().size());
- for (String name : piJar.resourceNames()) {
- final ByteBuffer buf = piJar.getResourceAsBuffer(name);
- final byte[] data = new byte[buf.limit()];
- buf.get(data);
- resources.put(name.intern(), data);
-// log(" " + name);
- }
- piJar.clearResources();
- }
-
- blockedObjects.add(resources);
- clsMgr.setSystemRtJar(resources);
-
- return Collections.unmodifiableCollection(resources.keySet());
- }
-
- /**
- * Copy the jnode.jar file into a byte array that is added to the java
- * image.
- *
- * @param blockedObjects
- * @return The loaded resource names
- * @throws BuildException
- */
- protected final Map<String, byte[]> loadSystemResource(PluginRegistryModel piRegistry)
- throws BuildException {
-
- final BootableHashMap<String, byte[]> resources = new BootableHashMap<String, byte[]>();
-
- // Load all resources of all plugins
- for (PluginDescriptor descr : piRegistry) {
- if (!descr.isSystemPlugin()) {
- throw new BuildException("Non system plugin found " + descr.getId());
- }
- final PluginJar piJar = ((PluginDescriptorModel) descr).getJarFile();
-// log("Plugin: " + descr.getId() + piJar.resourceNames().size());
- for (String name : piJar.resourceNames()) {
- final ByteBuffer buf = piJar.getResourceAsBuffer(name);
- final byte[] data = new byte[buf.limit()];
- buf.get(data);
- resources.put(name.intern(), data);
-// log(" " + name);
- }
- piJar.clearResources();
- }
- return resources;
- }
-
- /**
- * Copy the kernel native code into the native stream.
- *
- * @param os
- * @throws BuildException
- */
- protected abstract void copyKernel(NativeStream os) throws BuildException;
-
- /**
- * Compile the kernel native code into the native stream.
- *
- * @param os
- * @throws BuildException
- */
- protected void compileKernel(NativeStream os, AsmSourceInfo sourceInfo) throws BuildException {
- // TODO be implemented by Levente
- throw new BuildException("Not implemented");
- }
-
- /**
- * Create the initial stack space.
- *
- * @param os
- * @param stackLabel Label to the start of the stack space (low address)
- * @param stackPtrLabel Label to the initial stack pointer (on x86 high address)
- * @throws BuildException
- * @throws ClassNotFoundException
- * @throws UnresolvedObjectRefException
- */
- protected abstract void createInitialStack(NativeStream os,
- Label stackLabel, Label stackPtrLabel) throws BuildException,
- ClassNotFoundException, UnresolvedObjectRefException;
-
- /**
- * Create a platform specific native stream.
- *
- * @return NativeStream
- */
- protected abstract NativeStream createNativeStream();
-
- /**
- * Create the default processor for this architecture.
- *
- * @return The processor
- * @throws BuildException
- */
- protected abstract VmProcessor createProcessor(Vm vm, VmSharedStatics statics,
- VmIsolatedStatics isolatedStatics) throws BuildException;
-
- private final void doExecute() throws BuildException {
- setupCompileHighOptLevelPackages();
-
- debug = (getProject().getProperty("jnode.debug") != null);
-
- final long lmKernel = kernelFile.lastModified();
- final long lmDest = destFile.lastModified();
- final long lmPIL = getPluginListFile().lastModified();
-
- if (version == null) {
- throw new BuildException("Version property must be set");
- }
- if (memMgrPluginId == null) {
- throw new BuildException("Memory manager plugin Id must be set");
- }
-
- final PluginList piList;
- final long lmPI;
- final URL memMgrPluginURL;
- try {
- log("plugin-list: " + getPluginListFile(), Project.MSG_DEBUG);
- piList = getPluginList();
- memMgrPluginURL = piList.createPluginURL(memMgrPluginId, version);
- lmPI = Math.max(piList.lastModified(), memMgrPluginURL.openConnection().getLastModified());
- } catch (PluginException ex) {
- throw new BuildException(ex);
- } catch (IOException ex) {
- throw new BuildException(ex);
- }
-
- if ((lmKernel < lmDest) && (lmPIL < lmDest) && (lmPI < lmDest)) {
- // No need to do anything, skip
- return;
- }
-
- if (debugFile != null) {
- debugFile.delete();
- }
-
- try {
- System.getProperties().setProperty(BUILDTIME_PROPERTY, "1");
-
- // Load the plugin descriptors
- final PluginRegistryModel piRegistry;
- piRegistry = Factory.createRegistry(piList.getPluginList());
-
- // Load the memory management plugin
- piRegistry.loadPlugin(memMgrPluginURL, true);
-
- // Test the set of system plugins
- testPluginPrerequisites(piRegistry);
-
- // Load all resources
- final Map<String, byte[]> resources = loadSystemResource(piRegistry);
-
- /* Now create the processor */
- final VmArchitecture arch = getArchitecture();
- final NativeStream os = createNativeStream();
- clsMgr = new VmSystemClassLoader(null/*classesURL*/, arch,
- new BuildObjectResolver(os, this));
- blockedObjects.add(clsMgr);
- blockedObjects.add(clsMgr.getSharedStatics());
- blockedObjects.add(clsMgr.getSharedStatics().getTable());
- blockedObjects.add(clsMgr.getIsolatedStatics());
- blockedObjects.add(clsMgr.getIsolatedStatics().getTable());
- blockedObjects.add(resources);
- clsMgr.setSystemRtJar(resources);
-
- // Initialize the statics table.
- initializeStatics(clsMgr.getSharedStatics());
-
- if (debug) {
- log("Building in DEBUG mode", Project.MSG_WARN);
- }
-
- // Create the VM
- final Vm vm = new Vm(version, arch, clsMgr.getSharedStatics(), debug, clsMgr, piRegistry);
- blockedObjects.add(vm);
- blockedObjects.add(Vm.getCompiledMethods());
-
- final VmProcessor proc = createProcessor(vm, clsMgr.getSharedStatics(),
- clsMgr.getIsolatedStatics());
- log("Building for " + proc.getCPUID());
-
- final Label clInitCaller = new Label("$$clInitCaller");
- VmType<?> systemClasses[] = VmType.initializeForBootImage(clsMgr);
- for (int i = 0; i < systemClasses.length; i++) {
- clsMgr.addLoadedClass(systemClasses[i].getName(),
- systemClasses[i]);
- }
-
- // First copy the native kernel file
- if (enableJNasm) {
- compileKernel(os, asmSourceInfo);
- } else {
- copyKernel(os);
- }
- os.setObjectRef(bootHeapStart);
-
- // Setup a call to our first java method
- initImageHeader(os, clInitCaller, vm, piRegistry);
-
- // Create the initial stack
- createInitialStack(os, initialStack, initialStackPtr);
-
- /* Now load the classes */
- loadClass(VmMethodCode.class);
- loadClass(Unsafe.class);
- loadClass(VmSystemClassLoader.class);
- loadClass(VmType[].class);
- loadClass(Vm.class);
- loadClass(VirtualMemoryRegion.class).link();
- Vm.getHeapManager().loadClasses(clsMgr);
- loadClass(VmHeapManager.class);
- loadClass(VmSharedStatics.class);
- loadClass(VmIsolatedStatics.class);
- loadClass(Vm.getHeapManager().getClass());
- loadClass(HeapHelper.class);
- loadClass("org.jnode.vm.HeapHelperImpl");
- loadClass(Vm.getCompiledMethods().getClass());
- loadClass(VmCompiledCode[].class);
- loadSystemClasses(resources.keySet());
-
- /* Now emit the processor */
- os.getObjectRef(proc);
-
- /* Let the compilers load its native symbol offsets */
- final NativeCodeCompiler[] cmps = arch.getCompilers();
- for (int i = 0; i < cmps.length; i++) {
- final NativeCodeCompiler cmp = cmps[i];
- cmp.initialize(clsMgr);
- os.getObjectRef(cmp);
- }
- /* Let the test compilers load its native symbol offsets */
- final NativeCodeCompiler[] testCmps = arch.getTestCompilers();
- if (testCmps != null) {
- for (int i = 0; i < testCmps.length; i++) {
- final NativeCodeCompiler cmp = testCmps[i];
- cmp.initialize(clsMgr);
- os.getObjectRef(cmp);
- }
- }
- log("Compiling using " + cmps[0].getName() + " and "
- + cmps[cmps.length - 1].getName() + " compilers");
- // Initialize the IMT compiler.
- arch.getIMTCompiler().initialize(clsMgr);
-
- // Load the jarfile as byte-array
-// copyJarFile(blockedObjects, piRegistry);
-
- // Now emit all object images to the actual image
- emitObjects(os, arch, blockedObjects, false);
-
- // Disallow the loading of new classes
- clsMgr.setFailOnNewLoad(true);
- emitObjects(os, arch, blockedObjects, false);
-
- // Emit the vm
- log("Emit vm", Project.MSG_VERBOSE);
- blockedObjects.remove(vm);
- emitObjects(os, arch, blockedObjects, false);
- // Twice, this is intended!
- emitObjects(os, arch, blockedObjects, false);
-
- // Emit the compiled method list
- log("Emit compiled methods", Project.MSG_VERBOSE);
- blockedObjects.remove(Vm.getCompiledMethods());
- final int compiledMethods = Vm.getCompiledMethods().size();
- emitObjects(os, arch, blockedObjects, false);
- // Twice, this is intended!
- emitObjects(os, arch, blockedObjects, false);
-
- /* Set the bootclasses */
- log("prepare bootClassArray", Project.MSG_VERBOSE);
- final VmType bootClasses[] = clsMgr.prepareAfterBootstrap();
- os.getObjectRef(bootClasses);
- emitObjects(os, arch, blockedObjects, false);
- // Twice, this is intended!
- emitObjects(os, arch, blockedObjects, false);
-
- // Emit the classmanager
- log("Emit clsMgr", Project.MSG_VERBOSE);
- // Turn auto-compilation on
- clsMgr.setCompileRequired();
- blockedObjects.remove(clsMgr);
- emitObjects(os, arch, blockedObjects, false);
- // Twice, this is intended!
- emitObjects(os, arch, blockedObjects, false);
-
- // Emit the statics table
- log("Emit statics", Project.MSG_VERBOSE);
- blockedObjects.remove(clsMgr.getSharedStatics());
- blockedObjects.remove(clsMgr.getIsolatedStatics());
- emitObjects(os, arch, blockedObjects, true);
- // Twice, this is intended!
- emitObjects(os, arch, blockedObjects, true);
-
- // Emit the remaining objects
- log("Emit rest; blocked=" + blockedObjects, Project.MSG_VERBOSE);
- emitObjects(os, arch, null, true);
-
- // Verify no methods have been compiled after we wrote the
- // CompiledCodeList.
- if (Vm.getCompiledMethods().size() != compiledMethods) {
- throw new BuildException(
- "Method have been compiled after CompiledCodeList was written.");
- }
-
- /* Write static initializer code */
- emitStaticInitializerCalls(os, bootClasses, clInitCaller);
-
- // This is the end of the image
- X86BinaryAssembler.ObjectInfo dummyObjectAtEnd = os
- .startObject(loadClass(VmMethodCode.class));
- pageAlign(os);
- dummyObjectAtEnd.markEnd();
- os.setObjectRef(imageEnd);
- os.setObjectRef(bootHeapEnd);
-
- /* Link all native symbols */
- linkNativeSymbols(os);
-
- // Patch multiboot header
- patchHeader(os);
-
- // Store the image
- storeImage(os);
-
- // Generate the listfile
- printLabels(os, bootClasses, clsMgr.getSharedStatics());
- logLargeClasses(bootClasses);
-
- // Generate debug info
- for (int i = 0; i < cmps.length; i++) {
- cmps[i].dumpStatistics();
- }
- final int bootHeapSize = os.getObjectRef(bootHeapEnd).getOffset()
- - os.getObjectRef(bootHeapStart).getOffset();
- final int bootHeapBitmapSize = (bootHeapSize / ObjectLayout.OBJECT_ALIGN) >> 3;
- log("Boot heap size " + (bootHeapSize >>> 10) + "K bitmap size "
- + (bootHeapBitmapSize >>> 10) + "K");
- log("Shared statics");
- PrintWriter out = new PrintWriter(new OutputStreamWriter(System.out));
- clsMgr.getSharedStatics().dumpStatistics(out);
- log("Isolated statics");
- clsMgr.getIsolatedStatics().dumpStatistics(out);
- vm.dumpStatistics(out);
-
- logStatistics(os);
-
- BytecodeParser.dumpStatistics();
-
- log("Optimized methods : " + totalHighMethods + ", avg size "
- + (totalHighMethodSize / totalHighMethods) + ", tot size "
- + totalHighMethodSize);
- log("Ondemand comp. methods: " + totalLowMethods + ", avg size "
- + (totalLowMethodSize / totalLowMethods) + ", tot size "
- + totalLowMethodSize);
-
- log("Done.");
-
- os.clear();
- } catch (Throwable ex) {
- ex.printStackTrace();
- throw new BuildException(ex);
- }
-
- }
-
- /**
- * Emit all objects to the native stream that have not yet been emitted to
- * this stream.
- *
- * @param os
- * @param arch
- * @param blockObjects
- * @throws BuildException
- */
- private final void emitObjects(NativeStream os, VmArchitecture arch,
- Set<Object> blockObjects, boolean skipCopyStatics)
- throws BuildException {
- log("Emitting objects", Project.MSG_DEBUG);
- PrintWriter debugOut = null;
- final TreeSet<String> emittedClassNames = new TreeSet<String>();
- try {
- if (debug) {
- debugOut = new PrintWriter(new FileWriter(debugFile, true));
- }
- final ObjectEmitter emitter = new ObjectEmitter(clsMgr, os,
- debugOut, legalInstanceClasses);
- final long start = System.currentTimeMillis();
- int cnt = 0;
- int lastUnresolved = -1;
- int loops = 0;
- while (true) {
- loops++;
- compileClasses(os, arch);
- if (!skipCopyStatics) {
- copyStaticFields(clsMgr, clsMgr.getSharedStatics(), clsMgr
- .getIsolatedStatics(), os, emitter);
- }
- final Collection<ObjectRef> objectRefs = new ArrayList<ObjectRef>(
- os.getObjectRefs());
- int unresolvedFound = 0; // Number of unresolved references
- // found in the following
- // loop
- int emitted = 0; // Number of emitted objects in the
- // following
- // loop
- for (Iterator<ObjectRef> i = objectRefs.iterator(); i.hasNext();) {
- X86BinaryAssembler.ObjectRef ref = i
- .next();
- if (!ref.isResolved()) {
- final Object obj = ref.getObject();
- if (!(obj instanceof Label)) {
- unresolvedFound++;
- if (obj instanceof VmType) {
- final VmType<?> vmtObj = (VmType) obj;
- vmtObj.link();
- if (!vmtObj.isCompiled()) {
- compileClasses(os, arch);
- }
- }
-
- boolean skip;
- if (blockObjects == null) {
- skip = false;
- } else {
- skip = blockObjects.contains(obj);
- }
- /*
- * if (obj instanceof VmMethod) { final VmMethod
- * mObj = (VmMethod)obj; if (!mObj.hasNativeCode()) {
- * compileClasses(os, arch); } if
- * (!mObj.getDeclaringClass().isCompiled()) {
- * log("Oops"); }
- */
-
- if (!skip) {
- if (blockObjects == null) {
- emittedClassNames.add(obj.getClass()
- .getName());
- // log("emitObject " +
- // obj.getClass().getName());
- }
- // if (obj != skipMe) {
- emitter.emitObject(obj);
- emitted++;
- X86BinaryAssembler.ObjectRef newRef = os
- .getObjectRef(obj);
- if (ref != newRef) {
- throw new RuntimeException(
- "Object has changed during emitObject! type="
- + obj.getClass().getName());
- }
- if (!ref.isResolved()) {
- throw new RuntimeException("Unresolved reference to object " + ((obj == null) ?
- "null" : obj.getClass() .getName()));
- }
- }
- }
- }
- }
- if (unresolvedFound == lastUnresolved) {
- if (unresolvedFound == 0) {
- break;
- }
- if (blockedObjects != null) {
- if (unresolvedFound == (emitted + blockObjects.size())) {
- // log("UnresolvedFound " + unresolvedFound + ",
- // emitted " + emitted + ",blocked " +
- // blockObjects.size());
- break;
- }
- if ((emitted == 0) && !blockObjects.isEmpty()) {
- break;
- }
- }
- }
- lastUnresolved = unresolvedFound;
- cnt += emitted;
- }
- final long end = System.currentTimeMillis();
- log("Emitted " + cnt + " objects, took " + (end - start) + "ms in "
- + loops + " loops");
- if (debugOut != null) {
- debugOut.close();
- debugOut = null;
- }
- if (blockObjects == null) {
- log("Emitted classes: " + emittedClassNames, Project.MSG_INFO);
- }
- } catch (ClassNotFoundException ex) {
- throw new BuildException(ex);
- } catch (IOException ex) {
- throw new BuildException(ex);
- }
- }
-
- protected abstract void emitStaticInitializerCalls(NativeStream os,
- VmType[] bootClasses, Object clInitCaller)
- throws ClassNotFoundException;
-
- public final void execute() throws BuildException {
- // Create the image
- doExecute();
- // Remove all garbage objects
- cleanup();
- System.gc();
- // Make sure that all finalizers are called, in order to remove tmp
- // files.
- Runtime.getRuntime().runFinalization();
- }
-
- /**
- * Gets the target architecture.
- *
- * @return The target architecture
- * @throws BuildException
- */
- protected abstract VmArchitecture getArchitecture() throws BuildException;
-
- /**
- * Gets the internal class loader.
- *
- * @return The class loader
- */
- public VmSystemClassLoader getClsMgr() {
- return clsMgr;
- }
-
- /**
- * Returns the debugFile.
- *
- * @return File
- */
- public final File getDebugFile() {
- return debugFile;
- }
-
- /**
- * Returns the destFile.
- *
- * @return File
- */
- public final File getDestFile() {
- return destFile;
- }
-
- /**
- * @return Returns the jnodeCompiler.
- */
- public final String getJnodeCompiler() {
- return jnodeCompiler;
- }
-
- /**
- * Returns the kernelFile.
- *
- * @return File
- */
- public final File getKernelFile() {
- return kernelFile;
- }
-
- /**
- * Returns the listFile.
- *
- * @return File
- */
- public final File getListFile() {
- return listFile;
- }
-
- /**
- * @return Returns the version.
- */
- public final String getVersion() {
- return this.version;
- }
-
- /**
- * Convert a given int to an hexidecimal representation of 8 characters
- * long.
- *
- * @param v
- * @return The hex string
- */
- protected final String hex(int v) {
- String s = Integer.toHexString(v);
- return zero8.substring(s.length()) + s;
- }
-
- /**
- * Convert a given int to an hexidecimal representation of 16 characters
- * long.
- *
- * @param v
- * @return The hex string
- */
- protected final String hex(long v) {
- String s = Long.toHexString(v);
- return zero16.substring(s.length()) + s;
- }
-
- /**
- * Emit code to bootstrap the java image.
- *
- * @param os
- * @param clInitCaller
- * @param vm
- * @param pluginRegistry
- * @throws BuildException
- */
- protected abstract void initImageHeader(NativeStream os,
- Label ...
[truncated message content] |
|
From: <ls...@us...> - 2009-04-12 07:55:13
|
Revision: 5253
http://jnode.svn.sourceforge.net/jnode/?rev=5253&view=rev
Author: lsantha
Date: 2009-04-12 07:55:10 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
Removing non-classlib classes.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/builder/build.xml
classlib6/core/build.xml
Removed Paths:
-------------
classlib6/all/build-jop.xml
classlib6/all/build-x86.xml
classlib6/all/jnode_checks.xml
classlib6/all/new_checks.xml
Deleted: classlib6/all/build-jop.xml
===================================================================
--- classlib6/all/build-jop.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build-jop.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,123 +0,0 @@
-<project name="JNode-jop" default="all" basedir=".">
-
- <property name="my-build.dir" value="${build.dir}/jop" />
- <property name="my-lib.dir" value="${basedir}/lib/jop" />
- <property name="my-conf.dir" value="${basedir}/conf/jop" />
-
- <property name="build.netboot.dir" value="${my-build.dir}/netboot" />
-
- <!-- Properties for building the boot files for Spartan-3/JOP -->
- <property name="bin-jop.dir" value="${basedir}\bin-jop" />
- <property name="conf-jop.dir" value="${basedir}\conf\jop" />
- <property name="lib-jop.dir" value="${basedir}\lib\jop" />
- <!-- end of Properties for building the boot files for Spartan-3/JOP -->
-
- <path id="cp-jop">
- <pathelement location="${jnode-mmtk.jar}" />
- <pathelement location="${jnode-builder.jar}" />
- <pathelement location="${jnode-core.jar}" />
- <pathelement location="${jnode-fs.jar}" />
- <pathelement location="${jnode-shell.jar}" />
- <pathelement location="${jnode-net.jar}" />
- <pathelement location="${jnode-gui.jar}" />
- <path refid="cp" />
- <pathelement location="${my-conf.dir}" />
- <pathelement location="${grub.dir}" />
- <pathelement location="${descriptors.dir}" />
- <pathelement location="${dom4j.jar}" />
- <pathelement location="${mmtk.jar}" />
- </path>
-
- <target name="test-properties">
- <condition property="jop-properties.exists">
- <available file="build-jop.properties" />
- </condition>
- </target>
- <target name="load-properties" if="jop-properties.exists">
- <property file="build-jop.properties" />
- </target>
- <target name="default-properties" unless="jop-properties.exists">
- <property name="jnodedrive.dir" value="${my-build.dir}" />
- </target>
-
- <target name="prepare-props" depends="test-properties,load-properties,default-properties">
- <property name="jnode.kernel.dir" value="${jnodedrive.dir}" />
- <property name="jnode.kernel" value="${jnode.kernel.dir}/jnodejop.gz" />
- <property name="jnode.compiler" value="default" />
-
- <property name="build.bootimage.dir" value="${my-build.dir}/bootimage" />
- </target>
-
- <!-- Initialize all project directories -->
- <target name="prepare-dirs" depends="prepare-props">
- <mkdir dir="${build.bootimage.dir}" />
- <mkdir dir="${build.netboot.dir}" />
- </target>
-
- <!-- Initialize all project properties -->
- <target name="prepare" depends="prepare-dirs">
- </target>
-
- <!-- Build the java object file -->
- <target name="java-image" depends="prepare">
- </target>
-
- <macrodef name="create-cdrom">
- <attribute name="dir" />
- <attribute name="destfile" />
- <sequential>
- <mkdir dir="@{dir}/boot/grub" />
- <copy todir="@{dir}">
- <fileset dir="${jnode.kernel.dir}" includes="jnode*.gz"/>
- </copy>
- <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>
- </macrodef>
-
- <!-- Create a full distributable bootable CDROM image -->
- <target name="cdrom" depends="prepare">
- <copy file="${sources.dist.tar.gz}" todir="${my-build.dir}/cdrom-full" />
- <create-cdrom destfile="${jnode-jop.iso}" dir="${my-build.dir}/cdrom-full" />
- </target>
-
- <!-- Create a bootable CDROM image -->
- <target name="cdrom-lite" depends="prepare">
- <create-cdrom destfile="${jnode-jop-lite.iso}" dir="${my-build.dir}/cdrom-lite" />
- </target>
-
- <!-- Prepare for netboot -->
- <target name="netboot" depends="java-image" unless="no.netboot">
- <copy file="${jnode.kernel}" todir="${build.netboot.dir}" />
- <copy todir="${build.netboot.dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy todir="${build.netboot.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- <mkdir dir="${build.netboot.dir}/plugins" />
- <copy todir="${build.netboot.dir}/plugins">
- <fileset dir="${plugins.dir}" />
- </copy>
- </target>
-
- <!-- Run all required targets -->
- <target name="all" depends="java-image">
- </target>
-
-</project>
-
-
Deleted: classlib6/all/build-x86.xml
===================================================================
--- classlib6/all/build-x86.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build-x86.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,383 +0,0 @@
-<project name="JNode-x86" default="all" basedir=".">
-
- <property name="my-build.dir" value="${build.dir}/x86" />
- <property name="my-lib.dir" value="${basedir}/lib/x86" />
- <property name="my-conf.dir" value="${basedir}/conf/x86" />
-
- <property name="src.native.dir" value="${root.dir}/core/src/native" />
- <property name="build.netboot.dir" value="${my-build.dir}/netboot" />
- <property name="jnode.disk" value="${my-build.dir}/jnodedisk${jnode.bits}.dat" />
- <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="512" />
- <property name="logFile" value="${build.dir}/debugger.txt" />
-
- <property name="grub-ver" value="grub-0.97-i386-pc" />
- <property name="grub.dir" value="${my-build.dir}/${grub-ver}/boot/grub" />
- <property name="grub.dist" value="${my-lib.dir}/${grub-ver}.tar.gz" />
-
- <property name="grub.stage1.name" value="stage1" />
- <property name="grub.stage2.name" value="stage2" />
- <property name="grub.menu" value="${my-conf.dir}/menu.lst" />
- <property name="grub.menu.cdrom" value="${my-conf.dir}/menu-cdrom.lst" />
-
- <!-- Properties for building the boot files for windows NT/2K/XP -->
- <property name="jnode.install-nt.dir" value="C:\jnode" />
- <!-- (hd0,0) stands for harddisk 0, partition 0 -->
- <property name="partition-nt.grub.menu" value="(hd0,0)" />
- <!-- patch -->
- <property name="partition-nt.grub.menu.final" value="${partition-nt.grub.menu}/jnode" />
- <property name="partition-nt" value="C:" />
-
- <property name="bin-nt.dir" value="${basedir}\bin-nt" />
- <property name="conf-nt.dir" value="${basedir}\conf\x86-nt" />
- <property name="lib-nt.dir" value="${basedir}\lib\x86-nt" />
-
- <property name="grub.stage1-nt.name" value="stage1-nt" />
- <property name="grub.stage2-nt.name" value="stage2-nt" />
-
- <property name="grub.stage1-nt" value="${lib-nt.dir}\${grub.stage1-nt.name}" />
- <property name="grub.stage2-nt" value="${lib-nt.dir}\${grub.stage2-nt.name}" />
-
- <property name="grub.install-nt.exe" value="${bin-nt.dir}\grubinstall-nt.exe" />
- <!-- end of Properties for building the boot files for windows NT/2K/XP -->
-
- <path id="cp-x86">
- <pathelement location="${jnode-mmtk.jar}" />
- <pathelement location="${jnode-builder.jar}" />
- <pathelement location="${jnode-core.jar}" />
- <pathelement location="${jnode-fs.jar}" />
- <pathelement location="${jnode-shell.jar}" />
- <pathelement location="${jnode-net.jar}" />
- <pathelement location="${jnode-gui.jar}" />
- <path refid="cp" />
- <pathelement location="${my-conf.dir}" />
- <pathelement location="${grub.dir}" />
- <pathelement location="${descriptors.dir}" />
- <pathelement location="${dom4j.jar}" />
- <pathelement location="${mmtk.jar}" />
- </path>
-
- <target name="test-properties">
- <condition property="x86-properties.exists">
- <available file="build-x86.properties" />
- </condition>
- </target>
- <target name="load-properties" if="x86-properties.exists">
- <property file="build-x86.properties" />
- </target>
- <target name="default-properties" unless="x86-properties.exists">
- <property name="jnodedrive.dir" value="${my-build.dir}" />
- </target>
-
- <target name="prepare-props" depends="test-properties,load-properties,default-properties">
- <property name="jnode.kernel.dir" value="${jnodedrive.dir}" />
- <property name="jnode.kernel" value="${jnode.kernel.dir}/jnode${jnode.bits}.gz" />
- <property name="jnode.compiler" value="default" />
-
- <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 -->
- <target name="prepare-dirs" depends="prepare-props">
- <mkdir dir="${build.native.dir}" />
- <mkdir dir="${build.native.dir}/output" />
- <mkdir dir="${build.native.dir}/src" />
- <mkdir dir="${build.bootimage.dir}" />
- <mkdir dir="${build.netboot.dir}" />
- </target>
-
- <target name="test-grub">
- <available file="${grub.dir}" property="grub.exists" />
- </target>
-
- <target name="grub" depends="prepare-dirs,test-grub" unless="grub.exists">
- <untar src="${grub.dist}" dest="${my-build.dir}" compression="gzip" />
- </target>
-
- <!-- Initialize all project properties -->
- <target name="prepare" depends="grub">
- <copy todir="${grub.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- </target>
-
- <target name="asm-native" depends="prepare">
- <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}/">
- <class classname="java.lang.Throwable" />
- <class classname="org.jnode.build.x86.BootImageBuilder" static="on" />
- <class classname="org.jnode.vm.SoftByteCodes" static="on" />
- <class classname="org.jnode.vm.scheduler.VmProcessor" />
- <class classname="org.jnode.vm.scheduler.VmProcessor" static="on" />
- <class classname="org.jnode.vm.scheduler.VmThread" />
- <class classname="org.jnode.vm.scheduler.VmThread" static="on" />
- <class classname="org.jnode.vm.classmgr.ObjectLayout" static="on" />
- <class classname="org.jnode.vm.classmgr.TIBLayout" static="on" />
- <class classname="org.jnode.vm.classmgr.VmArray" static="on" />
- <class classname="org.jnode.vm.classmgr.VmMethod" />
- <class classname="org.jnode.vm.classmgr.VmStatics" />
- <class classname="org.jnode.vm.classmgr.VmType" />
- <class classname="org.jnode.vm.x86.MSR" />
- <class classname="org.jnode.vm.x86.VmX86Processor" />
- <class classname="org.jnode.vm.x86.VmX86StackReader" static="on" />
- <class classname="org.jnode.vm.x86.VmX86Thread" />
- <class classname="org.jnode.vm.x86.VmX86Thread" static="on" />
- <class classname="org.jnode.vm.x86.VmX86Thread64" />
- </genconst>
-
- <dependset>
- <srcfileset dir="${src.native.dir}/x86" />
- <srcfileset dir="${build.native.dir}/src" />
- <targetfileset dir="${build.native.dir}/output" />
- </dependset>
-
- <asm srcdir="${src.native.dir}/x86"
- destdir="${build.native.dir}/output"
- outputFormat="elf"
- extension="o"
- bits="${jnode.bits}"
- listfile="${build.native.dir}/jnodenative.lst"
- enablejnasm="${jnode.enable.jnasm}"
- version="${jnode-ver} ${TODAY}">
- <includedir dir="${src.native.dir}/x86" />
- <includedir dir="${build.native.dir}/src" />
- <include name="jnode.asm" />
- </asm>
- </target>
-
- <!-- Build the java object file -->
- <target name="java-image" depends="asm-native">
- <taskdef name="bootimage" classname="org.jnode.build.x86.BootImageBuilder" classpathref="cp-x86" />
-
- <bootimage
- destfile="${build.bootimage.dir}/bootimage.bin"
- listfile="${build.bootimage.dir}/bootimage.lst"
- debugfile="${build.bootimage.dir}/bootimage.debug"
- kernelfile="${build.native.dir}/output/jnode.o"
- pluginList="${system-plugin-list}"
- pluginDir="${plugins.dir}"
- targetArch="x86"
- memMgrPluginId="${jnode.memmgr.plugin.id}"
- cpu="${cpu}"
- version="${jnode-ver}"
- jnodeCompiler="${jnode.compiler}"
- bits="${jnode.bits}"
- enableJNasm="${jnode.enable.jnasm}">
-
- <nanokernelsources srcfile="${src.native.dir}/x86/jnode.asm">
- <includedir dir="${src.native.dir}/x86" />
- <includedir dir="${build.native.dir}/src" />
- </nanokernelsources>
-
- </bootimage>
-
- <gzip src="${build.bootimage.dir}/bootimage.bin" zipfile="${jnode.kernel}" />
- </target>
-
- <!-- Build the boot disk -->
- <target name="boot-disk" depends="java-image" unless="no.bootdisk">
- <taskdef name="bootdisk" classname="org.jnode.build.BootDiskBuilder" classpathref="cp-x86" />
-
- <property name="bootdisk.dir" value="${my-build.dir}/${jnode.bits}bits/bootdisk" />
-
- <mkdir dir="${bootdisk.dir}" />
- <mkdir dir="${bootdisk.dir}/boot/grub" />
- <copy file="${jnode.kernel}" todir="${bootdisk.dir}" />
- <copy file="${grub.menu}" todir="${bootdisk.dir}/boot/grub" />
- <copy todir="${bootdisk.dir}">
- <fileset dir="${initjars.dir}">
- <!-- Limit the size of the bootdisk -->
- <include name="default.jgz"/>
- <include name="full.jgz"/>
- </fileset>
- </copy>
-
- <bootdisk destfile="${jnode.disk}" stage1ResourceName="${grub.stage1.name}" stage2ResourceName="${grub.stage2.name}" plnfile="${jnode.disk.pln}" geometry="${jnode.disk.geometry}">
- <fileset dir="${bootdisk.dir}" />
- </bootdisk>
- </target>
-
- <!-- Build the boot files for windows NT/2K/XP (with NTLDR) -->
- <target name="boot-files-winNT" depends="java-image">
- <mkdir dir="${jnode.install-nt.dir}" />
-
- <copy file="${jnode.kernel}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy file="${grub.menu}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy todir="${jnode.install-nt.dir}" overwrite ="yes">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy file="${grub.stage1-nt}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy file="${grub.stage2-nt}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
-
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="(hd0,0)" value="${partition-nt.grub.menu}"/>
-
- <!-- patch -->
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="${partition-nt.grub.menu}" value="${partition-nt.grub.menu.final}"/>
-
-
- <echo message="${grub.install-nt.exe} -d ${partition-nt} -1 ${jnode.install-nt.dir}\${grub.stage1-nt.name} -2 ${jnode.install-nt.dir}\${grub.stage2-nt.name} -m ${jnode.install-nt.dir}\menu.lst" />
-
- <!-- the following wait is needed else grubinstall will fail finding stage2 -->
- <sleep seconds="20" />
-
- <exec executable="${grub.install-nt.exe}">
- <arg line="-d ${partition-nt} -1 ${jnode.install-nt.dir}\${grub.stage1-nt.name} -2 ${jnode.install-nt.dir}\${grub.stage2-nt.name} -m ${jnode.install-nt.dir}\menu.lst" />
- </exec>
-
- <!-- patch
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="${partition-nt.grub.menu}" value="${partition-nt.grub.menu.final}"/>
- -->
- </target>
-
- <macrodef name="create-cdrom">
- <attribute name="dir" />
- <attribute name="destfile" />
- <sequential>
- <mkdir dir="@{dir}/boot/grub" />
- <copy todir="@{dir}">
- <fileset dir="${jnode.kernel.dir}" includes="jnode*.gz"/>
- </copy>
- <copy todir="@{dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <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 -->
- <target name="cdrom" depends="prepare">
- <copy file="${sources.dist.tar.gz}" todir="${my-build.dir}/cdrom-full" />
- <create-cdrom destfile="${jnode-x86.iso}" dir="${my-build.dir}/cdrom-full" />
-
- <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
- <vmware
- isoFile="${jnode-x86.iso}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <!-- Create a bootable CDROM image -->
- <target name="cdrom-lite" depends="prepare">
- <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}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <target name="cdrom_64-lite" depends="prepare">
- <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}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <!-- Prepare for netboot -->
- <target name="netboot" depends="java-image" unless="no.netboot">
- <copy file="${jnode.kernel}" todir="${build.netboot.dir}" />
- <copy todir="${build.netboot.dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy todir="${build.netboot.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- <mkdir dir="${build.netboot.dir}/plugins" />
- <copy todir="${build.netboot.dir}/plugins">
- <fileset dir="${plugins.dir}" />
- </copy>
- </target>
-
- <!-- Run all required targets -->
- <target name="all" depends="boot-disk,netboot">
- </target>
-
-</project>
-
-
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,4 +1,4 @@
-<project name="JNode" default="assemble-plugins" basedir=".">
+<project name="JNode" default="classlib" basedir=".">
<!-- if task is used from this -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
<!-- before including jnode.xml, we must set this property -->
@@ -100,9 +100,6 @@
<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="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="${mmtk.jar}"/>
@@ -199,6 +196,13 @@
<mkdir dir="${initjars.dir}"/>
</target>
+ <target name="classlib" depends="prepare">
+ <!-- pre compile tasks needed for compilation -->
+ <ant target="compile" dir="${root.dir}/core" inheritall="on" inheritrefs="on" />
+ <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" />
+ <antcall target="openjdk-annotate"/>
+ </target>
+
<!-- Call the assemble target of all subprojects -->
<target name="assemble-projects" depends="prepare">
<!-- pre compile tasks needed for compilation -->
@@ -311,18 +315,6 @@
by specifying one or more targets on the command line.
See the list below for an explanation of all targets.
-x86 Build the JNode bootable image for the X86 32-bit
- architecture.
-x86_64 Build the JNode bootable image for the X86 64-bit
- architecture (AMD64).
-
-cd-x86 Build the JNode bootable CD-ROM for the X86
- architecture 32 and 64-bit. The CD-ROM also
- contains the JNode sources.
-cd-x86-lite Build the JNode bootable CD-ROM for the X86
- 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
@@ -345,32 +337,6 @@
</echo>
</target>
- <!-- Macro used to call the x86 build script -->
- <macrodef name="x86-build">
- <attribute name="bits"/>
- <attribute name="target" default="all"/>
- <sequential>
- <ant antfile="build-x86.xml" inheritall="on" inheritrefs="on" target="@{target}">
- <property name="jnode.bits" value="@{bits}"/>
- </ant>
- </sequential>
- </macrodef>
-
- <!-- Create the X86 32-bit boot image -->
- <target name="x86" depends="assemble">
- <x86-build bits="32"/>
- </target>
-
- <!-- Create the X86 64-bit boot image-->
- <target name="x86_64" depends="assemble">
- <x86-build bits="64"/>
- </target>
-
- <!-- Create the JOP boot image -->
- <target name="jop" depends="assemble">
- <ant antfile="build-jop.xml" inheritall="on" inheritrefs="on"/>
- </target>
-
<!-- Upload a distribution -->
<target name="upload">
<property name="upload.dir" value="${build.dir}/upload"/>
@@ -760,7 +726,7 @@
</cp-compare>
</target>
- <target name="openjdk-annotate" depends="assemble-projects">
+ <target name="openjdk-annotate">
<taskdef name="oj-annotate" classname="org.jnode.ant.taskdefs.AnnotateTask"
classpathref="cp-jnode"/>
@@ -829,71 +795,6 @@
</descriptors>
</checkDeps>
</target>
-
- <!-- Define the task that check the rules -->
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"
- classpathref="cp-jnode">
- <classpath>
- <pathelement location="${pmd.jar}"/>
- <pathelement location="${jaxen.jar}"/>
- <pathelement location="${saxpath.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
- </classpath>
- </taskdef>
-
-
- <!-- Macro used to check that the rules are applied in the source code -->
- <macrodef name="checkProjectRules">
- <attribute name="projectName"/>
- <attribute name="webSrcUrl"/>
- <attribute name="projectSrc"/>
- <sequential>
- <property name="nbFailures" value="0"/>
- <echo message="Scanning @{projectName}."/>
- <property name="tmp" value="../@{projectSrc}"/>
- <pmd failuresPropertyName="nbFailures">
- <formatter type="html" toFile="${reports.dir}/pmd_report-@{projectName}.html"/>
-
- <ruleset>rulesets/favorites.xml</ruleset>
- <ruleset>rulesets/basic.xml</ruleset>
-
- <fileset dir="../@{projectSrc}" includes="**/*.java"/>
- </pmd>
- <echo message="There was ${nbFailures} failures in @{projectName}."/>
- </sequential>
- </macrodef>
-
- <target name="checkJNodeRules" depends="prepare">
- <parallel>
- <checkProjectRules projectName="distr" webSrcUrl="distr" projectSrc="distr"/>
- <checkProjectRules projectName="JNode-Builder" webSrcUrl="builder" projectSrc="builder"/>
- <checkProjectRules projectName="JNode-Core" webSrcUrl="core" projectSrc="core"/>
- <checkProjectRules projectName="JNode-FS" webSrcUrl="fs" projectSrc="fs"/>
- <checkProjectRules projectName="JNode-GUI" webSrcUrl="gui" projectSrc="gui"/>
- <checkProjectRules projectName="JNode-Net" webSrcUrl="net" projectSrc="net"/>
- <checkProjectRules projectName="JNode-Shell" webSrcUrl="shell" projectSrc="shell"/>
- <checkProjectRules projectName="JNode-TestUI" webSrcUrl="textui" projectSrc="textui"/>
- </parallel>
- </target>
-
- <!-- Document all plugins -->
- <target name="document-plugins" depends="assemble-projects">
- <taskdef name="plugindocumentation" classname="org.jnode.build.documentation.PluginDocumentationTask" classpathref="cp-jnode"/>
-
- <plugindocumentation
- destdir="${reports.dir}/plugins"
- pluginDir="${descriptors.dir}"
- tree="${jnode.plugin.doc.tree}">
- <descriptors dir="${descriptors.dir}/">
- <include name="*.xml"/>
- <exclude name="*plugin-list.xml"/>
- </descriptors>
- </plugindocumentation>
-
- </target>
-
-
<!-- Create a patch -->
<!-- TODO create replacement SVN task
<target name="create-patch">
Deleted: classlib6/all/jnode_checks.xml
===================================================================
--- classlib6/all/jnode_checks.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/jnode_checks.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-<!-- <module name="PackageHtml"/> -->
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-<!-- <module name="Translation"/> -->
-
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-<!-- <module name="JavadocMethod"/>
- <module name="JavadocType"/>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle"/> -->
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
-<!-- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/> -->
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
-<!-- <module name="IllegalImport"/> --><!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
-<!-- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/> -->
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <!--<module name="OperatorWrap">
- <property name="option" value="eol"/>
- </module>-->
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN,
- BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
- EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH,
- LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
- LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
- LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS,
- PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
- STAR, STAR_ASSIGN"/>
- <property name="allowEmptyConstructors" value="true"/>
- <property name="allowEmptyMethods" value="true"/>
- </module>
-
- <module name="Indentation"/>
- <module name="TabCharacter"/>
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-<!-- <module name="RedundantModifier"/> -->
- <module name="ModifierOrder"/>
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="EmptyBlock">
- <property name="option" value="text" />
- </module>
- <module name="LeftCurly"/>
- <module name="RightCurly"/>
- <!--module name="NeedBraces"/-->
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true" />
- </module>
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
-<!-- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/> -->
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
-<!-- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/> -->
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!-- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/> -->
-
- </module>
-
-</module>
Deleted: classlib6/all/new_checks.xml
===================================================================
--- classlib6/all/new_checks.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/new_checks.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <!-- temporally disable since pakage-info.java is not supported
- <module name="PackageHtml"/>
- -->
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-<!-- <module name="Translation"/> -->
-
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocType">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowUndeclaredRTE" value="true"/>
- <property name="allowMissingParamTags" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
- <property name="allowMissingReturnTag" value="true"/>
- </module>
- <module name="JavadocVariable">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocStyle"/>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
-<!-- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/> -->
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
-<!-- <module name="IllegalImport"/> --><!-- defaults to sun.* packages -->
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
-<!-- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/> -->
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <!--<module name="OperatorWrap">
- <property name="option" value="eol"/>
- </module>-->
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-<!-- <module name="RedundantModifier"/> -->
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <!--module name="NeedBraces"/-->
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
-<!-- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/> -->
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
-<!-- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/> -->
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!-- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/> -->
-
- </module>
-
-</module>
Modified: classlib6/builder/build.xml
===================================================================
--- classlib6/builder/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/builder/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -24,8 +24,6 @@
<!-- Initialize all subproject directories -->
<target name="prepare">
<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"/>
@@ -37,17 +35,16 @@
<javac destdir="${my-classes.dir}"
debug="on"
optimize="on"
- fork="off"
+ fork="on"
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" />
+ srcdir="${my-src.dir}/builder">
+ <classpath refid="my-cp"/>
+ <filename name="org/jnode/ant/taskdefs/AnnotateTask.java" />
</javac>
<jar jarfile="${jnode-builder.jar}"
basedir="${my-classes.dir}"
Modified: classlib6/core/build.xml
===================================================================
--- classlib6/core/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/core/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -33,11 +33,6 @@
<pathelement location="${my-src.dir}/icedtea"/>
<pathelement location="${my-src.dir}/classlib"/>
</path>
- <path id="classpath-sources-vm">
- <pathelement location="${my-src.dir}/classpath/ext"/>
- <pathelement location="${my-src.dir}/classpath/vm"/>
- <pathelement location="${my-src.dir}/openjdk/vm"/>
- </path>
<path id="classpath-sources-corba">
<pathelement location="${my-src.dir}/openjdk/corba"/>
</path>
@@ -47,16 +42,6 @@
<path id="classpath-sources-langtools">
<pathelement location="${my-src.dir}/openjdk/langtools"/>
</path>
- <path id="my-sources1">
- <path refid="classpath-sources-vm"/>
- <pathelement location="${my-src.dir}/core"/>
- <pathelement location="${my-src.dir}/endorsed/nanoxml"/>
- <pathelement location="${my-src.dir}/vmmagic"/>
- <pathelement location="${my-src.dir}/mmtk-vm"/>
- </path>
- <path id="my-sources">
- <path refid="my-sources1"/>
- </path>
<macrodef name="ExpandTest">
<attribute name="classname"/>
@@ -72,32 +57,6 @@
</sequential>
</macrodef>
- <macrodef name="CreatePlan">
- <attribute name="package"/>
- <sequential>
- <copy tofile="${my-gen-plan.dir}/@{package}/org/mmtk/vm/Plan.java"
- file="${my-src.dir}/mmtk-vm/org/mmtk/vm/Plan.template">
- <filterset>
- <filter token="PKG" value="@{package}"/>
- </filterset>
- </copy>
- <copy tofile="${my-gen-plan.dir}/@{package}/org/mmtk/vm/PlanConstants.java"
- file="${my-src.dir}/mmtk-vm/org/mmtk/vm/PlanConstants.template">
- <filterset>
- <filter token="PKG" value="@{package}"/>
- </filterset>
- </copy>
- <mkdir dir="${my-classes-plan.dir}/@{package}/"/>
- <jnode.compile destdir="${my-classes-plan.dir}/@{package}/">
- <src path="${my-gen-plan.dir}/@{package}/"/>
- <classpath>
- <pathelement location="${jnode-code.jar}"/>
- <pathelement location="${mmtk.jar}"/>
- </classpath>
- </jnode.compile>
- </sequential>
- </macrodef>
-
<!-- Initialize all subproject directories -->
<target name="prepare">
<mkdir dir="${my-classes.dir}"/>
@@ -107,7 +66,6 @@
<copy todir="${my-classes.dir}">
<fileset dir="${my-src.dir}/classpath/gnu" includes="**/*.properties"/>
<fileset dir="${my-src.dir}/classpath/java" includes="**/*.properties"/>
- <fileset dir="${my-src.dir}/classpath/vm" includes="**/*.security"/>
<fileset dir="${my-src.dir}/classpath/tools" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/java" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/javax" includes="**/*.jav"/>
@@ -115,20 +73,7 @@
<fileset dir="${my-src.dir}/openjdk/com" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/sun" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/svm" includes="**/*.jav"/>
- <fileset dir="${my-src.dir}/openjdk/vm" includes="**/*.jav"/>
</copy>
-
- <taskdef name="template" classname="org.jnode.ant.taskdefs.TemplateTask" classpathref="cp-jnode"/>
- <template file="${my-src.dir}/template/org/jnode/vm/VmSystemSettings.java"
- tofile="${my-gen.dir}/org/jnode/vm/VmSystemSettings.java">
- <token name="@java.home@" value="${jnode.java.home}"/>
- <token name="@java.io.tmpdir@" value="${jnode.java.io.tmpdir}"/>
- <token name="@user.home@" value="${jnode.user.home}"/>
- </template>
- <template file="${my-src.dir}/template/org/jnode/security/JNodeSecurityManagerSettings.java"
- tofile="${my-gen.dir}/org/jnode/security/JNodeSecurityManagerSettings.java">
- <token name="@jnode.security.enabled@" value="${jnode.security.enabled}"/>
- </template>
</target>
<!-- Compile all subproject java files -->
@@ -139,10 +84,6 @@
</jnode.compile>
<parallel >
<jnode.compile>
- <src refid="my-sources" />
- <classpath refid="my-cp"/>
- </jnode.compile>
- <jnode.compile>
<src refid="classpath-sources-corba" />
<classpath refid="my-cp"/>
</jnode.compile>
@@ -161,8 +102,6 @@
<fileset dir="${my-src.dir}/classpath/gnu" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/java" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/javax" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/classpath/ext" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/classpath/vm" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/tools" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/java" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/javax" excludes="${my-non-resources}"/>
@@ -170,15 +109,10 @@
<fileset dir="${my-src.dir}/openjdk/com" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/sun" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/svm" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/openjdk/vm" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/corba" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/jaxws" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/langtools" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/icedtea" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/core" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/endorsed/nanoxml" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/vmmagic" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/mmtk-vm" excludes="${my-non-resources}"/>
</copy>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-04-12 08:39:46
|
Revision: 5254
http://jnode.svn.sourceforge.net/jnode/?rev=5254&view=rev
Author: lsantha
Date: 2009-04-12 08:39:42 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
Removing non-classlib classes.
Modified Paths:
--------------
classlib6/builder/builder.iml
classlib6/core/core.iml
Removed Paths:
-------------
classlib6/core/src/native/
Modified: classlib6/builder/builder.iml
===================================================================
--- classlib6/builder/builder.iml 2009-04-12 07:55:10 UTC (rev 5253)
+++ classlib6/builder/builder.iml 2009-04-12 08:39:42 UTC (rev 5254)
@@ -6,7 +6,6 @@
<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" />
Modified: classlib6/core/core.iml
===================================================================
--- classlib6/core/core.iml 2009-04-12 07:55:10 UTC (rev 5253)
+++ classlib6/core/core.iml 2009-04-12 08:39:42 UTC (rev 5254)
@@ -6,16 +6,11 @@
<exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/classlib" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/classpath/ext" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/gnu" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/javax" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/tools" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/classpath/vm" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/core" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/endorsed/nanoxml" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/icedtea" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/mmtk-vm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/com" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/corba" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/java" isTestSource="false" />
@@ -25,8 +20,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/org" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/sun" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/svm" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/openjdk/vm" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/vmmagic" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-04-13 19:16:04
|
Revision: 5264
http://jnode.svn.sourceforge.net/jnode/?rev=5264&view=rev
Author: lsantha
Date: 2009-04-13 19:15:54 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
Cleanups.
Modified Paths:
--------------
classlib6/builder/builder.iml
classlib6/core/core.iml
Removed Paths:
-------------
classlib6/all/bin-nt/
classlib6/all/conf/x86/
classlib6/all/lib/x86/
classlib6/all/lib/x86-nt/
classlib6/core/descriptors/org.jnode.debug.xml
classlib6/core/descriptors/org.jnode.debugger.xml
classlib6/core/descriptors/org.jnode.driver.bus.firewire.xml
classlib6/core/descriptors/org.jnode.driver.bus.pci.xml
classlib6/core/descriptors/org.jnode.driver.bus.pcmcia.xml
classlib6/core/descriptors/org.jnode.driver.bus.smbus.xml
classlib6/core/descriptors/org.jnode.driver.bus.usb.hub.xml
classlib6/core/descriptors/org.jnode.driver.bus.usb.uhci.xml
classlib6/core/descriptors/org.jnode.driver.bus.usb.xml
classlib6/core/descriptors/org.jnode.driver.character.xml
classlib6/core/descriptors/org.jnode.driver.chipset.i440BX.xml
classlib6/core/descriptors/org.jnode.driver.chipset.via.xml
classlib6/core/descriptors/org.jnode.driver.chipset.xml
classlib6/core/descriptors/org.jnode.driver.console.core.xml
classlib6/core/descriptors/org.jnode.driver.console.textscreen.xml
classlib6/core/descriptors/org.jnode.driver.console_x86.xml
classlib6/core/descriptors/org.jnode.driver.finder.xml
classlib6/core/descriptors/org.jnode.driver.input.l10n.xml
classlib6/core/descriptors/org.jnode.driver.input.xml
classlib6/core/descriptors/org.jnode.driver.serial.xml
classlib6/core/descriptors/org.jnode.driver.system.acpi.xml
classlib6/core/descriptors/org.jnode.driver.system.cmos.xml
classlib6/core/descriptors/org.jnode.driver.system.firmware.bios.xml
classlib6/core/descriptors/org.jnode.driver.system.firmware.xml
classlib6/core/descriptors/org.jnode.driver.system.pnp.xml
classlib6/core/descriptors/org.jnode.driver.system.ram.xml
classlib6/core/descriptors/org.jnode.driver.textscreen.core.xml
classlib6/core/descriptors/org.jnode.driver.textscreen_x86.xml
classlib6/core/descriptors/org.jnode.driver.xml
classlib6/core/descriptors/org.jnode.log4j.xml
classlib6/core/descriptors/org.jnode.protocol.xml
classlib6/core/descriptors/org.jnode.runtime.core.xml
classlib6/core/descriptors/org.jnode.runtime_x86.xml
classlib6/core/descriptors/org.jnode.security.xml
classlib6/core/descriptors/org.jnode.system.repository.xml
classlib6/core/descriptors/org.jnode.test.core.xml
classlib6/core/descriptors/org.jnode.test.xml
classlib6/core/descriptors/org.jnode.testrunner.xml
classlib6/core/descriptors/org.jnode.util.xml
classlib6/core/descriptors/org.jnode.vm.core.xml
classlib6/core/descriptors/org.jnode.vm.memmgr.def.xml
classlib6/core/descriptors/org.jnode.vm_x86.xml
classlib6/core/descriptors/org.jnode.work.xml
classlib6/core/lib/ejc-3.1.1.jar
classlib6/core/lib/findbugs/
classlib6/core/lib/mmtk/
Modified: classlib6/builder/builder.iml
===================================================================
--- classlib6/builder/builder.iml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/builder/builder.iml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -119,15 +119,6 @@
<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>
Modified: classlib6/core/core.iml
===================================================================
--- classlib6/core/core.iml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/core.iml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -27,15 +27,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/mmtk/mmtk.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/lib/mauve.jar!/" />
</CLASSES>
<JAVADOC />
@@ -56,15 +47,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/lib/jmock-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
Deleted: classlib6/core/descriptors/org.jnode.debug.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.debug.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.debug.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.debug"
- name="JNode debugging support"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.debug.*"/>
- </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
Deleted: classlib6/core/descriptors/org.jnode.debugger.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.debugger.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.debugger.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.debugger"
- name="JNode Debugger"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.debugger.DebuggerPlugin"
- priority="8">
-
- <requires>
- <import plugin="org.jnode.driver.input"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.debugger.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
- <permission class="org.jnode.driver.DriverPermission" name="setPreferredListener"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.firewire.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.firewire.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.firewire.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.firewire"
- name="JNode FireWire driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.firewire.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.bus.pci.PCIClassToDriverMapper"
- id="0c:00"
- driver-class="org.jnode.driver.bus.firewire.FireWireDriver"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.pci.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.pci.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.pci.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.pci"
- name="JNode PCI interfaces"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- <import plugin="org.jnode.driver.console"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.pci.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.finders">
- <finder class="org.jnode.driver.bus.pci.PCIFinder"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.pcmcia.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.pcmcia.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.pcmcia.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.pcmcia"
- name="JNode PCMCIA drivers"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.pcmcia.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.bus.pci.PCIClassToDriverMapper"
- id="06:07"
- driver-class="org.jnode.driver.bus.pcmcia.CardBusDriver"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.smbus.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.smbus.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.smbus.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.smbus"
- name="JNode SMBus Controller"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.smbus.*"/>
- </library>
- </runtime>
-
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.usb.hub.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.usb.hub.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.usb.hub.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.usb.hub"
- name="JNode USB HUB driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.usb"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.usb.hub.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.bus.usb.hub.USBHubDeviceToDriverMapper"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.usb.uhci.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.usb.uhci.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.usb.uhci.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.usb.uhci"
- name="JNode USB UHCI HostController driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- <import plugin="org.jnode.driver.bus.usb"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.usb.uhci.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.bus.pci.PCIClassToDriverMapper"
- id="0c:03:00"
- driver-class="org.jnode.driver.bus.usb.uhci.UHCIDriver"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.bus.usb.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.bus.usb.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.bus.usb.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.bus.usb"
- name="JNode USB driver basics"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.bus.usb.*"/>
- <export name="org.jnode.driver.bus.usb.spi.*"/>
- </library>
- </runtime>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.character.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.character.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.character.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.character"
- name="JNode Character driver interfaces"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.character.*"/>
- </library>
- </runtime>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.chipset.i440BX.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.chipset.i440BX.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.chipset.i440BX.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.chipset.i440BX"
- name="JNode i440BX chipset drivers"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.chipset"/>
- <import plugin="org.jnode.driver.bus.smbus"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.chipset.i440BX.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.chipset.i440BX.i440BXDeviceToDriverMapper"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.chipset.via.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.chipset.via.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.chipset.via.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.chipset.via"
- name="JNode Via Chipset drivers"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="jnode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.chipset.via.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.chipset.via.ViaDeviceToDriverMapper"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.chipset.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.chipset.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.chipset.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.chipset"
- name="JNode chipset drivers"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.chipset.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.console.core.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.console.core.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.console.core.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.console.core"
- name="JNode Platform independent Console driver classes"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.input"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.console.*"/>
- <export name="org.jnode.driver.console.spi.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.console.textscreen.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.console.textscreen.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.console.textscreen.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.console.textscreen"
- name="JNode TextScreen Console driver"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.driver.console.textscreen.TextScreenConsolePlugin">
-
- <requires>
- <import plugin="org.jnode.driver.console.core"/>
- <import plugin="org.jnode.driver.textscreen"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.console.textscreen.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.lang.RuntimePermission" name="setIO"/>
- </extension>
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.console_x86.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.console_x86.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.console_x86.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.console"
- name="JNode X86 Console driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.console.textscreen"/>
- </requires>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.finder.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.finder.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.finder.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.finder"
- name="JNode System Device Finder"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.driver.DeviceFinderPlugin"
- auto-start="true">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- <import plugin="org.jnode.driver.system.cmos"/>
- <import plugin="org.jnode.driver.console"/>
- <import plugin="org.jnode.log4j"/>
- </requires>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.input.l10n.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.input.l10n.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.input.l10n.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.input.l10n"
- name="JNode input l10n driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.input"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.input.l10n.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.input.keyboard-layouts">
- <layout name="BE_fr" class="org.jnode.driver.input.l10n.KeyboardInterpreter_BE_fr"/>
- <layout name="CH_fr" class="org.jnode.driver.input.l10n.KeyboardInterpreter_CH_fr"/>
- <layout name="DE" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DE"/>
- <layout name="DE_de" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DE"/>
- <layout name="DK" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DK"/>
- <layout name="DK_dk" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DK"/>
- <layout name="ES" class="org.jnode.driver.input.l10n.KeyboardInterpreter_ES"/>
- <layout name="ES_es" class="org.jnode.driver.input.l10n.KeyboardInterpreter_ES"/>
- <layout name="FR" class="org.jnode.driver.input.l10n.KeyboardInterpreter_FR"/>
- <layout name="FR_fr" class="org.jnode.driver.input.l10n.KeyboardInterpreter_FR"/>
- <layout name="GB" class="org.jnode.driver.input.l10n.KeyboardInterpreter_GB_en"/>
- <layout name="GB_en" class="org.jnode.driver.input.l10n.KeyboardInterpreter_GB_en"/>
- <layout name="HU" class="org.jnode.driver.input.l10n.KeyboardInterpreter_HU"/>
- <layout name="HU_hu" class="org.jnode.driver.input.l10n.KeyboardInterpreter_HU"/>
- <layout name="HU_hu_101" class="org.jnode.driver.input.l10n.KeyboardInterpreter_HU"/>
- <layout name="HU_101" class="org.jnode.driver.input.l10n.KeyboardInterpreter_HU"/>
- <layout name="IT" class="org.jnode.driver.input.l10n.KeyboardInterpreter_IT"/>
- <layout name="IT_it" class="org.jnode.driver.input.l10n.KeyboardInterpreter_IT"/>
- <layout name="NO" class="org.jnode.driver.input.l10n.KeyboardInterpreter_NO"/>
- <layout name="NO_no" class="org.jnode.driver.input.l10n.KeyboardInterpreter_NO"/>
- <layout name="RU" class="org.jnode.driver.input.l10n.KeyboardInterpreter_RU"/>
- <layout name="RU_ru" class="org.jnode.driver.input.l10n.KeyboardInterpreter_RU"/>
- <layout name="SE" class="org.jnode.driver.input.l10n.KeyboardInterpreter_SE"/>
- <layout name="SE_se" class="org.jnode.driver.input.l10n.KeyboardInterpreter_SE"/>
- <layout name="US" class="org.jnode.driver.input.l10n.KeyboardInterpreter_US_en"/>
- <layout name="US_en" class="org.jnode.driver.input.l10n.KeyboardInterpreter_US_en"/>
- <layout name="DV" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DV"/> <!-- deprecated -->
- <layout name="US_en_dvorak" class="org.jnode.driver.input.l10n.KeyboardInterpreter_DV"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.input.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.input.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.input.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.input"
- name="JNode input driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org"
- class="org.jnode.driver.input.KeyboardInputPlugin">
-
- <requires>
- <import plugin="org.jnode.driver.character"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.input.*"/>
- </library>
- </runtime>
-
- <extension-point id="keyboard-layouts" name="Standard keyboard layout identifier mappings"/>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.driver.DriverPermission" name="setPreferredListener"/>
- <permission class="java.lang.RuntimePermission" name="setIO"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.serial.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.serial.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.serial.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.serial"
- name="JNode serial port driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.character"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.serial.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.finders">
- <finder class="org.jnode.driver.serial.SerialPortFinder"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.driver.system.acpi.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.acpi.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.acpi.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.acpi"
- name="JNode ACPI"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.system.pnp"/>
- <import plugin="org.jnode.driver.system.firmware"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.acpi.*"/>
- <export name="org.jnode.driver.system.acpi.aml.*"/>
- <export name="org.jnode.driver.system.acpi.vm.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.system.acpi.AcpiDeviceToDriverMapper"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.security.JNodePermission" name="getMemoryMap"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.system.cmos.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.cmos.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.cmos.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.cmos"
- name="JNode CMOS driver classes"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.driver.system.cmos.def.CMOSPlugin">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.cmos.*"/>
- <export name="org.jnode.driver.system.cmos.def.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.system.firmware.bios.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.firmware.bios.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.firmware.bios.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.firmware.bios"
- name="JNode BIOS firmware support"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.system.firmware"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.firmware.bios.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.finders">
- <finder class="org.jnode.driver.system.firmware.bios.BiosFinder"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="memoryScanner"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.system.firmware.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.firmware.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.firmware.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.firmware"
- name="JNode firmware support"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.firmware.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.system.pnp.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.pnp.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.pnp.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.pnp"
- name="JNode Plug and Play"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="ozog.com">
-
- <requires>
- <import plugin="org.jnode.driver"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.pnp.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.system.ram.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.system.ram.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.system.ram.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.system.ram"
- name="JNode RAM Controller"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.system.ram.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.textscreen.core.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.textscreen.core.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.textscreen.core.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.textscreen.core"
- name="JNode Platform independent TextScreen interfaces"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.input"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.textscreen.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.textscreen_x86.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.textscreen_x86.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.textscreen_x86.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.textscreen"
- name="JNode X86 Console TextScreen driver for X86"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.driver.textscreen.x86.PcTextScreenPlugin">
-
- <requires>
- <import plugin="org.jnode.driver.textscreen.core"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.textscreen.x86.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.driver.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.driver.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.driver.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver"
- name="JNode Driver Framework"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.driver.DriverPlugin">
-
- <requires>
- <import plugin="org.jnode.work"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.driver.*"/>
- <export name="org.jnode.driver.virtual.*"/>
- </library>
- </runtime>
-
- <extension-point id="finders" name="System device finders"/>
-
- <extension-point id="mappers" name="Device to Driver mappers"/>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.lang.RuntimePermission" name="getClassLoader"/>
- <permission class="java.util.PropertyPermission" name="jnode.cmdline" actions="read"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.log4j.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.log4j.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.log4j.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.log4j"
- name="JNode Log4j setup"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.log4j.config.Log4jConfigurePlugin">
-
- <requires>
- <import plugin="org.jnode.driver.console"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.log4j.config.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.protocol.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.protocol.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.protocol.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.protocol"
- name="JNode protocol handler factory"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.protocol.ProtocolHandlerFactoryPlugin">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.protocol.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.lang.RuntimePermission" name="setFactory"/>
- </extension>
-
- <extension-point id="handlers" name="Protocol handlers"/>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.runtime.core.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.runtime.core.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.runtime.core.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.runtime.core"
- name="JNode core runtime classes"
- version="@VERSION@"
- system="true"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="nanoxml"/>
- <import plugin="org.jnode.util"/>
- <import plugin="org.jnode.security"/>
- <import plugin="org.jnode.vm"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.boot.*"/>
- <export name="org.jnode.naming.*"/>
- <export name="org.jnode.plugin.*"/>
- <export name="org.jnode.plugin.manager.*"/>
- <export name="org.jnode.plugin.model.*"/>
- <export name="org.jnode.protocol.plugin.*"/>
- <export name="org.jnode.protocol.system.*"/>
- <export name="org.jnode.system.*"/>
- <export name="org.jnode.system.event.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.runtime_x86.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.runtime_x86.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.runtime_x86.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.runtime"
- name="JNode core runtime classes specific to X86"
- version="@VERSION@"
- provider-name="JNode.org"
- system="true"
- license-name="lgpl"
- class="org.jnode.system.x86.DMAPlugin">
-
- <requires>
- <import plugin="org.jnode.runtime.core"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.system.x86.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.security.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.security.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.security.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.security"
- name="JNode security system"
- version="@VERSION@"
- system="true"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.security.SecurityPlugin">
-
- <requires>
- <import plugin="org.jnode.vm"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.security.*"/>
- <export name="security.*"/>
- </library>
- </runtime>
-
- <extension-point id="permissions" name="Requested permissions per plugin"/>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.system.repository.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.system.repository.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.system.repository.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.system.repository"
- name="JNode System Repository"
- version="@VERSION@"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.system.repository.SystemRepositoryPlugin"
- auto-start="true">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.system.repository.*"/>
- <export name="org.jnode.system.repository.plugins.*"/>
- <export name="org.jnode.system.repository.spi.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.security.JNodePermission" name="createPluginLoader"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.test.core.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.test.core.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.test.core.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.test.core"
- name="JNode Core (VM/OS) Test classes"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.test.core.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.shell.aliases">
- <alias name="ArithOpt" class="org.jnode.test.core.ArithOpt"/>
- <alias name="IsolateTest" class="org.jnode.test.core.IsolateTest"/>
- <alias name="LinkTest" class="org.jnode.test.core.LinkTest"/>
- <alias name="PerfCtrTest" class="org.jnode.test.core.PerfCtrTest"/>
- <alias name="Sieve" class="org.jnode.test.core.Sieve"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.util.PropertyPermission" name="user.home" actions="read"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.test.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.test.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.test.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.test"
- name="JNode Test classes"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.junit"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.test.*"/>
- <export name="org.jnode.test.bugs.*"/>
- <export name="org.jnode.test.security.*"/>
- <export name="org.jnode.test.threads.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.shell.aliases">
- <alias name="TestSecurityManager" class="org.jnode.test.security.TestSecurityManager"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.util.PropertyPermission" name="user.home" actions="read"/>
- <!-- JMXTest -->
- <permission class="javax.management.MBeanServerPermission" name="*"/>
- <permission class="javax.management.MBeanPermission" name="*" actions="*"/>
-
- <!-- ResourceTest -->
- <permission class="java.util.PropertyPermission" name="user.language" actions="write"/>
-
- <!-- TestSecurityManager -->
- <permission class="java.lang.RuntimePermission" name="createSecurityManager"/>
- <permission class="java.lang.RuntimePermission" name="setSecurityManager"/>
- <permission class="java.lang.RuntimePermission" name="accessDeclaredMembers"/>
- </extension>
-
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.testrunner.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.testrunner.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.testrunner.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.testrunner"
- name="JNode Test runner"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org"
- auto-start="true"
- class="org.jnode.test.framework.TestRunnerPlugin"
- priority="1">
-
- <requires>
- <import plugin="org.junit"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.test.framework.*"/>
- </library>
- </runtime>
-
- <extension-point id="tests" name="Tests"/>
-
- <extension point="org.jnode.security.permissions">
- <permission class="java.util.PropertyPermission" name="java.io.tmpdir" actions="read"/>
- <permission class="java.util.PropertyPermission" name="user.home" actions="read"/>
- </extension>
-</plugin>
Deleted: classlib6/core/descriptors/org.jnode.util.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.util.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.util.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.util"
- name="JNode utility classes"
- version="@VERSION@"
- system="true"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.util.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.vm.core.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.vm.core.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.vm.core.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.vm.core"
- name="JNode VM classes"
- version="@VERSION@"
- system="true"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="rt"/>
- <!-- import plugin="org.apache.jakarta.log4j"/ -->
- <!-- import plugin="org.jnode.fs.service"/ -->
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.vmmagic.pragma.*"/>
- <export name="org.vmmagic.unboxed.*"/>
- <export name="org.jnode.assembler.*"/>
- <export name="org.jnode.vm.*"/>
- <export name="org.jnode.annotation.*"/>
- <export name="org.jnode.vm.bytecode.*"/>
- <export name="org.jnode.vm.classmgr.*"/>
- <export name="org.jnode.vm.compiler.*"/>
- <export name="org.jnode.vm.isolate.*"/>
- <export name="org.jnode.vm.memmgr.*"/>
- <export name="org.jnode.vm.performance.*"/>
- <export name="org.jnode.vm.scheduler.*"/>
- </library>
- </runtime>
-
- <extension-point id="memmgr" name="Memory manager"/>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.vm.memmgr.def.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.vm.memmgr.def.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.vm.memmgr.def.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.vm.memmgr.def"
- name="JNode default memory manager"
- version="@VERSION@"
- system="true"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.vm.core"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.vm.memmgr.def.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.vm.core.memmgr">
- <mapper class="org.jnode.vm.memmgr.def.DefaultHeapManager"/>
- </extension>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.vm_x86.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.vm_x86.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.vm_x86.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.vm"
- name="JNode VM-X86 classes"
- version="@VERSION@"
- system="true"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.vm.core"/>
- </requires>
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.assembler.x86.*"/>
- <export name="org.jnode.vm.x86.*"/>
- <export name="org.jnode.vm.x86.compiler.*"/>
- <export name="org.jnode.vm.x86.compiler.stub.*"/>
- <export name="org.jnode.vm.x86.compiler.l1a.*"/>
- <export name="org.jnode.vm.x86.compiler.l1b.*"/>
- <export name="org.jnode.vm.x86.performance.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/descriptors/org.jnode.work.xml
===================================================================
--- classlib6/core/descriptors/org.jnode.work.xml 2009-04-13 14:56:44 UTC (rev 5263)
+++ classlib6/core/descriptors/org.jnode.work.xml 2009-04-13 19:15:54 UTC (rev 5264)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.work"
- name="JNode Work management"
- version="@VERSION@"
- system="true"
- provider-name="JNode.org"
- license-name="lgpl"
- class="org.jnode.work.WorkPlugin">
-
- <runtime>
- <library name="jnode-core.jar">
- <export name="org.jnode.work.*"/>
- </library>
- </runtime>
-
-</plugin>
\ No newline at end of file
Deleted: classlib6/core/lib/ejc-3.1.1.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-04-22 18:45:17
|
Revision: 5335
http://jnode.svn.sourceforge.net/jnode/?rev=5335&view=rev
Author: lsantha
Date: 2009-04-22 18:45:00 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
Fixed security exception & isolate failure.
Modified Paths:
--------------
classlib6/all/conf/openjdk-annotations.properties
classlib6/core/src/openjdk/java/java/io/UnixFileSystem.java
Modified: classlib6/all/conf/openjdk-annotations.properties
===================================================================
--- classlib6/all/conf/openjdk-annotations.properties 2009-04-22 10:56:34 UTC (rev 5334)
+++ classlib6/all/conf/openjdk-annotations.properties 2009-04-22 18:45:00 UTC (rev 5335)
@@ -11,6 +11,7 @@
java/awt/KeyboardFocusManager.class=SharedStatics
java/awt/Toolkit.class=SharedStatics
java/io/VMIOUtils.class=SharedStatics
+java/lang/Class.class=SharedStatics
java/lang/Thread.class=SharedStatics
java/lang/ThreadLocal.class=SharedStatics
java/lang/Throwable.class=MagicPermission
@@ -35,3 +36,4 @@
sun/misc/SharedSecrets.class=SharedStatics
sun/misc/Unsafe.class=SharedStatics,MagicPermission
sun/misc/VM.class=SharedStatics
+sun/reflect/ReflectionFactory.class=SharedStatics
Modified: classlib6/core/src/openjdk/java/java/io/UnixFileSystem.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/UnixFileSystem.java 2009-04-22 10:56:34 UTC (rev 5334)
+++ classlib6/core/src/openjdk/java/java/io/UnixFileSystem.java 2009-04-22 18:45:00 UTC (rev 5335)
@@ -132,8 +132,8 @@
}
public String resolve(File f) {
- if (isAbsolute(f)) return f.getPath();
- return resolve(System.getProperty("user.dir"), f.getPath());
+ if (isAbsolute(f)) return f.getPath(); //jnode
+ return resolve(AccessController.doPrivileged(new GetPropertyAction("user.dir")), f.getPath());
}
// Caches for canonicalization results to improve startup performance.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-04-23 13:55:02
|
Revision: 5337
http://jnode.svn.sourceforge.net/jnode/?rev=5337&view=rev
Author: crawley
Date: 2009-04-23 13:54:52 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
Fixing Eclipse project dependencies and build paths.
Modified Paths:
--------------
classlib6/all/.classpath
classlib6/all/.project
classlib6/builder/.classpath
classlib6/builder/.project
classlib6/core/.classpath
Modified: classlib6/all/.classpath
===================================================================
--- classlib6/all/.classpath 2009-04-22 19:10:02 UTC (rev 5336)
+++ classlib6/all/.classpath 2009-04-23 13:54:52 UTC (rev 5337)
@@ -2,9 +2,5 @@
<classpath>
<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: classlib6/all/.project
===================================================================
--- classlib6/all/.project 2009-04-22 19:10:02 UTC (rev 5336)
+++ classlib6/all/.project 2009-04-23 13:54:52 UTC (rev 5337)
@@ -3,13 +3,8 @@
<name>all</name>
<comment></comment>
<projects>
- <project>JNode-Builder</project>
- <project>JNode-Core</project>
- <project>JNode-Distr</project>
- <project>JNode-FS</project>
- <project>JNode-GUI</project>
- <project>JNode-Net</project>
- <project>JNode-Shell</project>
+ <project>builder</project>
+ <project>core</project>
</projects>
<buildSpec>
<buildCommand>
Modified: classlib6/builder/.classpath
===================================================================
--- classlib6/builder/.classpath 2009-04-22 19:10:02 UTC (rev 5336)
+++ classlib6/builder/.classpath 2009-04-23 13:54:52 UTC (rev 5337)
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/.svn/**" kind="src" path="src/builder"/>
+ <classpathentry excluding="**/.svn/**|org/jnode/build/**" 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="output" path="build/classes"/>
</classpath>
Modified: classlib6/builder/.project
===================================================================
--- classlib6/builder/.project 2009-04-22 19:10:02 UTC (rev 5336)
+++ classlib6/builder/.project 2009-04-23 13:54:52 UTC (rev 5337)
@@ -3,8 +3,7 @@
<name>builder</name>
<comment></comment>
<projects>
- <project>JNode-Core</project>
- <project>JNode-FS</project>
+ <project>core</project>
</projects>
<buildSpec>
<buildCommand>
Modified: classlib6/core/.classpath
===================================================================
--- classlib6/core/.classpath 2009-04-22 19:10:02 UTC (rev 5336)
+++ classlib6/core/.classpath 2009-04-23 13:54:52 UTC (rev 5337)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/**" kind="src" path="src/openjdk/vm"/>
+ <classpathentry excluding="nanoxml/" kind="src" path="src/endorsed"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src/classlib"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src/openjdk/svm"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src/emu"/>
- <classpathentry excluding="**/.svn/**" kind="src" path="src/endorsed/nanoxml"/>
<classpathentry excluding="**/*-template.java|**/.svn/**" kind="src" path="src/openjdk/sun"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src/openjdk/org"/>
<classpathentry excluding="**/*-template.java|**/.svn/**" kind="src" path="src/openjdk/com"/>
@@ -25,17 +25,9 @@
<classpathentry excluding="**/.svn/**" kind="src" path="src/template"/>
<classpathentry kind="lib" path="lib/ant.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.5.jar"/>
- <classpathentry kind="lib" path="lib/mmtk/mmtk.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-1.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-attrs-1.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-util-1.5.3.jar"/>
- <classpathentry kind="lib" path="lib/mauve.jar" sourcepath="lib/mauve-src.jar">
- <accessrules>
- <accessrule kind="nonaccessible" pattern="junit.framework/**"/>
- <accessrule kind="nonaccessible" pattern="netsourceforge.nanoxml/**"/>
- </accessrules>
- </classpathentry>
<classpathentry kind="lib" path="lib/ant-contrib-1.0b3.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-05-08 14:04:36
|
Revision: 5457
http://jnode.svn.sourceforge.net/jnode/?rev=5457&view=rev
Author: lsantha
Date: 2009-05-08 14:04:24 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Added support for uploading classlib binaries to an FTP server.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/jnode.properties.dist
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2009-05-08 14:03:22 UTC (rev 5456)
+++ classlib6/all/build.xml 2009-05-08 14:04:24 UTC (rev 5457)
@@ -196,7 +196,7 @@
<mkdir dir="${initjars.dir}"/>
</target>
- <target name="classlib" depends="prepare">
+ <target name="classlib" depends="prepare" description="build and package the classlib">
<property name="classlib.jar" value="${root.dir}/all/build/classlib.jar" />
<property name="classlib.pack" value="${root.dir}/all/build/classlib.pack.gz" />
<!-- pre compile tasks needed for compilation -->
@@ -215,11 +215,7 @@
<echo message="...done"/>
</target>
- <target name="quickdeploy" depends="classlib">
-
- </target>
-
- <target name="deploy">
+ <target name="classlib-src" depends="prepare" description="package the classlib sources">
<property name="classlib-src.jar" value="${root.dir}/all/build/classlib-src.jar" />
<jar compress="0" jarfile="${classlib-src.jar}" filesonly="true">
<fileset dir="${root.dir}/core/src/classlib" includes="**/*.java"/>
@@ -241,6 +237,121 @@
<bzip2 src="${classlib-src.jar}" destfile="${classlib-src.jar}.bz2"/>
</target>
+ <target name="copy" depends="prepare" description="copy the classlib binaries to the local JNode project">
+ <copy file="${root.dir}/all/build/classlib.jar" tofile="${main.jnode.dir}/all/lib/classlib.jar" overwrite="yes"/>
+ <copy file="${root.dir}/all/build/classlib-src.jar" tofile="${main.jnode.dir}/all/lib/classlib-src.jar" overwrite="yes"/>
+ </target>
+
+ <target name="ftp-properties">
+ <property name="ftp.server" value="codemammoth.com"/>
+ <property name="ftp.dir" value="classlib"/>
+ <property name="download.url" value="http://codemammoth.com/jnodeftp"/>
+ </target>
+
+ <target name="upload" depends="prepare,ftp-properties" description="upload the classlib binaries to the FTP server">
+ <fail message="main.jnode.dir not set in jnode.properties">
+ <condition><not><isset property="main.jnode.dir"/></not></condition>
+ </fail>
+ <fail message="ftp.user not set in jnode.properties">
+ <condition><not><isset property="ftp.user"/></not></condition>
+ </fail>
+ <fail message="ftp.pass not set in jnode.properties">
+ <condition><not><isset property="ftp.pass"/></not></condition>
+ </fail>
+ <!-- compute checksum for uploadables -->
+ <checksum algorithm="MD5" property="classlib.md5">
+ <fileset dir="${root.dir}/all/build/">
+ <include name="classlib.pack.gz" />
+ </fileset>
+ </checksum>
+ <checksum algorithm="MD5" property="classlib-src.md5">
+ <fileset dir="${root.dir}/all/build/">
+ <include name="classlib-src.jar.bz2" />
+ </fileset>
+ </checksum>
+ <tstamp>
+ <format property="current" pattern="yyyyMMddhhmmss"/>
+ </tstamp>
+ <property url="${download.url}/${ftp.dir}/ftp.properties"/>
+<!-- Don't reformat this -->
+<echo file="${root.dir}/all/build/ftp.properties">to.remove=${to.keep}
+to.keep=${current}
+</echo>
+ <!-- create the didrectory where we upload the new version -->
+ <ftp action="mkdir"
+ server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}/${current}"
+ verbose="yes"/>
+ <!-- upload files -->
+ <ftp server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}/${current}"
+ verbose="yes">
+ <fileset dir="${root.dir}/all/build/" includes="classlib.pack.gz,classlib-src.jar.bz2"/>
+ </ftp>
+ <!-- upload ftp.properties -->
+ <ftp server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}">
+ <fileset dir="${root.dir}/all/build/" includes="ftp.properties"/>
+ </ftp>
+ <!-- delete outdated files -->
+ <ftp action="del"
+ server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}"
+ verbose="yes">
+ <fileset>
+ <include name="${to.remove}/**"/>
+ </fileset>
+ </ftp>
+ <!-- delete outdated directory -->
+ <ftp action="rmdir"
+ server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}"
+ verbose="yes">
+ <fileset>
+ <include name="${to.remove}"/>
+ </fileset>
+ </ftp>
+ <!-- stamp the trunk for the new classlib -->
+<echo file="${main.jnode.dir}/all/lib/ftp.properties">classlib.url=${download.url}/${ftp.dir}/${current}
+classlib.md5=${classlib.md5}
+classlib-src.md5=${classlib-src.md5}</echo>
+ </target>
+
+ <target name="deploy" depends="classlib,classlib-src,upload" description="build and upload"/>
+
+ <target name="quickdeploy" depends="classlib,classlib-src,copy" description="build and copy"/>
+
+ <target name="all" depends="clean,classlib,classlib-src,upload" description="clean build and upload"/>
+
+ <target name="ftp-init" depends="prepare,ftp-properties" description="initialize the FTP server">
+ <!-- create maid directory -->
+ <ftp action="mkdir"
+ server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}"
+ verbose="yes"/>
+ <!-- create ftp.properties -->
+ <echo file="${root.dir}/all/build/ftp.properties">to.remove=${to.keep}${line.separator}to.keep=${current}${line.separator}</echo>
+ <!-- upload ftp.properties -->
+ <ftp server="${ftp.server}"
+ userid="${ftp.user}"
+ password="${ftp.pass}"
+ remotedir="${ftp.dir}">
+ <fileset dir="${root.dir}/all/build/" includes="ftp.properties"/>
+ </ftp>
+ </target>
+
<!-- Call the assemble target of all subprojects -->
<target name="assemble-projects" depends="prepare">
<!-- pre compile tasks needed for compilation -->
@@ -373,7 +484,7 @@
</target>
<!-- Upload a distribution -->
- <target name="upload">
+ <!--target name="upload">
<property name="upload.dir" value="${build.dir}/upload"/>
<mkdir dir="${upload.dir}"/>
<gzip src="${jnode-x86.iso}" destfile="${upload.dir}/jnode-x86-${jnode-ver}.iso.gz"/>
@@ -385,15 +496,14 @@
</fileset>
</checksum>
<echo message="FTP upload disabled. Uploadables are in: ${upload.dir}"/>
- <!--
- TODO find a way to automatically upload the files
+ 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">
Modified: classlib6/jnode.properties.dist
===================================================================
--- classlib6/jnode.properties.dist 2009-05-08 14:03:22 UTC (rev 5456)
+++ classlib6/jnode.properties.dist 2009-05-08 14:04:24 UTC (rev 5457)
@@ -108,3 +108,8 @@
# Custom build tools
# -----------------------------------------------
# jnode.enable.mkisofs=true
+
+# -----------------------------------------------
+# main.jnode.dir=${root.dir}/../jnode
+# ftp.user=
+# ftp.pass=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-05-08 14:06:45
|
Revision: 5458
http://jnode.svn.sourceforge.net/jnode/?rev=5458&view=rev
Author: lsantha
Date: 2009-05-08 14:06:37 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Added SVN ignores.
Property Changed:
----------------
classlib6/all/
classlib6/builder/
classlib6/core/
Property changes on: classlib6/all
___________________________________________________________________
Added: svn:ignore
+ build
Property changes on: classlib6/builder
___________________________________________________________________
Added: svn:ignore
+ build
Property changes on: classlib6/core
___________________________________________________________________
Added: svn:ignore
+ build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2009-05-08 14:16:26
|
Revision: 5461
http://jnode.svn.sourceforge.net/jnode/?rev=5461&view=rev
Author: lsantha
Date: 2009-05-08 14:16:24 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Added comments and checks for main.jnode.dir property.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/jnode.properties.dist
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2009-05-08 14:12:20 UTC (rev 5460)
+++ classlib6/all/build.xml 2009-05-08 14:16:24 UTC (rev 5461)
@@ -238,6 +238,9 @@
</target>
<target name="copy" depends="prepare" description="copy the classlib binaries to the local JNode project">
+ <fail message="main.jnode.dir not set in jnode.properties">
+ <condition><not><isset property="main.jnode.dir"/></not></condition>
+ </fail>
<copy file="${root.dir}/all/build/classlib.jar" tofile="${main.jnode.dir}/all/lib/classlib.jar" overwrite="yes"/>
<copy file="${root.dir}/all/build/classlib-src.jar" tofile="${main.jnode.dir}/all/lib/classlib-src.jar" overwrite="yes"/>
</target>
Modified: classlib6/jnode.properties.dist
===================================================================
--- classlib6/jnode.properties.dist 2009-05-08 14:12:20 UTC (rev 5460)
+++ classlib6/jnode.properties.dist 2009-05-08 14:16:24 UTC (rev 5461)
@@ -110,6 +110,8 @@
# jnode.enable.mkisofs=true
# -----------------------------------------------
+# Set these properties for uploading classlib binaries
+# -----------------------------------------------
# main.jnode.dir=${root.dir}/../jnode
# ftp.user=
# ftp.pass=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2011-01-03 13:43:14
|
Revision: 5765
http://jnode.svn.sourceforge.net/jnode/?rev=5765&view=rev
Author: lsantha
Date: 2011-01-03 13:43:06 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Updated Intellij IDEA project files.
Added Paths:
-----------
classlib6/Classlib6.ipr
classlib6/classlib6.iml
Removed Paths:
-------------
classlib6/JNode.ipr
classlib6/jnode.iml
Property Changed:
----------------
classlib6/
Property changes on: classlib6
___________________________________________________________________
Modified: svn:ignore
- jnode.properties
+ jnode.properties
*.iws
Copied: classlib6/Classlib6.ipr (from rev 5764, classlib6/JNode.ipr)
===================================================================
--- classlib6/Classlib6.ipr (rev 0)
+++ classlib6/Classlib6.ipr 2011-01-03 13:43:06 UTC (rev 5765)
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ <buildFile url="file://$PROJECT_DIR$/all/build.xml">
+ <additionalClassPath />
+ <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" />
+ <entry key="location-0" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules." />
+ </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">
+ <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" />
+ <option name="USE_RELATIVE_INDENTS" 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" static="false" />
+ <emptyLine />
+ <package name="javax" withSubpackages="false" static="false" />
+ <package name="java" withSubpackages="false" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
+ </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="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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="scala">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="2" />
+ <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" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="sql">
+ <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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+ <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" />
+ <option name="USE_RELATIVE_INDENTS" 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" />
+ <resourceExtensions>
+ <entry name=".+\.(properties|xml|html|dtd|tld)" />
+ <entry name=".+\.(gif|png|jpeg|jpg)" />
+ </resourceExtensions>
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ </wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
+ </component>
+ <component name="CopyrightManager" default="">
+ <module2copyright />
+ </component>
+ <component name="DependenciesAnalyzeManager">
+ <option name="myForwardDirection" value="false" />
+ </component>
+ <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 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="IdProvider" IDEtalkID="435AAC2234C36B0F2257FA7F02C447FB" />
+ <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="1024" />
+ </component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="OPTION_SCOPE" value="protected" />
+ <option name="OPTION_HIERARCHY" value="true" />
+ <option name="OPTION_NAVIGATOR" value="true" />
+ <option name="OPTION_INDEX" value="true" />
+ <option name="OPTION_SEPARATE_INDEX" value="true" />
+ <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+ <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">
+ <option name="JIKES_PATH" value="" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="DEPRECATION" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="IS_EMACS_ERRORS_MODE" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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="Classlib6" />
+ </component>
+ <component name="ProjectKey">
+ <option name="state" value="https://jnode.svn.sourceforge.net/svnroot/jnode/classlib6/Classlib6.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:///media/sdb5/ext/devel/classlib6/classlib6.iml" filepath="/media/sdb5/ext/devel/classlib6/classlib6.iml" />
+ <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
+ </modules>
+ </component>
+ <component name="ProjectResources">
+ <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+ </component>
+ <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" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="GENERATE_IIOP_STUBS" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="SvnBranchConfigurationManager">
+ <option name="myConfigurationMap">
+ <map>
+ <entry key="$PROJECT_DIR$">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchMap">
+ <map>
+ <entry key="https://jnode.svn.sourceforge.net/svnroot/jnode/branches">
+ <value>
+ <list />
+ </value>
+ </entry>
+ <entry key="https://jnode.svn.sourceforge.net/svnroot/jnode/tags">
+ <value>
+ <list />
+ </value>
+ </entry>
+ </map>
+ </option>
+ <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>
+ <entry key="$PROJECT_DIR$/all">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="trunkUrl" value="https://jnode.svn.sourceforge.net/svnroot/jnode/classlib6/all" />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/core">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="trunkUrl" value="https://jnode.svn.sourceforge.net/svnroot/jnode/classlib6/core" />
+ </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>
+ <root url="jar://$PROJECT_DIR$/core/lib/ant-commons-net.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/ant-junit.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/ant-launcher.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/ant-nodeps.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/ant-trax.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/ant.jar!/" />
+ <root url="jar://$PROJECT_DIR$/core/lib/log4j-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </component>
+</project>
+
Deleted: classlib6/JNode.ipr
===================================================================
--- classlib6/JNode.ipr 2011-01-03 10:44:31 UTC (rev 5764)
+++ classlib6/JNode.ipr 2011-01-03 13:43:06 UTC (rev 5765)
@@ -1,450 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="true" version="4">
- <component name="AntConfiguration">
- <defaultAnt bundledAnt="true" />
- <buildFile url="file://$PROJECT_DIR$/all/build.xml">
- <additionalClassPath />
- <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">
- <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="DEPLOY_AFTER_MAKE" value="0" />
- <resourceExtensions>
- <entry name=".+\.(properties|xml|html|dtd|tld)" />
- <entry name=".+\.(gif|png|jpeg|jpg)" />
- </resourceExtensions>
- <wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.html" />
- <entry name="?*.dtd" />
- <entry name="?*.tld" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- </wildcardResourcePatterns>
- </component>
- <component name="CopyrightManager" default="">
- <module2copyright />
- </component>
- <component name="DependenciesAnalyzeManager">
- <option name="myForwardDirection" value="false" />
- </component>
- <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 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="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="1024" />
- </component>
- <component name="JavadocGenerationManager">
- <option name="OUTPUT_DIRECTORY" />
- <option name="OPTION_SCOPE" value="protected" />
- <option name="OPTION_HIERARCHY" value="true" />
- <option name="OPTION_NAVIGATOR" value="true" />
- <option name="OPTION_INDEX" value="true" />
- <option name="OPTION_SEPARATE_INDEX" value="true" />
- <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
- <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
- <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
- <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
- <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">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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/classlib6/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$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
- <module fileurl="file://$PROJECT_DIR$/jnode.iml" filepath="$PROJECT_DIR$/jnode.iml" />
- </modules>
- </component>
- <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" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <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>
- <root url="jar://$PROJECT_DIR$/core/lib/ant-commons-net.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/ant-junit.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/ant-launcher.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/ant-nodeps.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/ant-trax.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/ant.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/asm.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/cglib-2.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/gnu-crypto.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/javax-crypto.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/javax-security.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/jmock-1.0.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/jmock-cglib-1.0.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/junit.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/log4j-1.2.8.jar!/" />
- <root url="jar://$PROJECT_DIR$/core/lib/nanoxml-lite-2.2.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- <library name="shell">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/shell/lib/bsh-2.0b1.jar!/" />
- </CLASSES>
- <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>
-</project>
-
Copied: classlib6/classlib6.iml (from rev 5764, classlib6/jnode.iml)
===================================================================
--- classlib6/classlib6.iml (rev 0)
+++ classlib6/classlib6.iml 2011-01-03 13:43:06 UTC (rev 5765)
@@ -0,0 +1,17 @@
+<?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://$USER_HOME$/ext/devel/classlib6/build/classes" />
+ <exclude-output />
+ <exclude-exploded />
+ <content url="file://$USER_HOME$/ext/devel/classlib6">
+ <excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/all" />
+ <excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/builder" />
+ <excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/core" />
+ <excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/docs" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Deleted: classlib6/jnode.iml
===================================================================
--- classlib6/jnode.iml 2011-01-03 10:44:31 UTC (rev 5764)
+++ classlib6/jnode.iml 2011-01-03 13:43:06 UTC (rev 5765)
@@ -1,17 +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 />
- <exclude-exploded />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/all" />
- <excludeFolder url="file://$MODULE_DIR$/builder" />
- <excludeFolder url="file://$MODULE_DIR$/core" />
- <excludeFolder url="file://$MODULE_DIR$/docs" />
- </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: <ls...@us...> - 2011-01-03 13:55:39
|
Revision: 5766
http://jnode.svn.sourceforge.net/jnode/?rev=5766&view=rev
Author: lsantha
Date: 2011-01-03 13:55:33 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Removed unneeded scripts.
Removed Paths:
-------------
classlib6/configure.sh
classlib6/qemu.bat
classlib6/udpreceiver.bat
classlib6/udpreceiver.sh
Deleted: classlib6/configure.sh
===================================================================
--- classlib6/configure.sh 2011-01-03 13:43:06 UTC (rev 5765)
+++ classlib6/configure.sh 2011-01-03 13:55:33 UTC (rev 5766)
@@ -1,17 +0,0 @@
-#!/bin/sh
-DIR=`dirname $0`
-DIR=`cd $DIR; pwd;`
-
-# Belt and braces classpath to get the most recent version
-# of the 'configure' classes that we can find.
-CP=$DIR/builder/build/classes:\
-$DIR/all/build/descriptors/jnode-configure.jar:\
-$DIR/builder/lib/jnode-configure-dist.jar:\
-$DIR/shell/lib/nanoxml-2.2.3.jar
-
-if [ $# = 0 ] ; then
- java -cp $CP org.jnode.configure.Configure $DIR/all/conf-source/script.xml
-else
- java -cp $CP org.jnode.configure.Configure "$@"
-fi
-
Deleted: classlib6/qemu.bat
===================================================================
--- classlib6/qemu.bat 2011-01-03 13:43:06 UTC (rev 5765)
+++ classlib6/qemu.bat 2011-01-03 13:55:33 UTC (rev 5766)
@@ -1,3 +0,0 @@
-@echo off
-set QEMUDIR=c:\progra~1\qemu
-%QEMUDIR%\qemu.exe -monitor vc -m 400 -L %QEMUDIR%\bios -hda all\build\x86\jnodedisk.dat
\ No newline at end of file
Deleted: classlib6/udpreceiver.bat
===================================================================
--- classlib6/udpreceiver.bat 2011-01-03 13:43:06 UTC (rev 5765)
+++ classlib6/udpreceiver.bat 2011-01-03 13:55:33 UTC (rev 5766)
@@ -1,2 +0,0 @@
-@echo off
-java -cp core\build\classes org.jnode.debug.RemoteReceiver --udp udpout.log
Deleted: classlib6/udpreceiver.sh
===================================================================
--- classlib6/udpreceiver.sh 2011-01-03 13:43:06 UTC (rev 5765)
+++ classlib6/udpreceiver.sh 2011-01-03 13:55:33 UTC (rev 5766)
@@ -1,2 +0,0 @@
-#!/bin/bash
-java -cp core/build/classes org.jnode.debug.RemoteReceiver --udp 5612 udpout.log
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2011-01-03 20:59:15
|
Revision: 5768
http://jnode.svn.sourceforge.net/jnode/?rev=5768&view=rev
Author: lsantha
Date: 2011-01-03 20:59:09 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Fixed oj-compare target.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/builder/build.xml
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2011-01-03 20:57:35 UTC (rev 5767)
+++ classlib6/all/build.xml 2011-01-03 20:59:09 UTC (rev 5768)
@@ -344,6 +344,7 @@
<!-- Assemble all plugins -->
<target name="assemble-plugins" depends="assemble-projects,openjdk-annotate">
<!-- Now assemble all plugins -->
+ <!--
<taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/>
<plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}">
<packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/>
@@ -397,11 +398,13 @@
<exclude name="*plugin-list.xml"/>
</descriptors>
</plugin>
+ -->
</target>
<!-- Assemble all default initjars -->
<target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars">
<!-- Build all default initjar's -->
+ <!--
<taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
<initjars destdir="${initjars.dir}"
pluginDir="${plugins.dir}"
@@ -413,11 +416,13 @@
<include name="*plugin-list.xml"/>
</fileset>
</initjars>
+ -->
</target>
<!-- Assemble all custom initjars -->
<target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir">
<!-- Build all custom initjar's -->
+ <!--
<taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
<initjars destdir="${initjars.dir}"
pluginDir="${plugins.dir}"
@@ -426,6 +431,7 @@
<include name="*plugin-list.xml"/>
</fileset>
</initjars>
+ -->
</target>
<!-- Assemble all subprojects, plugins and initjars -->
@@ -766,9 +772,11 @@
</fileset>
</vmsources>
<vmspecificsources>
+ <!--
<fileset dir="${root.dir}/core/src/openjdk/vm">
<patternset refid="cp-includes-pattern"/>
</fileset>
+ -->
</vmspecificsources>
<classpathsources>
<fileset dir="${root.dir}/../openjdk/jdk/src/share/classes/">
@@ -779,11 +787,11 @@
<patternset refid="cp-includes-pattern"/>
<patternset refid="cp-sources-pattern"/>
</fileset>
- <fileset dir="${root.dir}/../openjdk/jaxp/src/share/classes/">
+ <fileset dir="${root.dir}/../openjdk/jaxp/src/">
<patternset refid="cp-includes-pattern"/>
<patternset refid="cp-sources-pattern"/>
</fileset>
- <fileset dir="${root.dir}/../openjdk/jaxws/src/share/classes/">
+ <fileset dir="${root.dir}/../openjdk/jaxws/src/">
<patternset refid="cp-includes-pattern"/>
<patternset refid="cp-sources-pattern"/>
</fileset>
Modified: classlib6/builder/build.xml
===================================================================
--- classlib6/builder/build.xml 2011-01-03 20:57:35 UTC (rev 5767)
+++ classlib6/builder/build.xml 2011-01-03 20:59:09 UTC (rev 5768)
@@ -55,7 +55,7 @@
<target name="compile" depends="prepare">
<jnode.compile>
<src path="${my-src.dir}/builder"/>
- <src path="${my-gen.dir}"/>
+ <!--src path="${my-gen.dir}"/-->
<classpath refid="my-cp"/>
</jnode.compile>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2011-06-21 18:12:11
|
Revision: 5824
http://jnode.svn.sourceforge.net/jnode/?rev=5824&view=rev
Author: lsantha
Date: 2011-06-21 18:12:05 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
Fixes to the build system.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/all/lib/jnode.xml
classlib6/core/build.xml
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2011-06-21 18:09:36 UTC (rev 5823)
+++ classlib6/all/build.xml 2011-06-21 18:12:05 UTC (rev 5824)
@@ -47,7 +47,6 @@
<property name="mauve.jar" value="${root.dir}/core/lib/mauve.jar"/>
<property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.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 -->
@@ -89,18 +88,8 @@
<pathelement location="${cglib.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${basedir}/conf"/>
- <pathelement location="${beanshell.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>
@@ -337,105 +326,13 @@
<!-- 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}/core" inheritall="on" inheritrefs="on" />
<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,openjdk-annotate">
- <!-- Now assemble all plugins -->
- <!--
- <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/>
- <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-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="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"/>
- </descriptors>
- </plugin>
- -->
- </target>
-
- <!-- Assemble all default initjars -->
- <target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars">
- <!-- Build all default initjar's -->
- <!--
- <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">
- <insert userApplicationsDir="${user.applications.dir}"/>
-
- <fileset dir="${basedir}/conf">
- <exclude name="system-plugin-list.xml"/>
- <include name="*plugin-list.xml"/>
- </fileset>
- </initjars>
- -->
- </target>
-
- <!-- Assemble all custom initjars -->
- <target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir">
- <!-- Build all custom initjar's -->
- <!--
- <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="${custom.plugin-list.dir}">
- <include name="*plugin-list.xml"/>
- </fileset>
- </initjars>
- -->
- </target>
-
<!-- Assemble all subprojects, plugins and initjars -->
- <target name="assemble" depends="assemble-default-initjars, assemble-custom-initjars">
+ <target name="assemble" depends="assemble-projects,openjdk-annotate">
</target>
<!-- Give help on possible targets -->
@@ -466,28 +363,6 @@
</echo>
</target>
- <!-- Upload a distribution -->
- <!--target name="upload">
- <property name="upload.dir" value="${build.dir}/upload"/>
- <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>
- -->
-
<!-- Clean everything files -->
<target name="clean" description="clean the complete build output">
<jnode.antall target="clean"/>
@@ -575,17 +450,6 @@
</jnode.javadoc>
</target>
- <!-- Backup CVS files -->
- <!-- TODO create replacement SVN task
- <target name="backup">
- <mkdir dir="${backup.dir}"/>
- <tstamp>
- <format property="date" pattern="dd-MM-yyyy"/>
- </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">
<taskdef name="cp-compare" classname="org.jnode.ant.taskdefs.classpath.CompareTask" classpathref="cp-jnode"/>
@@ -715,7 +579,7 @@
</hotswap>
</target>
- <target name="oj-compare" depends="assemble">
+ <target name="oj-compare" depends="assemble" description="compare the classlibrary with OpenJDK">
<taskdef name="cp-compare" classname="org.jnode.ant.taskdefs.classpath.CompareTask" classpathref="cp-jnode"/>
<patternset id="cp-includes-pattern">
@@ -726,11 +590,18 @@
<patternset id="cp-sources-pattern">
<exclude name="com/sun/demo/**/*"/>
+ <exclude name="com/sun/imageio/plugins/jpeg/**/*"/>
+ <exclude name="com/sun/java/swing/plaf/gtk/**/*"/>
+ <exclude name="com/sun/java/swing/plaf/windows/**/*"/>
+ <exclude name="com/sun/jmx/snmp/**/*"/>
+ <exclude name="com/sun/script/javascript/**/*"/>
<exclude name="com/sun/tools/hat/**/*"/>
<exclude name="com/sun/tools/example/**/*"/>
<exclude name="com/sun/tools/javah/**/*"/>
<exclude name="com/sun/tools/internal/txw2/**/*"/>
- <exclude name="sun/jvmstat/**/*"/>
+ <!--<exclude name="sun/jvmstat/**/*"/> -->
+ <exclude name="sun/java2d/opengl/**/*"/>
+ <exclude name="sun/management/snmp/**/*"/>
<exclude name="sun/tools/attach/**/*"/>
<exclude name="sun/tools/jinfo/**/*"/>
<exclude name="sun/tools/jps/**/*"/>
@@ -738,7 +609,7 @@
<exclude name="sun/tools/jstack/**/*"/>
<exclude name="sun/tools/jstat/**/*"/>
<exclude name="sun/tools/jstatd/**/*"/>
- <exclude name="sun/tools/jconsole/**/*"/>
+ <!-- <exclude name="sun/tools/jconsole/**/*"/> -->
</patternset>
<delete dir="${build.dir}/openjdk-compare"/>
@@ -851,27 +722,6 @@
</n2a>
</target>
- <!-- check plugin dependencies -->
- <target name="check-plugins" depends="assemble-plugins">
- <!-- Check all plugins -->
- <taskdef name="checkDeps" classname="org.jnode.build.dependencies.BCELDependencyChecker"
- classpathref="cp-jnode" />
- <!--
- TODO: remove duplicate classes from mmtk related plugins and enable their checking.
- -->
- <checkDeps>
- <plugins dir="${plugins.dir}/">
- <include name="*.jar" />
- <exclude name="*mmtk*.jar" />
- </plugins>
-
- <descriptors dir="${descriptors.dir}/">
- <include name="*.xml" />
- <exclude name="*plugin-list.xml" />
- <exclude name="*mmtk*.xml" />
- </descriptors>
- </checkDeps>
- </target>
<!-- Create a patch -->
<!-- TODO create replacement SVN task
<target name="create-patch">
Modified: classlib6/all/lib/jnode.xml
===================================================================
--- classlib6/all/lib/jnode.xml 2011-06-21 18:09:36 UTC (rev 5823)
+++ classlib6/all/lib/jnode.xml 2011-06-21 18:12:05 UTC (rev 5824)
@@ -14,7 +14,7 @@
target="${java.target}"
source="${java.source}"
encoding="${java.encoding}"
- excludes="**/*-template.java,**/package-info.java">
+ excludes="**/*-template.java">
<bootclasspath path="${jnode-core.jar}"/>
<compilerarg value="${compilerarg}"/>
</javac>
Modified: classlib6/core/build.xml
===================================================================
--- classlib6/core/build.xml 2011-06-21 18:09:36 UTC (rev 5823)
+++ classlib6/core/build.xml 2011-06-21 18:12:05 UTC (rev 5824)
@@ -76,12 +76,15 @@
</copy>
</target>
- <!-- Compile all subproject java files -->
- <target name="compile" depends="prepare">
+ <target name="pre-compile" depends="prepare">
<jnode.compile>
<src refid="classpath-sources" />
<classpath refid="my-cp"/>
</jnode.compile>
+ </target>
+
+ <!-- Compile all subproject java files -->
+ <target name="compile" depends="pre-compile">
<parallel >
<jnode.compile>
<src refid="classpath-sources-corba" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2011-07-15 19:33:41
|
Revision: 5834
http://jnode.svn.sourceforge.net/jnode/?rev=5834&view=rev
Author: lsantha
Date: 2011-07-15 19:33:35 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Updated project files.
Modified Paths:
--------------
classlib6/Classlib6.ipr
Property Changed:
----------------
classlib6/netbeans/
Modified: classlib6/Classlib6.ipr
===================================================================
--- classlib6/Classlib6.ipr 2011-07-15 19:32:53 UTC (rev 5833)
+++ classlib6/Classlib6.ipr 2011-07-15 19:33:35 UTC (rev 5834)
@@ -71,6 +71,16 @@
<option name="TERNARY_OPERATION_WRAP" value="1" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ASSIGNMENT_WRAP" value="1" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="css">
+ <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" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
Property changes on: classlib6/netbeans
___________________________________________________________________
Added: svn:ignore
+ build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2012-09-23 18:01:21
|
Revision: 5933
http://jnode.svn.sourceforge.net/jnode/?rev=5933&view=rev
Author: lsantha
Date: 2012-09-23 18:01:11 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
Build improvements in classlib6.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/jnode.properties.dist
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2012-09-23 17:53:55 UTC (rev 5932)
+++ classlib6/all/build.xml 2012-09-23 18:01:11 UTC (rev 5933)
@@ -211,13 +211,7 @@
<copy file="${root.dir}/all/build/classlib-src.jar" tofile="${main.jnode.dir}/all/lib/classlib-src.jar" overwrite="yes"/>
</target>
- <target name="ftp-properties">
- <property name="ftp.server" value="codemammoth.com"/>
- <property name="ftp.dir" value="classlib"/>
- <property name="download.url" value="http://codemammoth.com/jnodeftp"/>
- </target>
-
- <target name="upload" depends="prepare,ftp-properties" description="upload the classlib binaries to the FTP server">
+ <target name="upload" depends="prepare" description="upload the classlib binaries to the FTP server">
<fail message="main.jnode.dir not set in jnode.properties">
<condition><not><isset property="main.jnode.dir"/></not></condition>
</fail>
@@ -225,7 +219,7 @@
<condition><not><isset property="ftp.user"/></not></condition>
</fail>
<fail message="ftp.pass not set in jnode.properties">
- <condition><not><isset property="ftp.pass"/></not></condition>
+ <condition><not><isset property="ftp.password"/></not></condition>
</fail>
<!-- compute checksum for uploadables -->
<checksum algorithm="MD5" property="classlib.md5">
@@ -250,13 +244,15 @@
<ftp action="mkdir"
server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}/${current}"
verbose="yes"/>
<!-- upload files -->
<ftp server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}/${current}"
verbose="yes">
<fileset dir="${root.dir}/all/build/" includes="classlib.pack.gz,classlib-src.jar.bz2"/>
@@ -264,7 +260,8 @@
<!-- upload ftp.properties -->
<ftp server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}">
<fileset dir="${root.dir}/all/build/" includes="ftp.properties"/>
</ftp>
@@ -272,7 +269,8 @@
<ftp action="del"
server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}"
verbose="yes">
<fileset>
@@ -283,7 +281,8 @@
<ftp action="rmdir"
server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}"
verbose="yes">
<fileset>
@@ -304,12 +303,13 @@
<target name="all" depends="clean,classlib-pack,classlib-src-bz,upload" description="clean build and upload"/>
- <target name="ftp-init" depends="prepare,ftp-properties" description="initialize the FTP server">
+ <target name="ftp-init" depends="prepare" description="initialize the FTP server">
<!-- create maid directory -->
<ftp action="mkdir"
server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}"
verbose="yes"/>
<!-- create ftp.properties -->
@@ -317,7 +317,8 @@
<!-- upload ftp.properties -->
<ftp server="${ftp.server}"
userid="${ftp.user}"
- password="${ftp.pass}"
+ password="${ftp.password}"
+ passive="${ftp.passive}"
remotedir="${ftp.dir}">
<fileset dir="${root.dir}/all/build/" includes="ftp.properties"/>
</ftp>
Modified: classlib6/jnode.properties.dist
===================================================================
--- classlib6/jnode.properties.dist 2012-09-23 17:53:55 UTC (rev 5932)
+++ classlib6/jnode.properties.dist 2012-09-23 18:01:11 UTC (rev 5933)
@@ -113,5 +113,9 @@
# Set these properties for uploading classlib binaries
# -----------------------------------------------
# main.jnode.dir=${root.dir}/../jnode
+# ftp.server=
# ftp.user=
-# ftp.pass=
+# ftp.password=
+# ftp.passive=
+# ftp.dir=
+# download.url=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2013-02-16 21:24:33
|
Revision: 5949
http://jnode.svn.sourceforge.net/jnode/?rev=5949&view=rev
Author: lsantha
Date: 2013-02-16 21:24:21 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Idea 12 project files.
Modified Paths:
--------------
classlib6/Classlib6.ipr
classlib6/all/all.iml
classlib6/builder/builder.iml
classlib6/classlib6.iml
classlib6/core/core.iml
Modified: classlib6/Classlib6.ipr
===================================================================
--- classlib6/Classlib6.ipr 2013-02-16 19:08:48 UTC (rev 5948)
+++ classlib6/Classlib6.ipr 2013-02-16 21:24:21 UTC (rev 5949)
@@ -207,7 +207,11 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
</wildcardResourcePatterns>
- <annotationProcessing enabled="false" useClasspath="true" />
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
@@ -423,15 +427,29 @@
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
- <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="haml">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="yml">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
+ <codeStyleSettings language="CFML">
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="1" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="ECMA Script Level 4">
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_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" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="GSP">
+ <indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ </indentOptions>
+ </codeStyleSettings>
<codeStyleSettings language="Groovy">
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
Modified: classlib6/all/all.iml
===================================================================
--- classlib6/all/all.iml 2013-02-16 19:08:48 UTC (rev 5948)
+++ classlib6/all/all.iml 2013-02-16 21:24:21 UTC (rev 5949)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
+ <exclude-exploded />
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: classlib6/builder/builder.iml
===================================================================
--- classlib6/builder/builder.iml 2013-02-16 19:08:48 UTC (rev 5948)
+++ classlib6/builder/builder.iml 2013-02-16 21:24:21 UTC (rev 5949)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
+ <exclude-exploded />
<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" />
</content>
Modified: classlib6/classlib6.iml
===================================================================
--- classlib6/classlib6.iml 2013-02-16 19:08:48 UTC (rev 5948)
+++ classlib6/classlib6.iml 2013-02-16 21:24:21 UTC (rev 5949)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
+ <exclude-exploded />
<output url="file://$USER_HOME$/ext/devel/classlib6/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$USER_HOME$/ext/devel/classlib6">
<excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/all" />
<excludeFolder url="file://$USER_HOME$/ext/devel/classlib6/builder" />
Modified: classlib6/core/core.iml
===================================================================
--- classlib6/core/core.iml 2013-02-16 19:08:48 UTC (rev 5948)
+++ classlib6/core/core.iml 2013-02-16 21:24:21 UTC (rev 5949)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
+ <exclude-exploded />
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/classlib" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/gnu" isTestSource="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X