You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/12/14 03:21:43 UTC
svn commit: r890156 - in /archiva/branches/MRM-1296/archiva-modules:
archiva-base/archiva-model/pom.xml
archiva-base/archiva-model/src/main/mdo/archiva-base.xml
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Author: oching
Date: Mon Dec 14 02:21:42 2009
New Revision: 890156
URL: http://svn.apache.org/viewvc?rev=890156&view=rev
Log:
[MRM-1296] Audit Log Report
o update model version
o remove unused import
Modified:
archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/branches/MRM-1296/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
archiva/branches/MRM-1296/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
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=890156&r1=890155&r2=890156&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:21:42 2009
@@ -70,7 +70,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>1.2.3</version>
+ <version>1.3.0</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=890156&r1=890155&r2=890156&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:21:42 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.3</version>
+ <version>1.3.0</version>
<description>Archiva Model</description>
<defaults>
<default>
@@ -2289,11 +2289,11 @@
<class stash.storable="true"
jpox.table="AUDIT_LOGS">
<name>ArchivaAuditLogs</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<fields>
<field stash.maxSize="50">
<name>repositoryId</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>String</type>
@@ -2303,7 +2303,7 @@
</field>
<field>
<name>eventDate</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>Date</type>
@@ -2313,7 +2313,7 @@
</field>
<field>
<name>artifact</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>false</required>
<type>String</type>
@@ -2323,7 +2323,7 @@
</field>
<field>
<name>event</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>false</required>
<type>String</type>
@@ -2333,7 +2333,7 @@
</field>
<field>
<name>username</name>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<identifier>false</identifier>
<required>true</required>
<type>String</type>
@@ -2344,7 +2344,7 @@
</fields>
<codeSegments>
<codeSegment>
- <version>1.2.3+</version>
+ <version>1.3.0+</version>
<code><![CDATA[
private static final long serialVersionUID = -7113629916828442780L;
]]></code>
Modified: archiva/branches/MRM-1296/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1296/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=890156&r1=890155&r2=890156&view=diff
==============================================================================
--- archiva/branches/MRM-1296/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/branches/MRM-1296/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Mon Dec 14 02:21:42 2009
@@ -41,7 +41,6 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.database.ArchivaAuditLogsDao;
import org.apache.maven.archiva.model.ArchivaProjectModel;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
import org.apache.maven.archiva.model.ArtifactReference;