diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java index e2124e7d0fbbbd6b0e00a49c864f6cd74a481f1f..983211564b04a6a01e4d49270a5754c37a35e891 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java @@ -318,15 +318,13 @@ public enum ATTRIBUTE_TYPE { bundle.getString("BlackboardAttribute.tskLocalPath.text")), // Local path to a network drive TSK_REMOTE_PATH(104, "TSK_REMOTE_PATH", //NON-NLS bundle.getString("BlackboardAttribute.tskRemotePath.text")), // Remote path of a network drive - TSK_PROCESSOR_NAME(105, "TSK_PROCESSOR_NAME", //NON-NLS - bundle.getString("BlackboardAttribute.tskProcessorName.text")), // Processor name - TSK_TEMP_DIR(106, "TSK_TEMP_DIR", //NON-NLS + TSK_TEMP_DIR(105, "TSK_TEMP_DIR", //NON-NLS bundle.getString("BlackboardAttribute.tskTempDir.text")), // Default temporary files directory - TSK_PRODUCT_ID(107, "TSK_PRODUCT_ID", //NON-NLS + TSK_PRODUCT_ID(106, "TSK_PRODUCT_ID", //NON-NLS bundle.getString("BlackboardAttribute.tskProductId.text")), // Product ID - TSK_OWNER(108, "TSK_OWNER", //NON-NLS + TSK_OWNER(107, "TSK_OWNER", //NON-NLS bundle.getString("BlackboardAttribute.tskOwner.text")), // Registered owner of a piece of software - TSK_ORGANIZATION(109, "TSK_ORGANIZATION", //NON-NLS + TSK_ORGANIZATION(108, "TSK_ORGANIZATION", //NON-NLS bundle.getString("BlackboardAttribute.tskOrganization.text")), // Registered Organization for a piece of software ; diff --git a/framework/tsk/framework/services/TskBlackboard.cpp b/framework/tsk/framework/services/TskBlackboard.cpp index 43c469eaeba091cddd68a28ef0c43882891391f8..c5fe51f46f21cfb4823c31daa1da9ea2b371dc57 100755 --- a/framework/tsk/framework/services/TskBlackboard.cpp +++ b/framework/tsk/framework/services/TskBlackboard.cpp @@ -156,7 +156,6 @@ map<int, TskAttributeNames> initializeAttributeTypeMap(){ retval.insert(pair<int, TskAttributeNames>(TSK_READ_STATUS, TskAttributeNames("TSK_READ_STATUS", "Read"))); retval.insert(pair<int, TskAttributeNames>(TSK_LOCAL_PATH, TskAttributeNames("TSK_LOCAL_PATH", "Local Path"))); retval.insert(pair<int, TskAttributeNames>(TSK_REMOTE_PATH, TskAttributeNames("TSK_REMOTE_PATH", "Remote Path"))); - retval.insert(pair<int, TskAttributeNames>(TSK_PROCESSOR_NAME, TskAttributeNames("TSK_PROCESSOR_NAME", "Processor Name"))); retval.insert(pair<int, TskAttributeNames>(TSK_TEMP_DIR, TskAttributeNames("TSK_TEMP_DIR", "Temporary Files Directory"))); retval.insert(pair<int, TskAttributeNames>(TSK_PRODUCT_ID, TskAttributeNames("TSK_PRODUCT_ID", "Product ID"))); retval.insert(pair<int, TskAttributeNames>(TSK_OWNER, TskAttributeNames("TSK_OWNER", "Owner"))); diff --git a/framework/tsk/framework/services/TskBlackboard.h b/framework/tsk/framework/services/TskBlackboard.h index cf92a1d5652b214e50d80ea16e707d0f8a5dbe9d..4e1848bd74a46ba54be96fb663ff09461111e871 100755 --- a/framework/tsk/framework/services/TskBlackboard.h +++ b/framework/tsk/framework/services/TskBlackboard.h @@ -32,6 +32,9 @@ using namespace std; * Built in artifact types. * Refer to http://wiki.sleuthkit.org/index.php?title=Artifact_Examples * for details on which attributes should be used for each artifact. + * + * Refer to http://wiki.sleuthkit.org/index.php?title=Adding_Artifacts_and_Attributes + * for checklist of steps to add new artifacts and attributes. */ /* Note that the below comments are the only documentation @@ -87,6 +90,8 @@ enum TSK_ARTIFACT_TYPE { /* SEE ABOVE: * - KEEP JAVA CODE IN SYNC * - UPDATE map in TskBlackboard.cpp + * - UPDATE Autopsy report module to display the new data + * Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java * - Update Wiki to reflect the attributes that should be part of the artifact. */ }; @@ -205,11 +210,10 @@ enum TSK_ATTRIBUTE_TYPE { TSK_READ_STATUS = 102, ///< Message read status: 1 if read, 0 if unread TSK_LOCAL_PATH = 103, ///< Local path to a network share TSK_REMOTE_PATH = 104, ///< Remote path of the network share - TSK_PROCESSOR_NAME = 105, ///< Processor name (ex: Intel64 Family 6 Model 58 Stepping 9, GenuineIntel) - TSK_TEMP_DIR = 106, ///< Path to the default temp directory - TSK_PRODUCT_ID = 107, ///< ID string - TSK_OWNER = 108, ///< Registered owner for software - TSK_ORGANIZATION = 109, ///< Registered organization for software + TSK_TEMP_DIR = 105, ///< Path to the default temp directory + TSK_PRODUCT_ID = 106, ///< ID string + TSK_OWNER = 107, ///< Registered owner for software + TSK_ORGANIZATION = 108, ///< Registered organization for software /* SEE ABOVE: * - KEEP JAVA CODE IN SYNC