You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/05/29 21:47:27 UTC
svn commit: r542634 - in /maven/archiva/trunk/archiva-base:
archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
archiva-model/src/main/mdo/archiva-base.xml
Author: joakime
Date: Tue May 29 12:47:26 2007
New Revision: 542634
URL: http://svn.apache.org/viewvc?view=rev&rev=542634
Log:
[MRM-380]: When trying to look at project with empty groupId
Update for exception on Roles and JDODetachedFieldException
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?view=diff&rev=542634&r1=542633&r2=542634
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java Tue May 29 12:47:26 2007
@@ -192,6 +192,13 @@
getLogger().warn( "Unable to save project model " + artifactFile + " to the database : " + e.getMessage(),
e );
}
+ catch ( Throwable t )
+ {
+ // Catch the other errors in the process to allow the rest of the process to complete.
+ getLogger().error(
+ "Unable to process model " + artifactFile + " due to : " + t.getClass().getName()
+ + " : " + t.getMessage(), t );
+ }
}
private boolean hasProjectModelInDatabase( String groupId, String artifactId, String version )
Modified: maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?view=diff&rev=542634&r1=542633&r2=542634
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Tue May 29 12:47:26 2007
@@ -197,6 +197,7 @@
<class stash.storable="true"
jpox.table="ARTIFACT"
+ jpox.not-persisted-fields="modelEncoding"
jpox.use-identifiers-as-primary-key="false"
jpox.identity-type="application"
jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaArtifactModelKey">
@@ -399,6 +400,7 @@
</class>
<class stash.storable="true"
jpox.table="JAVA_ARTIFACT"
+ jpox.not-persisted-fields="modelEncoding"
jpox.use-identifiers-as-primary-key="false"
jpox.identity-type="application"
jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaArtifactJavaDetailsKey">
@@ -526,6 +528,7 @@
<class stash.storable="true"
jpox.use-identifiers-as-primary-key="false"
+ jpox.not-persisted-fields="modelEncoding"
jpox.identity-type="application"
jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaRepositoryMetadataKey"
jpox.table="REPOSITORY_METADATA">
@@ -694,6 +697,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="REPOSITORY_METADATA_SNAPSHOTS">
<name>SnapshotVersion</name>
<description>The Snapshot Version</description>
@@ -737,6 +741,7 @@
-->
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="PROJECT_REFERENCE">
<name>ProjectReference</name>
<description>A reference to another (unversioned) Project</description>
@@ -798,6 +803,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="VERSIONED_REFERENCE">
<name>VersionedReference</name>
<description>A reference to another Versioned Project</description>
@@ -870,6 +876,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="ARTIFACT_REFERENCE">
<name>ArtifactReference</name>
<version>1.0.0+</version>
@@ -986,6 +993,7 @@
<class stash.storable="true"
jpox.table="PROJECT"
+ jpox.not-persisted-fields="modelEncoding"
jpox.use-identifiers-as-primary-key="false"
jpox.identity-type="application"
jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaProjectModelKey">
@@ -1289,6 +1297,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="MAILING_LISTS">
<name>MailingList</name>
<description>A Mailing List</description>
@@ -1345,6 +1354,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="ORGANIZATION">
<name>Organization</name>
<description>Specifies the organization that produces this project.</description>
@@ -1387,6 +1397,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="LICENSES">
<name>License</name>
<description><![CDATA[
@@ -1437,6 +1448,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="ISSUE_MANAGEMENT">
<name>IssueManagement</name>
<description>
@@ -1468,7 +1480,7 @@
</codeSegments>
</class>
- <class>
+ <class jpox.not-persisted-fields="modelEncoding">
<name>CiManagement</name>
<version>1.0.0+</version>
<fields>
@@ -1498,7 +1510,8 @@
</codeSegments>
</class>
- <class stash.storable="true">
+ <class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding">
<name>Individual</name>
<description>
Description of a person who has contributed to the project.
@@ -1564,7 +1577,8 @@
described by a <code>role</code> element, the body of which is a
role name. This can also be used to describe the contribution.
]]></description>
- <association>
+ <association stash.part="true"
+ jpox.join="false">
<type>String</type>
<multiplicity>*</multiplicity>
</association>
@@ -1601,6 +1615,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="DEPENDENCY">
<name>Dependency</name>
<version>1.0.0+</version>
@@ -1781,6 +1796,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="EXCLUSIONS">
<name>Exclusion</name>
<version>1.0.0+</version>
@@ -1811,6 +1827,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="SCM">
<name>Scm</name>
<version>1.0.0+</version>
@@ -1856,6 +1873,7 @@
</class>
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="PROJECT_REPOSITORIES">
<name>ProjectRepository</name>
<version>1.0.0+</version>
@@ -1939,6 +1957,7 @@
-->
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="REPOSITORY_PROBLEMS">
<name>RepositoryProblem</name>
<version>1.0.0+</version>
@@ -2038,6 +2057,7 @@
-->
<class stash.storable="true"
+ jpox.not-persisted-fields="modelEncoding"
jpox.table="REPOSITORY_STATS">
<name>RepositoryContentStatistics</name>
<version>1.0.0+</version>