diff --git a/rudder-core/src/test/resources/logentry.xml b/rudder-core/src/test/resources/logentry.xml deleted file mode 100644 index ddf3315a7c3..00000000000 --- a/rudder-core/src/test/resources/logentry.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - AddNodeLogEntry - 1Init2010-09-13T14:14:20.709+02:002010-09-13T14:14:20.709+02:00 - root - - - AddDirectiveLogEntry - 22010-09-13T14:14:20.709+02:001 - root - DistributePolicy1 - - - AddDirectiveLogEntry - 32010-09-13T14:14:20.709+02:001 - root - HasPolicyServer1 - - - diff --git a/rudder-core/src/test/resources/reportsInfo.xml b/rudder-core/src/test/resources/reportsInfo.xml deleted file mode 100644 index 6ea6d9249b8..00000000000 --- a/rudder-core/src/test/resources/reportsInfo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - directiveId - 3 - - 123 - - - - \ No newline at end of file diff --git a/rudder-core/src/test/resources/spring-config-test.xml b/rudder-core/src/test/resources/spring-config-test.xml deleted file mode 100644 index cb4afac5e35..00000000000 --- a/rudder-core/src/test/resources/spring-config-test.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rudder-core/src/test/resources/template.st b/rudder-core/src/test/resources/template.st deleted file mode 100644 index 227aefea62b..00000000000 --- a/rudder-core/src/test/resources/template.st +++ /dev/null @@ -1 +0,0 @@ -&title& \ No newline at end of file diff --git a/rudder-core/src/test/resources/templates1/amptest.st b/rudder-core/src/test/resources/templates1/amptest.st deleted file mode 100644 index 5c8998ecd5b..00000000000 --- a/rudder-core/src/test/resources/templates1/amptest.st +++ /dev/null @@ -1 +0,0 @@ -$(sys.workdir)/bin/cf-agent -f failsafe.cf \&\& $(sys.workdir)/bin/cf-agent \ No newline at end of file diff --git a/rudder-core/src/test/resources/templates1/invalid.st b/rudder-core/src/test/resources/templates1/invalid.st deleted file mode 100644 index 05ebe695b21..00000000000 --- a/rudder-core/src/test/resources/templates1/invalid.st +++ /dev/null @@ -1 +0,0 @@ -&bobcat \ No newline at end of file diff --git a/rudder-core/src/test/resources/templates1/templatetest.st b/rudder-core/src/test/resources/templates1/templatetest.st deleted file mode 100644 index 227aefea62b..00000000000 --- a/rudder-core/src/test/resources/templates1/templatetest.st +++ /dev/null @@ -1 +0,0 @@ -&title& \ No newline at end of file diff --git a/rudder-core/src/test/resources/templates1/vartest.st b/rudder-core/src/test/resources/templates1/vartest.st deleted file mode 100644 index 67875b4eed0..00000000000 --- a/rudder-core/src/test/resources/templates1/vartest.st +++ /dev/null @@ -1,2 +0,0 @@ -"cfserved" string => "$POLICY_SERVER"; -"$(file[$(fileParameters)][1])" \ No newline at end of file diff --git a/rudder-core/src/test/resources/templates2/templatetest.st b/rudder-core/src/test/resources/templates2/templatetest.st deleted file mode 100644 index 031f3c54840..00000000000 --- a/rudder-core/src/test/resources/templates2/templatetest.st +++ /dev/null @@ -1 +0,0 @@ -&title& \ No newline at end of file diff --git a/rudder-core/src/test/resources/testBindings.xml b/rudder-core/src/test/resources/testBindings.xml deleted file mode 100644 index 0076659c07e..00000000000 --- a/rudder-core/src/test/resources/testBindings.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - Policy1 - Role1 - - - Var1 - Descr1 - - Field1 - - - - Policy2 - Role2 - - - Var2 - Descr2 - - Field2 - - - - Policy3 - Role3 - - - Var3 - Descr3 - - Field3 - - - \ No newline at end of file diff --git a/rudder-core/src/test/resources/testConfig.xml b/rudder-core/src/test/resources/testConfig.xml deleted file mode 100644 index 9f493742f1b..00000000000 --- a/rudder-core/src/test/resources/testConfig.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - machineC - machineC - 2009-12-29T16:29:09.792+01:00 - - - - root - - - - - root - - - - - - - machineB - machineB - 2009-12-29T16:29:09.792+01:00 - - - - machineA - - - root - - - - - machineA - - - root - - - - - - - clientD - machineD - 2009-12-29T16:29:09.792+01:00 - - - - machineA - - - - - machineA - - - - - - - - machineA - machineA - 2009-12-29T16:29:09.792+01:00 - - - - root - - - machineD - - - machineB - - - - - root - - - machineD - - - machineB - - - - - - - racine - root - root.hostname - 2009-12-29T16:29:09.792+01:00 - - - - machineA - machineB - machineC - - - - - machineA - machineB - machineC - - - - - diff --git a/rudder-core/src/test/resources/testLogEntries.xml b/rudder-core/src/test/resources/testLogEntries.xml deleted file mode 100644 index 8eafef8a0b6..00000000000 --- a/rudder-core/src/test/resources/testLogEntries.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - AddNodeLogEntry - 1Init2010-09-13T14:14:20.709+02:002010-09-13T14:14:20.709+02:00 - root - - - AddDirectiveLogEntry - 22010-09-13T14:14:20.709+02:001 - root - DistributePolicy1 - - - AddDirectiveLogEntry - 32010-09-13T14:14:20.709+02:001 - root - HasPolicyServer1 - - - \ No newline at end of file diff --git a/rudder-core/src/test/resources/testSchema.sql b/rudder-core/src/test/resources/testSchema.sql deleted file mode 100644 index 2f0f23039db..00000000000 --- a/rudder-core/src/test/resources/testSchema.sql +++ /dev/null @@ -1,99 +0,0 @@ --- SQL schema for the reports data - --- Create the sequences -Create SEQUENCE confSerialId START 2; -Create SEQUENCE operationSerialId START 2; - -Create SEQUENCE confVersionId START 2; -Create SEQUENCE operationVersionId START 2; - --- Create the table for the configuration reports information -create table configurationReportsInfo ( - serialId integer PRIMARY KEY DEFAULT nextval('confSerialId'), - versionId integer NOT NULL, - configurationRuleId text NOT NULL CHECK (configurationRuleId <> ''), - serial integer NOT NULL, - policyInstanceId text NOT NULL CHECK (policyInstanceId <> ''), - component text NOT NULL CHECK (component <> ''), - cardinality integer NOT NULL, - beginDate timestamp NOT NULL, - endDate timestamp -); - -create index configuration_versionId on configurationReportsInfo (versionId); - -create table configurationServerList ( - versionId integer NOT NULL , - serverUuid varchar(50) NOT NULL CHECK (serverUuid <> ''), - primary key (versionId, serverUuid) -); - --- Create the table for the operation reports information - -create table operationReportsInfo ( - serialId integer PRIMARY KEY DEFAULT nextval('confSerialId'), - versionId integer NOT NULL, - policyInstanceId text NOT NULL CHECK (policyInstanceId <> ''), - cardinality integer NOT NULL, - executionDateTime timestamp NOT NULL, - reportDateTime timestamp -); - -create index operation_versionId on operationReportsInfo (versionId); - -create table operationServerList ( - versionId integer NOT NULL, - serverUuid text NOT NULL CHECK (serverUuid <> ''), - primary key (versionId, serverUuid) -); - - --- create the table for the reports sent - -create sequence serial START 101; - -CREATE TABLE RudderSysEvents ( -id integer PRIMARY KEY default nextval('serial'), -executionDate timestamp NOT NULL, -nodeId text NOT NULL CHECK (nodeId <> ''), -policyInstanceId text NOT NULL CHECK (policyInstanceId <> ''), -configurationRuleId text NOT NULL CHECK (configurationRuleId <> ''), -serial integer NOT NULL, -component text NOT NULL CHECK (component <> ''), -keyValue text, -executionTimeStamp timestamp NOT NULL, -eventType varchar(64), -policy text, -msg text -); - - -create index nodeid_idx on RudderSysEvents (nodeId); -create index date_idx on RudderSysEvents (executionDate); -create index policyInstanceId_idx on RudderSysEvents (policyInstanceId); -create index configurationRuleId_idx on RudderSysEvents (configurationRuleId); -create index configurationRuleId_node_idx on RudderSysEvents (configurationRuleId, nodeId); -create index configurationRuleId_serialed_idx on RudderSysEvents (configurationRuleId, serial); -create index composite_idx on RudderSysEvents (configurationRuleId, policyInstanceId, serial, executionTimeStamp); - - --- Log event part - -CREATE SEQUENCE eventLogIdSeq START 1; - - -CREATE TABLE EventLog ( - id integer PRIMARY KEY DEFAULT nextval('eventLogIdSeq'), - creationDate timestamp NOT NULL DEFAULT 'now', - severity integer, - causeId integer, - principal varchar(64), - eventType varchar(64), - data xml -); - -create index eventType_idx on EventLog (eventType); -create index causeId_idx on EventLog (causeId); --- look at http://www.slideshare.net/petereisentraut/postgresql-and-xml ---create index data_idx on EventLog (data); -- Would it works ? - diff --git a/rudder-core/src/test/resources/testTml.xml b/rudder-core/src/test/resources/testTml.xml deleted file mode 100644 index c8a6169312d..00000000000 --- a/rudder-core/src/test/resources/testTml.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/rudder-core/src/test/resources/testVariable.xml b/rudder-core/src/test/resources/testVariable.xml deleted file mode 100644 index 0c4fb09a42e..00000000000 --- a/rudder-core/src/test/resources/testVariable.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - $SIMPLEVARIABLE - Simple variable - - - - - - $CONSTRAINEDVARIABLE - Constrained variable - - - value - - - - value2 - - - - - - - - - $VARMACHINE - Variable Machine - name - - - - - - $VARDATE - Variable Date - datetime - - - - - - varlist - Variable list - string - true - true - - - - - - varpolicyinstance - Variable directive - string - Bounding - - - - - - gui_only - a gui only variable - integer - FileCopy - - UploadedFile - Size - true - - false - - - - - - full - Variable with a lot of things - LONGDESCRIPTION - DEFAULT - string - Bounding - - - - \ No newline at end of file