mirror of https://github.com/acidanthera/audk.git
moved exception and logger classes to org.tianocore.common package
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1269 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
2f62848a85
commit
ff225cbbae
|
@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
|
||||
**/
|
||||
|
||||
package org.tianocore.definitions;
|
||||
package org.tianocore.common.definitions;
|
||||
|
||||
/**
|
||||
This class includes the common EDK definitions.
|
||||
|
|
|
@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
|
||||
**/
|
||||
|
||||
package org.tianocore.definitions;
|
||||
package org.tianocore.common.definitions;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
|
|
@ -15,7 +15,8 @@ Module Name:
|
|||
Abstract:
|
||||
|
||||
--*/
|
||||
package org.tianocore.exception;
|
||||
|
||||
package org.tianocore.common.exception;
|
||||
|
||||
public class EdkException extends Exception {
|
||||
static final long serialVersionUID = -8494188017252114029L;
|
||||
|
|
|
@ -16,7 +16,8 @@ Abstract:
|
|||
|
||||
--*/
|
||||
|
||||
package org.tianocore.logger;
|
||||
package org.tianocore.common.logger;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
|
|
|
@ -15,10 +15,10 @@ Module Name:
|
|||
Abstract:
|
||||
|
||||
--*/
|
||||
package org.tianocore.logger;
|
||||
|
||||
import org.tianocore.logger.LogMethod;
|
||||
package org.tianocore.common.logger;
|
||||
|
||||
import org.tianocore.common.logger.LogMethod;
|
||||
|
||||
public class EdkLog {
|
||||
private static final String error = "ERROR";
|
||||
|
|
|
@ -15,8 +15,8 @@ Module Name:
|
|||
Abstract:
|
||||
|
||||
--*/
|
||||
package org.tianocore.logger;
|
||||
|
||||
package org.tianocore.common.logger;
|
||||
|
||||
public interface LogMethod {
|
||||
public void putMessage(Object msgSource, int msgLevel, String msg);
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
CreateMtFileTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
EfiCompressTask class.
|
||||
|
|
|
@ -26,7 +26,8 @@ import java.util.List;
|
|||
import org.apache.tools.ant.Task;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
* SecFixupTask class.
|
||||
|
|
|
@ -26,7 +26,8 @@ import java.util.List;
|
|||
import org.apache.tools.ant.Task;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
* FlashMapTask class.
|
||||
|
|
|
@ -17,8 +17,10 @@ Abstract:
|
|||
--*/
|
||||
|
||||
package org.tianocore.framework.tasks;
|
||||
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.tianocore.logger.LogMethod;
|
||||
|
||||
import org.tianocore.common.logger.LogMethod;
|
||||
|
||||
class FrameworkLogger implements LogMethod {
|
||||
private Project project;
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.Task;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
GenAcpiTable class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
GenCapsuleHdrTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
* GenTeImageTask class.
|
||||
|
|
|
@ -35,7 +35,8 @@ import org.apache.tools.ant.taskdefs.Execute;
|
|||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.apache.tools.ant.types.Path;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
Class MakeDeps is used to wrap MakeDeps.exe as an ANT task.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
ModifyInfTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
PeiReBaseTask class.
|
||||
|
|
|
@ -25,7 +25,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
SecApResetVectorFixupTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
* SecFixupTask class.
|
||||
|
|
|
@ -25,7 +25,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
SplitfileTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
StripTask class.
|
||||
|
|
|
@ -24,7 +24,8 @@ import org.apache.tools.ant.BuildException;
|
|||
import org.apache.tools.ant.taskdefs.Execute;
|
||||
import org.apache.tools.ant.taskdefs.LogStreamHandler;
|
||||
import org.apache.tools.ant.types.Commandline;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
ZeroDebugDataTask class.
|
||||
|
|
|
@ -32,6 +32,8 @@ import org.apache.tools.ant.taskdefs.Ant;
|
|||
import org.apache.tools.ant.taskdefs.Property;
|
||||
import org.apache.xmlbeans.XmlObject;
|
||||
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
import org.tianocore.build.autogen.AutoGen;
|
||||
import org.tianocore.build.fpd.FpdParserTask;
|
||||
import org.tianocore.build.global.GenBuildLogger;
|
||||
|
@ -43,8 +45,6 @@ import org.tianocore.build.id.ModuleIdentification;
|
|||
import org.tianocore.build.id.PackageIdentification;
|
||||
import org.tianocore.build.id.PlatformIdentification;
|
||||
import org.tianocore.build.tools.ModuleItem;
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
/**
|
||||
<p>
|
||||
|
|
|
@ -44,7 +44,8 @@ import org.tianocore.build.global.SurfaceAreaQuery;
|
|||
import org.tianocore.build.id.ModuleIdentification;
|
||||
import org.tianocore.build.id.PackageIdentification;
|
||||
import org.tianocore.build.pcd.action.PCDAutoGenAction;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
|
||||
/**
|
||||
* This class is to generate Autogen.h and Autogen.c according to module surface
|
||||
|
|
|
@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
**/
|
||||
package org.tianocore.build.exception;
|
||||
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
|
||||
/**
|
||||
The class handle the exception throwed by entity class.
|
||||
|
|
|
@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
**/
|
||||
package org.tianocore.build.exception;
|
||||
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
|
||||
/**
|
||||
The class handle the exception throwed by entity class.
|
||||
|
|
|
@ -32,18 +32,18 @@ import org.apache.tools.ant.taskdefs.Ant;
|
|||
import org.apache.tools.ant.taskdefs.Property;
|
||||
import org.apache.xmlbeans.XmlObject;
|
||||
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
import org.tianocore.pcd.action.ActionMessage;
|
||||
import org.tianocore.build.global.GlobalData;
|
||||
import org.tianocore.build.global.OutputManager;
|
||||
import org.tianocore.build.global.SurfaceAreaQuery;
|
||||
import org.tianocore.build.id.FpdModuleIdentification;
|
||||
import org.tianocore.build.id.ModuleIdentification;
|
||||
import org.tianocore.build.id.PlatformIdentification;
|
||||
import org.tianocore.pcd.action.ActionMessage;
|
||||
import org.tianocore.build.pcd.action.PlatformPcdPreprocessActionForBuilding;
|
||||
import org.tianocore.build.toolchain.ToolChainAttribute;
|
||||
import org.tianocore.build.toolchain.ToolChainElement;
|
||||
import org.tianocore.build.toolchain.ToolChainMap;
|
||||
import org.tianocore.exception.EdkException;
|
||||
|
||||
/**
|
||||
<code>FpdParserTask</code> is an ANT task. The main function is parsing Framework
|
||||
|
|
|
@ -17,8 +17,10 @@ Abstract:
|
|||
--*/
|
||||
|
||||
package org.tianocore.build.global;
|
||||
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.tianocore.logger.LogMethod;
|
||||
|
||||
import org.tianocore.common.logger.LogMethod;
|
||||
|
||||
public class GenBuildLogger implements LogMethod {
|
||||
private Project project;
|
||||
|
|
|
@ -27,6 +27,10 @@ import java.util.logging.Logger;
|
|||
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.xmlbeans.XmlObject;
|
||||
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
import org.tianocore.pcd.entity.MemoryDatabaseManager;
|
||||
import org.tianocore.DbPathAndFilename;
|
||||
import org.tianocore.FrameworkDatabaseDocument;
|
||||
import org.tianocore.ModuleSurfaceAreaDocument;
|
||||
|
@ -35,15 +39,12 @@ import org.tianocore.build.id.FpdModuleIdentification;
|
|||
import org.tianocore.build.id.ModuleIdentification;
|
||||
import org.tianocore.build.id.PackageIdentification;
|
||||
import org.tianocore.build.id.PlatformIdentification;
|
||||
import org.tianocore.pcd.entity.MemoryDatabaseManager;
|
||||
import org.tianocore.build.toolchain.ToolChainAttribute;
|
||||
import org.tianocore.build.toolchain.ToolChainConfig;
|
||||
import org.tianocore.build.toolchain.ToolChainElement;
|
||||
import org.tianocore.build.toolchain.ToolChainInfo;
|
||||
import org.tianocore.build.toolchain.ToolChainKey;
|
||||
import org.tianocore.build.toolchain.ToolChainMap;
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
|
||||
/**
|
||||
GlobalData provide initializing, instoring, querying and update global data.
|
||||
|
|
|
@ -23,8 +23,11 @@ import java.util.Stack;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
import org.apache.xmlbeans.XmlObject;
|
||||
import org.apache.xmlbeans.XmlString;
|
||||
|
||||
import org.tianocore.BuildOptionsDocument;
|
||||
import org.tianocore.CNameType;
|
||||
import org.tianocore.ExternsDocument;
|
||||
|
@ -57,13 +60,13 @@ import org.tianocore.FilenameDocument.Filename;
|
|||
import org.tianocore.MsaHeaderDocument.MsaHeader;
|
||||
import org.tianocore.ProtocolsDocument.Protocols.Protocol;
|
||||
import org.tianocore.ProtocolsDocument.Protocols.ProtocolNotify;
|
||||
|
||||
import org.tianocore.common.logger.EdkLog;
|
||||
import org.tianocore.build.id.FpdModuleIdentification;
|
||||
import org.tianocore.build.id.ModuleIdentification;
|
||||
import org.tianocore.build.id.PackageIdentification;
|
||||
import org.tianocore.build.id.PlatformIdentification;
|
||||
import org.tianocore.build.toolchain.ToolChainInfo;
|
||||
import org.tianocore.logger.EdkLog;
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
/**
|
||||
* SurfaceAreaQuery class is used to query Surface Area information from msa,
|
||||
|
|
|
@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
**/
|
||||
package org.tianocore.build.toolchain;
|
||||
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
|
|
|
@ -16,7 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
package org.tianocore.build.toolchain;
|
||||
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.tianocore.exception.EdkException;
|
||||
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
import org.tianocore.build.toolchain.ToolChainKey;
|
||||
import org.tianocore.build.toolchain.ToolChainMap;
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
|
||||
package org.tianocore.build.toolchain;
|
||||
|
||||
import org.tianocore.exception.EdkException;
|
||||
import org.tianocore.common.exception.EdkException;
|
||||
|
||||
public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainKey> {
|
||||
static final long serialVersionUID = -8034897190740066933L;
|
||||
|
|
Loading…
Reference in New Issue