You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/03/23 14:42:38 UTC
svn commit: r1887964 [2/3] - in /turbine/fulcrum/trunk: commonsemail/
configuration/impl/ crypto/ crypto/src/test/org/apache/fulcrum/crypto/
factory/ groovy/ hsqldb/src/test/ intake/src/changes/
intake/src/java/org/apache/fulcrum/intake/model/ intake/s...
Added: turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd (added)
+++ turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd Tue Mar 23 14:42:37 2021
@@ -0,0 +1,1157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Torque XML database schema DTD
+ $Id$
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://db.apache.org/torque/5.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
+ elementFormDefault="qualified"
+ version="5.0">
+
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The XML schema used by version 5.0 and greater of the Apache Software
+Foundation Torque project(
+<a href="http://db.apache.org/torque">http://db.apache.org/torque</a> )
+to model SQL database information. This model is used by various Torque
+utilities for managing the SQL Server info and to build the Java objects
+to access this data.
+
+The basic structure of a model is built using the database element
+as the root. This will contain references to options, external (include)
+models, new SQL Domain definitions, and tables. See the Torque project
+home page for more details.
+ </xs:documentation>
+ </xs:annotation>
+
+<!-- =====================================
+ database element definition
+ ===================================== -->
+ <xs:element name="database" type="databaseType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The root element for defining a Torque database schema.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="databaseType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The root type definition for a Torque database schema.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A set of key/value options to be passed to custom generator templates.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="include-schema" type="includeSchemaType"
+ minOccurs="0" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Include another schema file in this schema (as if it were a part of this
+schema file).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="external-schema" type="externalSchemaType"
+ minOccurs="0" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Reference another schema file from this schema (outbound connections only).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="domain" type="domainType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Domains are used to define common attribute sets for columns.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="table" type="tableType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a database table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="view" type="viewType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a database view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="javaNameType" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en" >
+The name used to identify this schema in the generated
+Java objects and as the default JDBC connection pool to use.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="defaultJavaType" use="optional"
+ type="javaReturnType" default="primitive" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to primitive.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="defaultIdMethod" use="optional" type="idMethodType"
+ default="none" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines the defaultIdMethod to use with tables which do not have an idMethod
+attribute defined. This attribute has 3 possible values, they are:
+
+- idbroker
+ Torque's software based id broker system
+- native
+ The SQL Server's native autoincrement/identifier process
+- none
+ Don't try to auto assign id numbers
+- null
+ Use the value previously set or the default value.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ option element definition
+ ===================================== -->
+ <xs:complexType name="optionType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+These tags allows a set of key/value options to be passed to custom generator
+templates.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="key" type="xs:string" use="required" />
+ <xs:attribute name="value" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ include-schema element definition
+ ===================================== -->
+ <xs:complexType name="includeSchemaType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Include another schema file in this schema (as if it were a part of this
+schema file).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="filename" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ external-schema element definition
+ ===================================== -->
+ <xs:complexType name="externalSchemaType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Includes another schema file.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="filename" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ domain element definition
+ ===================================== -->
+ <xs:complexType name="domainType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Domains are used to define attributes for columns.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="xs:string" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used to reference this set of column attributes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="optional" type="sqlDataType"
+ default="VARCHAR" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL Standard data type for the column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The default column value
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this domain for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ table element definition
+ ===================================== -->
+ <xs:complexType name="tableType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The table element and its relevant attributes.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="column" type="columnType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:choice minOccurs="0" maxOccurs="unbounded" >
+ <xs:element name="foreign-key" type="foreignKeyType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a foreign key constraint for this table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="index" type="indexType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines an index for this table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="unique" type="uniqueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a unique value constraint
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="id-method-parameter" type="idMethodParameterType">
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The table name of the SQL table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="interface" type="javaQualifiedNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The interface attribute specifies an interface that should be referenced in
+the implements section of the generated extension class. If this is a fully
+qualified class name (i. e. the string contains dots), the interface will
+simply be implemented by the extension object. If the interface is a simple
+class name (without dots), an empty interface file will be generated in the
+extension object package. When this attribute is used, all methods that
+normally would return the extension object type will now return the interface
+type. This feature allows to use Torque generated classes in the context of
+other applications or APIs.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="peerInterface" type="javaQualifiedNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The interface attribute specifies an interface that should be referenced in
+the implements section of the generated peer class. If this is a fully
+qualified class name (i. e. the string contains dots), the interface will
+simply be implemented by the peer object. If the interface is a simple
+class name (without dots), an empty interface file will be generated in the
+peer package. This feature allows to use Torque generated peer classes
+in the context of other applications or APIs.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="baseClass" type="javaQualifiedNameType" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java table
+record objects will extend. This class does not have to extend
+org.apache.torque.om.BaseObject.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="basePeer" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java Peer objects will extend.
+Unlike baseClass, basePeer should extend BasePeer at some point in the chain,
+i.e. it needs to be the superclass.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="idMethod" use="optional" type="idMethodType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines the id method to automatically generate ids for this table.
+This attribute has 3 possible values, they are:
+
+- idbroker
+ Torque's software based id broker system
+- native
+ The SQL Server's native autoincrement / identifier process
+- none
+ Don't try to auto assign id numbers
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to generate the class as Abstract or not
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+This is the Java class name to use when generating the table. If
+this is missing the Java name is generated from the name attribute.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="skipSql" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to skip SQL generation for this reference. Useful for using
+Views or creating a "subset" of columns in an existing table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description of this table. Used for documentation and will be included in
+the table generation SQL if the server type supports this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ column element definition
+ ===================================== -->
+ <xs:complexType name="columnType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="enum-value" type="enumValueType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="inheritance" type="inheritanceType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column name
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="optional" type="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL data type for the column. Is required unless a domain is used.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The default column value
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="useDatabaseDefaultValue" type="xs:boolean" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether to use the database default value if a new object is saved
+and the attribute value is equal to the java default value. Default is false.
+Has no effect on primitive boolean columns.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="primaryKey" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether this column is part of the table's primary key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="autoIncrement" use="optional"
+ type="xs:boolean" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to auto-increment this field (true or false, defaults to false)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="required" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether a value is required in this column (NULL ALLOWED) (true or false,
+defaults to false)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The Java property name to use for this column in the record objects.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaType" use="optional"
+ type="javaReturnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to database attribute or primitive
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The domain reference name to set common settings.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="inheritance" type="inheritanceAttrType" use="optional"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The inheritance method used (see inheritance documentation)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="protected" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, the setters and getters for this property will be protected rather
+than public.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="version" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, this column is used as a version number for optimistic locking.
+I.e. for updates, Torque will check that the version number in the database
+is equal to the version number of the supplied object
+and it will automatically increase the version number of the updated row.
+Setting version to true will only work for numeric columns and will produce
+code that does not compile if applied to other column types.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="enumType" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If this attribute has a value, the java type for the column is an enum.
+The name of the enum type is contained in this attribute. It can be either
+fully qualified or unqualified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this column for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ inheritance element definition
+ ===================================== -->
+ <xs:complexType name="inheritanceType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="key" type="xs:string" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A value found in the column marked as the inheritance key column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="class" type="javaNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The class name for the object that will inherit the record values
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="extends" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The class that the inheritor class will extend
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ enumValue element definition
+ ===================================== -->
+ <xs:complexType name="enumValueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a possible value for an enum. If any of these elements occurs
+for a column, Torque will generate an enum for this column.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="value" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The value for the enum. Must be unique.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The java name for the enum. Must be unique and must not clash
+with automatically determined javaNames for the same enum.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description for the enum value.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ foreign-key element definition
+ ===================================== -->
+ <xs:complexType name="foreignKeyType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a foreign key constraint for this table.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="reference" type="referenceType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a mapping between a local column containing a foreign key value and
+the foreign table column.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used to create the foreign key constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="foreignTable" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name of the table that contains the foreign key
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="onDelete" use="optional" type="cascadeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The action to take when the referenced value in foreignTable is deleted.
+Note this is handled by the database server and not Torque code. Will not
+work if the DB server does not support this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="onUpdate" use="optional" type="cascadeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The action to take when the referenced value in foreignTable is updated.
+Note this is handled by the database server and not Torque code. Will not
+work if the DB server does not support this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ reference element definition
+ ===================================== -->
+ <xs:complexType name="referenceType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a mapping between a local column containing a foreign key value and
+the foreign table column.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="foreign" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column in the foreign table that contains the key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="local" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column in this table that contains the foreign key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ index element definition
+ ===================================== -->
+ <xs:complexType name="indexType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines an index for this table.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="index-column" type="indexColumnType"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a column to use in a table index.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used in creating this index in the database.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ reference element definition
+ ===================================== -->
+ <xs:complexType name="indexColumnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a column to use in a table index.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A column name to use in this index. Must exist in the table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ unique element definition
+ ===================================== -->
+ <xs:complexType name="uniqueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a unique value constraint
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="unique-column" type="uniqueColumnType"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Specify a column to use in the unique constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name to use in defining this constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ unique-column element definition
+ ===================================== -->
+ <xs:complexType name="uniqueColumnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Specify a column to use in the unique constraint.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name to use in defining this constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. columnname(size). Mainly to customize restrictions in bytes/character restrictions without global changes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ id-method-parameter element definition
+ ===================================== -->
+ <xs:complexType name="idMethodParameterType">
+ <xs:attribute name="name" type="xs:string" use="optional"
+ default="default" />
+ <xs:attribute name="value" type="xs:string"
+ use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ view element definition
+ ===================================== -->
+ <xs:complexType name="viewType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The view element and its relevant attributes.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="column" type="viewColumnType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name of the SQL view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="baseClass" type="javaQualifiedNameType" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java view
+record objects will extend. This class does not have to extend
+org.apache.torque.om.BaseObject.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="basePeer" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java Peer objects will extend.
+Unlike baseClass, basePeer should extend BasePeer at some point in the chain,
+i.e. it needs to be the superclass.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to generate the class as Abstract or not
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+This is the Java class name to use when generating the view. If
+this is missing the Java name is generated from the name attribute.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="sqlSuffix" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The remainder of the sql for the view after column definitions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="createSql" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The complete SQL for creating the view. Overrides all other means
+of generating the SQL for view creation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="skipSql" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to skip SQL generation for this reference.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description of this view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ view column element definition
+ ===================================== -->
+ <xs:complexType name="viewColumnType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="inheritance" type="inheritanceType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column name
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="required" type="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL Standard data type for the column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The Java property name to use for this column in the record objects.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaType" use="optional"
+ type="javaReturnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to database attribute or primitive
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The domain reference name to set common settings.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="select" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The sql snippet which contains the value to select.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="protected" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, the setters and getters for this property will be protected rather
+than public.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this column for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="enumType" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If this attribute has a value, the java type for the column is an enum.
+The name of the enum type is contained in this attribute. It can be either
+fully qualified or unqualified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+<!-- =====================================
+ Type definitions for attributes
+ ===================================== -->
+
+ <xs:simpleType name="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Standard SQL column data types.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="BIT" />
+ <xs:enumeration value="TINYINT" />
+ <xs:enumeration value="SMALLINT" />
+ <xs:enumeration value="INTEGER" />
+ <xs:enumeration value="BIGINT" />
+ <xs:enumeration value="FLOAT" />
+ <xs:enumeration value="REAL" />
+ <xs:enumeration value="NUMERIC" />
+ <xs:enumeration value="DECIMAL" />
+ <xs:enumeration value="CHAR" />
+ <xs:enumeration value="VARCHAR" />
+ <xs:enumeration value="LONGVARCHAR" />
+ <xs:enumeration value="DATE" />
+ <xs:enumeration value="TIME" />
+ <xs:enumeration value="TIMESTAMP" />
+ <xs:enumeration value="BINARY" />
+ <xs:enumeration value="VARBINARY" />
+ <xs:enumeration value="LONGVARBINARY" />
+ <xs:enumeration value="NULL" />
+ <xs:enumeration value="OTHER" />
+ <xs:enumeration value="JAVA_OBJECT" />
+ <xs:enumeration value="DISTINCT" />
+ <xs:enumeration value="STRUCT" />
+ <xs:enumeration value="ARRAY" />
+ <xs:enumeration value="BLOB" />
+ <xs:enumeration value="CLOB" />
+ <xs:enumeration value="REF" />
+ <xs:enumeration value="BOOLEANINT" />
+ <xs:enumeration value="BOOLEANCHAR" />
+ <xs:enumeration value="DOUBLE" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="idMethodType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A schema type for methods to create ids automatically.
+
+idbroker = Torque's software based id broker system
+native = The SQL Server's native method, depends on database used
+ (e.g. autoincrement for MySQL, sequence for postgresql...)
+none = Don't try to auto assign id numbers
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="idbroker" />
+ <xs:enumeration value="native" />
+ <xs:enumeration value="none" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaReturnType">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="object" />
+ <xs:enumeration value="primitive" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="cascadeType" >
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="cascade" />
+ <xs:enumeration value="setnull" />
+ <xs:enumeration value="restrict" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="inheritanceAttrType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="single" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Java fully qualified names (e.g. x.y.x)
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/Torque.properties (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/Torque.properties Tue Mar 23 14:42:37 2021
@@ -18,7 +18,7 @@
#
# Runtime settings for the fulcrum security test profile
#
-# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $
+# $Id$
#
Propchange: turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties Tue Mar 23 14:42:37 2021
@@ -18,7 +18,7 @@
#
# Runtime settings for the fulcrum turbien default security test profile
#
-# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $
+# $Id$
#
torque.database.default = default
Propchange: turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties
------------------------------------------------------------------------------
svn:keywords = Id
Added: turbine/fulcrum/trunk/security/torque/suppression-owasp.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/suppression-owasp.xml?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/suppression-owasp.xml (added)
+++ turbine/fulcrum/trunk/security/torque/suppression-owasp.xml Tue Mar 23 14:42:37 2021
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+</suppressions>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/torque/suppression-owasp.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/pom.xml (original)
+++ turbine/fulcrum/trunk/spring/pom.xml Tue Mar 23 14:42:37 2021
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -89,7 +89,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -105,7 +105,7 @@
<turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
<siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL -->
- <spring.version>4.1.6.RELEASE</spring.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
</properties>
</project>
Modified: turbine/fulcrum/trunk/spring/src/test/org/apache/fulcrum/spring/SpringIntoAvalonTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/src/test/org/apache/fulcrum/spring/SpringIntoAvalonTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/src/test/org/apache/fulcrum/spring/SpringIntoAvalonTest.java (original)
+++ turbine/fulcrum/trunk/spring/src/test/org/apache/fulcrum/spring/SpringIntoAvalonTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,14 @@
package org.apache.fulcrum.spring;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
+import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerConfiguration;
+import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerFactory;
+import org.apache.fulcrum.yaafi.service.systemproperty.SystemPropertyService;
+import org.springframework.beans.BeansException;
+import org.springframework.context.support.AbstractApplicationContext;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,16 +30,6 @@ package org.apache.fulcrum.spring;
import junit.framework.TestCase;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
-import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerConfiguration;
-import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerFactory;
-import org.apache.fulcrum.yaafi.service.systemproperty.SystemPropertyService;
-import org.apache.fulcrum.spring.SpringFrameworkService;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.beans.BeansException;
-
/**
* Instantiate a Spring framework instance within an Avalon
* Container and use the services.
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Tue Mar 23 14:42:37 2021
@@ -65,18 +65,12 @@
<!--scope>test</scope -->
</dependency>
<!-- use Junit 4 within Junit 5 -->
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-runner</artifactId>
- <version>${junit.platform}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <version>${junit.platform}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Needed if testing with YAAFI -->
<dependency>
@@ -159,8 +153,8 @@
<properties>
<turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
- <junit.jupiter.version>5.7.0</junit.jupiter.version>
- <junit.platform>1.7.0</junit.platform>
+ <junit.jupiter.version>5.7.1</junit.jupiter.version>
+ <junit.platform>1.7.1</junit.platform>
</properties>
</project>
Propchange: turbine/fulcrum/trunk/testcontainer/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java (original)
+++ turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java Tue Mar 23 14:42:37 2021
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
* Basic testing of the Container
*
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
- * @version $Id: YaafiContainerTest.java 1694570 2015-08-06 20:35:41Z sgoeschl $
+ * @version $Id$
*/
@DisplayName("Yaafi Container Test JUnit5")
public class YaafiContainerJunit5Test extends BaseUnit5Test
Propchange: turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/upload/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/pom.xml (original)
+++ turbine/fulcrum/trunk/upload/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -117,13 +117,6 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
- <!-- remove mockito, if testcontainer upgrading to v1.0.8 -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Propchange: turbine/fulcrum/trunk/upload/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java (original)
+++ turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java Tue Mar 23 14:42:37 2021
@@ -1,9 +1,9 @@
package org.apache.fulcrum.upload;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -49,9 +49,9 @@ import javax.servlet.http.HttpSession;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
@@ -60,12 +60,12 @@ import org.mockito.stubbing.Answer;
* @author <a href="epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class UploadServiceTest extends BaseUnit4Test
+public class UploadServiceTest extends BaseUnit5Test
{
private UploadService uploadService = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
try
@@ -107,7 +107,7 @@ public class UploadServiceTest extends B
System.out.println( fi.getString() );
assertEquals(15,fi.getSize());
// default is ISO-8859-1
- assertTrue("data string:'" +fi.getString("UTF-8") +"' not as expected", fi.getString("UTF-8").startsWith( "Ãberfülle" ));
+ assertTrue( fi.getString("UTF-8").startsWith( "Ãberfülle" ), "data string:'" +fi.getString("UTF-8") +"' not as expected");
//reset inputstream
requestFormData( request, testData);
@@ -217,7 +217,7 @@ public class UploadServiceTest extends B
when(request.getContextPath()).thenReturn("wow");
when(request.getContentType()).thenReturn("html/text");
- when(request.getCharacterEncoding()).thenReturn("US-ASCII");
+ when(request.getCharacterEncoding()).thenReturn("UTF-8");
when(request.getServerPort()).thenReturn(8080);
when(request.getLocale()).thenReturn(Locale.US);
Propchange: turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/pom.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/pom.xml Tue Mar 23 14:42:37 2021
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/xmlrpc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java (original)
+++ turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,8 @@
package org.apache.fulcrum.xmlrpc;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,7 +25,9 @@ package org.apache.fulcrum.xmlrpc;
import java.net.URL;
import java.util.Vector;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Unit testing for the XML-RPC component
@@ -30,24 +35,16 @@ import org.apache.fulcrum.testcontainer.
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
-public class XmlRpcComponentTest extends BaseUnitTest
+public class XmlRpcComponentTest extends BaseUnit5Test
{
- /**
- * Constructor for test.
- *
- * @param testName name of the test being executed
- */
- public XmlRpcComponentTest(String testName)
- {
- super(testName);
- }
-
+ @Test
public void testInitialize()
{
assertTrue(true);
}
+ @Disabled
public void OFFtestLookup() throws Exception
{
XmlRpcServerComponent xmlrpc = null;
@@ -58,6 +55,7 @@ public class XmlRpcComponentTest extends
release(xmlrpc);
}
+ @Test
public void testHandler() throws Exception
{
// start the xml-rpc server
@@ -73,7 +71,7 @@ public class XmlRpcComponentTest extends
URL server = new URL("http://localhost:12345/RPC2");
// setup param from rpc call
- Vector params = new Vector();
+ Vector<String> params = new Vector<String>();
String testMessage = "Test message to be echoed back.";
params.addElement(testMessage);
Propchange: turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/yaafi/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/pom.xml (original)
+++ turbine/fulcrum/trunk/yaafi/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi-crypto</artifactId>
- <version>1.0.7</version>
+ <version>2.0.1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -119,9 +119,15 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.9</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Propchange: turbine/fulcrum/trunk/yaafi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java Tue Mar 23 14:42:37 2021
@@ -59,7 +59,7 @@ package org.apache.fulcrum.yaafi.interce
* @author Henri Yandell
* @author Stephen Colebourne
* @since 2.0
- * @version $Id: StopWatch.java,v 1.1 2005/09/29 13:18:37 sigi Exp $
+ * @version $Id$
*/
public class StopWatch {
Propchange: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,7 @@
package org.apache.fulcrum.yaafi;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +21,7 @@ package org.apache.fulcrum.yaafi;
* under the License.
*/
-
-import org.apache.fulcrum.yaafi.testcontainer.BaseUnitTest;
+import org.junit.jupiter.api.Test;
/**
* Test suite for ensuring that a dependent test component
@@ -30,16 +31,8 @@ import org.apache.fulcrum.yaafi.testcont
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-public class DependentTestComponentTest extends BaseUnitTest
+public class DependentTestComponentTest extends BaseUnit5Test
{
- /**
- * Constructor
- * @param name the name of the test case
- */
- public DependentTestComponentTest( String name )
- {
- super(name);
- }
/**
* DependentTestComponentImpl uses a TestComponent which. Make
@@ -47,6 +40,7 @@ public class DependentTestComponentTest
*
* @throws Exception generic exception
*/
+ @Test
public void testDependentTestComponent() throws Exception
{
DependentTestComponent dependentTestComponent = (DependentTestComponent) this.lookup(
Propchange: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,12 @@
package org.apache.fulcrum.yaafi;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.fulcrum.yaafi.testcontainer.BaseUnit5Test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +27,7 @@ package org.apache.fulcrum.yaafi;
*/
-import org.apache.fulcrum.yaafi.testcontainer.BaseUnitTest;
+import org.junit.jupiter.api.Test;
/**
* Test suite for the project
@@ -28,17 +35,10 @@ import org.apache.fulcrum.yaafi.testcont
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-public class TestComponentTest extends BaseUnitTest
+public class TestComponentTest extends BaseUnit5Test
{
- /**
- * Constructor
- * @param name the name of the test case
- */
- public TestComponentTest( String name )
- {
- super(name);
- }
+ @Test
public void testTestComponent() throws Exception
{
TestComponent testComponent = (TestComponent) this.lookup(
Propchange: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,7 @@
package org.apache.fulcrum.yaafi.baseservice;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +21,10 @@ package org.apache.fulcrum.yaafi.baseser
* under the License.
*/
-
import java.io.File;
-import org.apache.fulcrum.yaafi.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
/**
* Test suite for the project
@@ -30,26 +32,18 @@ import org.apache.fulcrum.yaafi.testcont
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-public class DerivedServiceTest extends BaseUnitTest
+public class DerivedServiceTest extends BaseUnit5Test
{
- /**
- * Constructor
- * @param name the name of the test case
- */
- public DerivedServiceTest( String name )
- {
- super(name);
- }
/**
* Lookup the service and invoke the test() method
+ *
* @throws Exception invocation failed
*/
+ @Test
public void testDerivedService() throws Exception
{
- DerivedService derivedService = (DerivedService) this.lookup(
- DerivedService.class.getName()
- );
+ DerivedService derivedService = (DerivedService) this.lookup( DerivedService.class.getName() );
// invoke the test() method on the service
@@ -58,12 +52,12 @@ public class DerivedServiceTest extends
// determine absolute paths and files
String fileName = "./src/test/TestRoleConfig.xml";
- String absolutePath = derivedService.createAbsolutePath(fileName);
- File absoluteFile = derivedService.createAbsoluteFile(fileName);
+ String absolutePath = derivedService.createAbsolutePath( fileName );
+ File absoluteFile = derivedService.createAbsoluteFile( fileName );
- assertTrue(absoluteFile.isAbsolute());
- assertTrue(absoluteFile.exists());
- assertTrue(new File(absolutePath).isAbsolute());
- assertTrue(new File(absolutePath).exists());
+ assertTrue( absoluteFile.isAbsolute() );
+ assertTrue( absoluteFile.exists() );
+ assertTrue( new File( absolutePath ).isAbsolute() );
+ assertTrue( new File( absolutePath ).exists() );
}
}
Propchange: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java Tue Mar 23 14:42:37 2021
@@ -23,6 +23,8 @@ import junit.framework.TestCase;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.yaafi.TestComponent;
+import org.junit.After;
+import org.junit.jupiter.api.Test;
/**
* Test suite for exercising the command line integration.
@@ -34,18 +36,11 @@ public class MainTest extends TestCase
{
private Main main;
- /**
- * Constructor
- * @param name the name of the test case
- */
- public MainTest( String name )
- {
- super(name);
- }
/* (non-Javadoc)
* @see junit.framework.TestCase#tearDown()
*/
+ @After
protected void tearDown() throws Exception
{
this.main.dispose();
@@ -67,6 +62,7 @@ public class MainTest extends TestCase
* Initialize the CLI using a valid container configuration
* @throws Exception generic exception
*/
+ @Test
public void testValidContainerConfiguration() throws Exception
{
String[] args = {
@@ -84,6 +80,7 @@ public class MainTest extends TestCase
* Test the toString() method provding diagnostic information
* @throws Exception generic exception
*/
+ @Test
public void testToString() throws Exception
{
String[] args = {
@@ -102,6 +99,7 @@ public class MainTest extends TestCase
* Initialize the CLI using an invalid container configuration
* @throws Exception generic exception
*/
+ @Test
public void testInvlidContainerConfiguration() throws Exception
{
String[] args = {
Propchange: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id