You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@archiva.apache.org by Brett Porter <br...@apache.org> on 2009/12/14 03:12:05 UTC

Re: svn commit: r890155 - in /archiva/branches/MRM-1296/archiva-modules: archiva-base/archiva-model/ archiva-base/archiva-model/src/main/mdo/ archiva-database/src/main/java/org/apache/maven/archiva/database/ archiva-database/src/main/java/org/apache/maven/...

There seems to be an inconsistency in the modello versions - should all be 1.3.0+?

On 14/12/2009, at 1:06 PM, oching@apache.org wrote:

> 
> Modified: archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/pom.xml
> URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/pom.xml?rev=890155&r1=890154&r2=890155&view=diff
> ==============================================================================
> --- archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/pom.xml (original)
> +++ archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/pom.xml Mon Dec 14 02:06:05 2009
> @@ -70,7 +70,7 @@
>         <groupId>org.codehaus.modello</groupId>
>         <artifactId>modello-maven-plugin</artifactId>
>         <configuration>
> -          <version>1.2.1</version>
> +          <version>1.2.3</version>
>           <packageWithVersion>false</packageWithVersion>
>           <models>
>             <model>src/main/mdo/archiva-base.xml</model>
> 
> Modified: archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
> URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=890155&r1=890154&r2=890155&view=diff
> ==============================================================================
> --- archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
> +++ archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Mon Dec 14 02:06:05 2009
> @@ -5,7 +5,7 @@
>        xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
>   <id>archiva-base-model</id>
>   <name>ArchivaBaseModel</name>
> -  <version>1.2.1</version>
> +  <version>1.2.3</version>
>   <description>Archiva Model</description>
>   <defaults>
>     <default>
> @@ -75,6 +75,14 @@
>             <multiplicity>*</multiplicity>
>           </association>
>         </field>
> +        <field>
> +          <name>archivaAuditLogs</name>
> +          <version>1.3.0+</version>
> +          <association>
> +            <type>ArchivaAuditLogs</type>
> +            <multiplicity>*</multiplicity>
> +          </association>
> +        </field>
>       </fields>
>       <codeSegments>
>         <codeSegment>
> @@ -2278,5 +2286,70 @@
>         </codeSegment>
>       </codeSegments>
>     </class>
> +    <class stash.storable="true"
> +           jpox.table="AUDIT_LOGS">
> +      <name>ArchivaAuditLogs</name>
> +      <version>1.2.3+</version>
> +      <fields>
> +        <field stash.maxSize="50">
> +          <name>repositoryId</name>
> +          <version>1.2.3+</version>
> +          <identifier>false</identifier>
> +          <required>true</required>
> +          <type>String</type>
> +          <description>
> +            The repository id where the operation was done.
> +          </description>
> +        </field>
> +        <field>
> +          <name>eventDate</name>
> +          <version>1.2.3+</version>
> +          <identifier>false</identifier>
> +          <required>true</required>
> +          <type>Date</type>
> +          <description>
> +            The timestamp on when the event happened.
> +          </description>
> +        </field>
> +        <field>
> +          <name>artifact</name>
> +          <version>1.2.3+</version>
> +          <identifier>false</identifier>
> +          <required>false</required>
> +          <type>String</type>
> +          <description>
> +            The affected artifact, if there is one.
> +          </description>
> +        </field>
> +        <field>
> +          <name>event</name>
> +          <version>1.2.3+</version>
> +          <identifier>false</identifier>
> +          <required>false</required>
> +          <type>String</type>
> +          <description>
> +            The event that happened.
> +          </description>
> +        </field>
> +        <field>
> +          <name>username</name>
> +          <version>1.2.3+</version>
> +          <identifier>false</identifier>
> +          <required>true</required>
> +          <type>String</type>
> +          <description>
> +            The user who executed the event.
> +          </description>
> +        </field>
> +      </fields>
> +      <codeSegments>
> +        <codeSegment>
> +          <version>1.2.3+</version>
> +          <code><![CDATA[
> +    private static final long serialVersionUID = -7113629916828442780L;
> +          ]]></code>
> +        </codeSegment>
> +      </codeSegments>
> +    </class>
>   </classes>
> </model>