The following schema fragment specifies the expected content contained within this class.
- *
- *
generateValue;
-
- /**
- * Gets the value of the generateValue property.
- *
- *
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a set method for the generateValue property.
- *
- *
- * For example, to add a new item, do as follows:
- *
- * getGenerateValue().add(newItem);
- *
- *
- *
- *
- * Objects of the following type(s) are allowed in the list
- * {@link GenerateValue }
- *
- *
- */
- public List getGenerateValue() {
- if (generateValue == null) {
- generateValue = new ArrayList();
- }
- return this.generateValue;
- }
-
-}
diff --git a/source/java/org/alfresco/repo/audit/model/_3/GenerateValue.java b/source/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
index 8fcd9206d5..60caf6d316 100644
--- a/source/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
+++ b/source/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
@@ -17,6 +17,7 @@ import javax.xml.bind.annotation.XmlType;
* <complexContent>
* <extension base="{http://www.alfresco.org/repo/audit/model/3.2}KeyedAuditDefinition">
* <attribute name="dataGenerator" use="required" type="{http://www.alfresco.org/repo/audit/model/3.2}NameAttribute" />
+ * <attribute name="scope" use="required" type="{http://www.alfresco.org/repo/audit/model/3.2}ScopeAttribute" />
* </extension>
* </complexContent>
* </complexType>
@@ -32,6 +33,8 @@ public class GenerateValue
@XmlAttribute(required = true)
protected String dataGenerator;
+ @XmlAttribute(required = true)
+ protected ScopeAttribute scope;
/**
* Gets the value of the dataGenerator property.
@@ -57,4 +60,28 @@ public class GenerateValue
this.dataGenerator = value;
}
+ /**
+ * Gets the value of the scope property.
+ *
+ * @return
+ * possible object is
+ * {@link ScopeAttribute }
+ *
+ */
+ public ScopeAttribute getScope() {
+ return scope;
+ }
+
+ /**
+ * Sets the value of the scope property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ScopeAttribute }
+ *
+ */
+ public void setScope(ScopeAttribute value) {
+ this.scope = value;
+ }
+
}
diff --git a/source/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java b/source/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
index 69c9a919ef..2828f80fd4 100644
--- a/source/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
+++ b/source/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
@@ -33,6 +33,30 @@ public class ObjectFactory {
public ObjectFactory() {
}
+ /**
+ * Create an instance of {@link KeyedAuditDefinition }
+ *
+ */
+ public KeyedAuditDefinition createKeyedAuditDefinition() {
+ return new KeyedAuditDefinition();
+ }
+
+ /**
+ * Create an instance of {@link DataExtractor }
+ *
+ */
+ public DataExtractor createDataExtractor() {
+ return new DataExtractor();
+ }
+
+ /**
+ * Create an instance of {@link Audit }
+ *
+ */
+ public Audit createAudit() {
+ return new Audit();
+ }
+
/**
* Create an instance of {@link DataExtractors }
*
@@ -49,6 +73,14 @@ public class ObjectFactory {
return new AuditPath();
}
+ /**
+ * Create an instance of {@link DataGenerator }
+ *
+ */
+ public DataGenerator createDataGenerator() {
+ return new DataGenerator();
+ }
+
/**
* Create an instance of {@link DataGenerators }
*
@@ -57,14 +89,6 @@ public class ObjectFactory {
return new DataGenerators();
}
- /**
- * Create an instance of {@link KeyedAuditDefinition }
- *
- */
- public KeyedAuditDefinition createKeyedAuditDefinition() {
- return new KeyedAuditDefinition();
- }
-
/**
* Create an instance of {@link RecordValue }
*
@@ -73,38 +97,6 @@ public class ObjectFactory {
return new RecordValue();
}
- /**
- * Create an instance of {@link DataGenerator }
- *
- */
- public DataGenerator createDataGenerator() {
- return new DataGenerator();
- }
-
- /**
- * Create an instance of {@link AuditSession }
- *
- */
- public AuditSession createAuditSession() {
- return new AuditSession();
- }
-
- /**
- * Create an instance of {@link GenerateValue }
- *
- */
- public GenerateValue createGenerateValue() {
- return new GenerateValue();
- }
-
- /**
- * Create an instance of {@link DataExtractor }
- *
- */
- public DataExtractor createDataExtractor() {
- return new DataExtractor();
- }
-
/**
* Create an instance of {@link Application }
*
@@ -114,11 +106,11 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link Audit }
+ * Create an instance of {@link GenerateValue }
*
*/
- public Audit createAudit() {
- return new Audit();
+ public GenerateValue createGenerateValue() {
+ return new GenerateValue();
}
/**
diff --git a/source/java/org/alfresco/repo/audit/model/_3/ScopeAttribute.java b/source/java/org/alfresco/repo/audit/model/_3/ScopeAttribute.java
new file mode 100644
index 0000000000..029bcb2971
--- /dev/null
+++ b/source/java/org/alfresco/repo/audit/model/_3/ScopeAttribute.java
@@ -0,0 +1,40 @@
+
+package org.alfresco.repo.audit.model._3;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Java class for ScopeAttribute.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="ScopeAttribute">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="SESSION"/>
+ * <enumeration value="AUDIT"/>
+ * <enumeration value="ALL"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "ScopeAttribute")
+@XmlEnum
+public enum ScopeAttribute {
+
+ SESSION,
+ AUDIT,
+ ALL;
+
+ public String value() {
+ return name();
+ }
+
+ public static ScopeAttribute fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-bad-01.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-01.xml
new file mode 100644
index 0000000000..e20ba07aa0
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-01.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-bad-02.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-02.xml
new file mode 100644
index 0000000000..6e38a361ed
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-02.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-bad-03.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-03.xml
new file mode 100644
index 0000000000..fce198634e
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-03.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-bad-04.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-04.xml
new file mode 100644
index 0000000000..a0e47761a7
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-04.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-bad-05.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-05.xml
new file mode 100644
index 0000000000..752fea97b4
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-bad-05.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test.xml b/source/test-resources/alfresco/audit/alfresco-audit-test.xml
new file mode 100644
index 0000000000..b6f3364f7f
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file