Changing artifacts.xml for statistics test

3 files changed, 878 insertions, 2432 deletions

diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index 7e48903a0..15d301322 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -1969,7 +1969,7 @@ public class JcrMetadataRepository
 //            Query query = queryManager.createQuery( "SELECT size FROM [archiva:artifact] " + whereClause,
 //                                                    Query.JCR_SQL2 );
             String whereClause = "WHERE ISDESCENDANTNODE([/repositories/" + repositoryId + "/content])";
-            Query query = queryManager.createQuery( "SELECT size FROM [archiva:artifact] " + whereClause, Query.JCR_SQL2 );
+            Query query = queryManager.createQuery( "SELECT type,size FROM ["+ARTIFACT_NODE_TYPE+"] " + whereClause, Query.JCR_SQL2 );
 
             QueryResult queryResult = query.execute();
 
@@ -1978,6 +1978,7 @@ public class JcrMetadataRepository
             for ( Row row : JcrUtils.getRows( queryResult ) )
             {
                 Node n = row.getNode();
+                log.debug( "Result node {}", n );
                 totalSize += row.getValue( "size" ).getLong();
 
                 String type;
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
index 7e1e83da9..c10103a16 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
@@ -23,9 +23,11 @@ import junit.framework.TestCase;
 import org.apache.archiva.metadata.model.MetadataFacetFactory;
 import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
 import org.apache.archiva.metadata.repository.DefaultMetadataResolver;
+import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.MetadataService;
 import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.metadata.repository.jcr.JcrMetadataRepository;
 import org.apache.archiva.metadata.repository.jcr.JcrRepositorySessionFactory;
 import org.apache.archiva.metadata.repository.jcr.JcrRepositorySession;
@@ -50,6 +52,7 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.nodetype.NodeTypeTemplate;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -64,6 +67,7 @@ import java.util.zip.GZIPInputStream;
 public class JcrRepositoryStatisticsGatheringTest
     extends TestCase
 {
+    private static final Logger log = LoggerFactory.getLogger( JcrRepositoryStatisticsGatheringTest.class );
     private static final int TOTAL_FILE_COUNT = 1000;
 
     private static final int NEW_FILE_COUNT = 500;
@@ -78,6 +82,8 @@ public class JcrRepositoryStatisticsGatheringTest
     private static Repository jcrRepository;
 
     Logger logger = LoggerFactory.getLogger( getClass() );
+    private int assertRetrySleepMs = 500;
+    private int assertMaxTries = 5;
 
     @BeforeClass
     public static void setupSpec()
@@ -121,6 +127,61 @@ public class JcrRepositoryStatisticsGatheringTest
         sessionFactory.close();
     }
 
+    /*
+     * Used by tryAssert to allow to throw exceptions in the lambda expression.
+     */
+    @FunctionalInterface
+    protected interface AssertFunction
+    {
+        void accept( ) throws Exception;
+    }
+
+    protected void tryAssert( AssertFunction func ) throws Exception
+    {
+        tryAssert( func, assertMaxTries, assertRetrySleepMs );
+    }
+
+
+    /*
+     * Runs the assert method until the assert is successful or the number of retries
+     * is reached. This is needed because the JCR Oak index update is asynchronous, so updates
+     * may not be visible immediately after the modification.
+     */
+    private void tryAssert( AssertFunction func, int retries, int sleepMillis ) throws Exception
+    {
+        Throwable t = null;
+        int retry = retries;
+        while ( retry-- > 0 )
+        {
+            try
+            {
+                func.accept( );
+                return;
+            }
+            catch ( Exception | AssertionError e )
+            {
+                t = e;
+                Thread.currentThread( ).sleep( sleepMillis );
+                log.warn( "Retrying assert {}: {}", retry, e.getMessage( ) );
+            }
+        }
+        log.warn( "Retries: {}, Exception: {}", retry, t.getMessage( ) );
+        if ( retry <= 0 && t != null )
+        {
+            if ( t instanceof RuntimeException )
+            {
+                throw (RuntimeException) t;
+            }
+            else if ( t instanceof Exception )
+            {
+                throw (Exception) t;
+            }
+            else if ( t instanceof Error )
+            {
+                throw (Error) t;
+            }
+        }
+    }
 
     private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String type )
         throws RepositoryException
@@ -175,7 +236,6 @@ public class JcrRepositoryStatisticsGatheringTest
             testedStatistics.setScanStartTime(startTime);
             testedStatistics.setScanEndTime(endTime);
 
-            repository.populateStatistics(repSession, repository, TEST_REPO, testedStatistics);
 
             DefaultRepositoryStatistics expectedStatistics = new DefaultRepositoryStatistics();
             expectedStatistics.setNewFileCount(NEW_FILE_COUNT);
@@ -195,13 +255,15 @@ public class JcrRepositoryStatisticsGatheringTest
             expectedStatistics.setTotalCountForType("pom", 144);
             expectedStatistics.setRepositoryId(TEST_REPO);
 
-            logger.info("getTotalCountForType: {}", testedStatistics.getTotalCountForType());
+            tryAssert( () -> {
+                repository.populateStatistics(repSession, repository, TEST_REPO, testedStatistics);
+
+                logger.info("getTotalCountForType: {}", testedStatistics.getTotalCountForType());
 
             assertEquals(NEW_FILE_COUNT, testedStatistics.getNewFileCount());
             assertEquals(TOTAL_FILE_COUNT, testedStatistics.getTotalFileCount());
             assertEquals(endTime, testedStatistics.getScanEndTime());
             assertEquals(startTime, testedStatistics.getScanStartTime());
-            assertEquals(95954585, testedStatistics.getTotalArtifactFileSize());
             assertEquals(269, testedStatistics.getTotalArtifactCount());
             assertEquals(1, testedStatistics.getTotalGroupCount());
             assertEquals(43, testedStatistics.getTotalProjectCount());
@@ -213,6 +275,8 @@ public class JcrRepositoryStatisticsGatheringTest
             assertEquals(2, testedStatistics.getTotalCountForType("war"));
             assertEquals(144, testedStatistics.getTotalCountForType("pom"));
             assertEquals(10, testedStatistics.getTotalCountForType("java-source"));
+            assertEquals(95954585, testedStatistics.getTotalArtifactFileSize());
+        });
 
         }
     }
@@ -227,7 +291,7 @@ public class JcrRepositoryStatisticsGatheringTest
         n = JcrUtils.getOrAddNode( n, "org" );
         n = JcrUtils.getOrAddNode( n, "apache" );
 
-        GZIPInputStream inputStream = new GZIPInputStream( getClass( ).getResourceAsStream( "/artifacts.xml.gz" ) );
+        InputStream inputStream = getClass( ).getResourceAsStream( "/artifacts.xml" );
         jcrSession.importXML( n.getPath( ), inputStream, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW );
         jcrSession.save( );
     }
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml
index bcff606c0..d4ed67164 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml
@@ -2,12 +2,7 @@
 <sv:node sv:name="archiva"
          xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:archiva="http://archiva.apache.org/jcr/"
          xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
-         xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="
-http://archiva.apache.org/jcr/
-http://www.jcp.org/jcr/1.0
-http://www.jcp.org/jcr/sv/1.0
-http://www.jcp.org/jcr/nt/1.0 ">
+         xmlns:nt="http://www.jcp.org/jcr/nt/1.0" >
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
     <sv:value>nt:unstructured</sv:value>
   </sv:property>
@@ -33,9 +28,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -51,12 +43,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.917+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -72,9 +61,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -90,12 +76,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.960+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -111,9 +94,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -129,12 +109,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.964+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -150,9 +127,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -168,12 +142,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.967+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -189,9 +160,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -207,12 +175,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.970+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -236,9 +201,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-applet-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -254,12 +216,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.973+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -267,9 +226,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-applet-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -285,12 +241,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.976+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -306,9 +259,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-applet-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -324,12 +274,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.979+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -337,9 +284,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-applet-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -355,12 +299,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.982+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -376,9 +317,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-applet-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -394,12 +332,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.984+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -407,9 +342,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-applet-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -425,12 +357,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.987+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -454,9 +383,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-converter-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -472,12 +398,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.989+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -485,9 +408,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-converter-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -503,12 +423,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.993+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -524,9 +441,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-converter-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -542,12 +456,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.995+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -555,9 +466,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-converter-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -573,12 +481,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:14.998+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -594,9 +499,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-converter-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -612,12 +514,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.000+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -625,9 +524,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-converter-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -643,12 +539,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.002+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -672,9 +565,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-reports-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -690,12 +580,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.005+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -703,9 +590,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-reports-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -721,12 +605,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.007+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -742,9 +623,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-reports-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -760,12 +638,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.009+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -773,9 +648,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-reports-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -791,12 +663,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.012+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -812,9 +681,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-artifact-reports-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -830,12 +696,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.014+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -843,9 +706,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-artifact-reports-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -861,12 +721,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.017+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -890,9 +747,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-base-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -908,12 +762,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.020+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -929,9 +780,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-base-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -947,12 +795,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.022+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -968,9 +813,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-base-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -986,12 +828,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.025+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1007,9 +846,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-base-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1025,12 +861,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.027+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1046,9 +879,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-base-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1064,12 +894,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.030+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1093,9 +920,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-checksum-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1111,12 +935,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.032+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -1127,9 +948,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1145,12 +963,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.035+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1158,9 +973,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1176,12 +988,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.037+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1197,9 +1006,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-checksum-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1215,12 +1021,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.039+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1228,9 +1031,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1246,12 +1046,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.041+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1267,9 +1064,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-checksum-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1285,12 +1079,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.043+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1298,9 +1089,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1316,12 +1104,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.046+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1337,9 +1122,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-checksum-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1355,12 +1137,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.048+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1368,9 +1147,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1386,12 +1162,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.050+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1407,9 +1180,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-checksum-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1425,12 +1195,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.052+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1438,9 +1205,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-checksum-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1456,12 +1220,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.054+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1485,9 +1246,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-common-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1503,12 +1261,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.056+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -1519,9 +1274,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1537,12 +1289,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.059+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1550,9 +1299,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1568,12 +1314,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.061+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1589,9 +1332,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-common-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1607,12 +1347,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.063+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1620,9 +1357,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1638,12 +1372,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.065+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1659,9 +1390,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-common-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1677,12 +1405,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.067+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1690,9 +1415,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1708,12 +1430,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.069+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1729,9 +1448,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-common-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1747,12 +1463,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.071+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1760,9 +1473,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1778,12 +1488,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.074+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1799,9 +1506,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-common-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1817,12 +1521,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.076+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1830,9 +1531,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-common-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1848,12 +1546,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.078+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1877,9 +1572,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-configuration-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1895,12 +1587,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.080+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -1911,9 +1600,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1929,12 +1615,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.083+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -1942,9 +1625,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1960,12 +1640,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.085+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -1981,9 +1658,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-configuration-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -1999,12 +1673,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.088+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2012,9 +1683,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2030,12 +1698,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.090+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2051,9 +1716,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-configuration-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2069,12 +1731,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.092+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2082,9 +1741,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2100,12 +1756,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.095+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2121,9 +1774,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-configuration-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2139,12 +1789,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.097+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2152,9 +1799,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2170,12 +1814,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.100+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2191,9 +1832,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-configuration-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2209,12 +1847,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.102+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2222,9 +1857,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-configuration-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2240,12 +1872,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.104+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2269,9 +1898,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumer-api-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2287,12 +1913,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.106+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -2303,9 +1926,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2321,12 +1941,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.108+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2334,9 +1951,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2352,12 +1966,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.110+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2373,9 +1984,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumer-api-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2391,12 +1999,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.112+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2404,9 +2009,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2422,12 +2024,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.115+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2443,9 +2042,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumer-api-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2461,12 +2057,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.117+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2474,9 +2067,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2492,12 +2082,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.119+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2513,9 +2100,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumer-api-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2531,12 +2115,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.120+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2544,9 +2125,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2562,12 +2140,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.122+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2583,9 +2158,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumer-api-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2601,12 +2173,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.124+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2614,9 +2183,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-consumer-api-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2632,12 +2198,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.126+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2661,9 +2224,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumers-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2679,12 +2239,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.128+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2700,9 +2257,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumers-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2718,12 +2272,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.130+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2739,9 +2290,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumers-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2757,12 +2305,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.132+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2778,9 +2323,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumers-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2796,12 +2338,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.134+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2817,9 +2356,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-consumers-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2835,12 +2371,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.136+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2864,9 +2397,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-converter-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2882,12 +2412,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.138+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2895,9 +2422,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-converter-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2913,12 +2437,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.140+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -2934,9 +2455,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-converter-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2952,12 +2470,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.142+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -2965,9 +2480,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-converter-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -2983,12 +2495,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.144+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3004,9 +2513,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-converter-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3022,12 +2528,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.146+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3035,9 +2538,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-converter-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3053,12 +2553,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.148+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3082,9 +2579,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-core-consumers-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3100,12 +2594,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.150+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -3116,9 +2607,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-core-consumers-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3134,12 +2622,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.152+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3147,9 +2632,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-core-consumers-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3165,12 +2647,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.154+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3186,9 +2665,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-core-consumers-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3204,12 +2680,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.156+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3217,9 +2690,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-core-consumers-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3235,12 +2705,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.158+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3256,9 +2723,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-core-consumers-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3274,12 +2738,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.159+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3287,9 +2748,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-core-consumers-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3305,12 +2763,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.161+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3326,9 +2781,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-core-consumers-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3344,12 +2796,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.163+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3357,9 +2806,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-core-consumers-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3375,12 +2821,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.165+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3404,9 +2847,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3422,12 +2862,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.167+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3435,9 +2872,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3453,12 +2887,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.169+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3474,9 +2905,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3492,12 +2920,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.171+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3505,9 +2930,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3523,12 +2945,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.173+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3544,9 +2963,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3562,12 +2978,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.175+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3575,9 +2988,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3593,12 +3003,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.176+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3622,9 +3029,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-consumers-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3640,12 +3044,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.178+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3653,9 +3054,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-consumers-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3671,12 +3069,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.180+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3692,9 +3087,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-consumers-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3710,12 +3102,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.182+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3723,9 +3112,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-consumers-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3741,12 +3127,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.184+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3762,9 +3145,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-database-consumers-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3780,12 +3160,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.186+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3793,9 +3170,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-database-consumers-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3811,12 +3185,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.188+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3840,9 +3211,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-graph-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3858,12 +3226,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.190+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -3874,9 +3239,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-graph-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3892,12 +3254,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.198+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3905,9 +3264,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-graph-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3923,12 +3279,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.200+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -3944,9 +3297,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-graph-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3962,12 +3312,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.202+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -3975,9 +3322,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-graph-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -3993,12 +3337,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.204+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4014,9 +3355,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-graph-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4032,12 +3370,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.205+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4045,9 +3380,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-graph-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4063,12 +3395,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.207+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4092,9 +3421,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4110,12 +3436,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.209+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4123,9 +3446,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4141,12 +3461,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.211+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4162,9 +3479,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4180,12 +3494,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.212+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4193,9 +3504,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4211,12 +3519,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.214+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4232,9 +3537,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4250,12 +3552,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.216+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4263,9 +3562,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-dependency-tree-consumer-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4281,12 +3577,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.217+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4310,9 +3603,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-indexer-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4328,12 +3618,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.219+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4341,9 +3628,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-indexer-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4359,12 +3643,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.221+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4380,9 +3661,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-indexer-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4398,12 +3676,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.222+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4411,9 +3686,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-indexer-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4429,12 +3701,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.224+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4450,9 +3719,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-indexer-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4468,12 +3734,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.226+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4481,9 +3744,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-indexer-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4499,12 +3759,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.227+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4520,9 +3777,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-indexer-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4538,12 +3792,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.229+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4551,9 +3802,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-indexer-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4569,12 +3817,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.230+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4598,9 +3843,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-jetty-1.2.1-bin.zip">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4616,12 +3858,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.232+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>bin</sv:value>
           </sv:property>
@@ -4632,9 +3871,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-jetty-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4650,12 +3886,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.234+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4671,9 +3904,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-jetty-1.3.1-bin.tar.gz">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4689,12 +3919,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.236+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>bin.tar</sv:value>
           </sv:property>
@@ -4705,9 +3932,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-jetty-1.3.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4723,12 +3947,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.237+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4752,9 +3973,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-lucene-consumers-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4770,12 +3988,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.239+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4783,9 +3998,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-lucene-consumers-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4801,12 +4013,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.241+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4822,9 +4031,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-lucene-consumers-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4840,12 +4046,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.242+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4853,9 +4056,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-lucene-consumers-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4871,12 +4071,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.244+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4892,9 +4089,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-lucene-consumers-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4910,12 +4104,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.246+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -4923,9 +4114,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-lucene-consumers-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4941,12 +4129,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.247+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -4970,9 +4155,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-metadata-reports-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -4988,12 +4170,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.249+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5001,9 +4180,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-metadata-reports-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5019,12 +4195,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.251+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5040,9 +4213,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-metadata-reports-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5058,12 +4228,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.253+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5071,9 +4238,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-metadata-reports-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5089,12 +4253,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.254+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5118,9 +4279,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-model-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5136,12 +4294,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.256+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -5152,9 +4307,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5170,12 +4322,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.258+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5183,9 +4332,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5201,12 +4347,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.260+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5222,9 +4365,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-model-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5240,12 +4380,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.261+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5253,9 +4390,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5271,12 +4405,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.263+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5292,9 +4423,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-model-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5310,12 +4438,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.265+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5323,9 +4448,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5341,12 +4463,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.267+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5362,9 +4481,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-model-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5380,12 +4496,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.268+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5393,9 +4506,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5411,12 +4521,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.270+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5432,9 +4539,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-model-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5450,12 +4554,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.272+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -5463,9 +4564,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-model-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5481,12 +4579,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.273+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5510,9 +4605,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-modules-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5528,12 +4620,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.275+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5549,9 +4638,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-modules-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5567,12 +4653,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.277+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5588,9 +4671,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-modules-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5606,12 +4686,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.278+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5627,9 +4704,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-modules-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5645,12 +4719,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.280+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5666,9 +4737,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-modules-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5684,12 +4752,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.282+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5713,9 +4778,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-parent-3-site.xml">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5731,12 +4793,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.284+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>site</sv:value>
           </sv:property>
@@ -5747,9 +4806,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-parent-3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5765,12 +4821,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.286+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5786,9 +4839,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-parent-5-site.xml">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5804,12 +4854,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.288+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>site</sv:value>
           </sv:property>
@@ -5820,9 +4867,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-parent-5.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5838,12 +4882,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.290+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5859,9 +4900,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-parent-6-site.xml">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5877,12 +4915,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.292+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>site</sv:value>
           </sv:property>
@@ -5893,9 +4928,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-parent-6.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5911,12 +4943,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.294+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -5940,9 +4969,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-policies-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5958,12 +4984,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.295+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -5974,9 +4997,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -5992,12 +5012,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.298+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6005,9 +5022,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6023,12 +5037,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.299+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6044,9 +5055,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-policies-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6062,12 +5070,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.301+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6075,9 +5080,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6093,12 +5095,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.303+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6114,9 +5113,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-policies-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6132,12 +5128,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.305+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6145,9 +5138,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6163,12 +5153,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.306+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6184,9 +5171,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-policies-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6202,12 +5186,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.308+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6215,9 +5196,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6233,12 +5211,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.310+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6254,9 +5229,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-policies-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6272,12 +5244,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.312+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6285,9 +5254,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-policies-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6303,12 +5269,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.313+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6332,9 +5295,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-project-reports-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6350,12 +5310,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.315+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6363,9 +5320,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-project-reports-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6381,12 +5335,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.317+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6402,9 +5353,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-project-reports-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6420,12 +5368,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.319+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6433,9 +5378,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-project-reports-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6451,12 +5393,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.321+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6480,9 +5419,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-proxy-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6498,12 +5434,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.322+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6511,9 +5444,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-proxy-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6529,12 +5459,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.324+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6550,9 +5477,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-proxy-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6568,12 +5492,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.326+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6581,9 +5502,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-proxy-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6599,12 +5517,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.328+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6620,9 +5535,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-proxy-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6638,12 +5550,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.330+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6651,9 +5560,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-proxy-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6669,12 +5575,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.332+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6698,9 +5601,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-report-manager-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6716,12 +5616,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.333+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6729,9 +5626,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-report-manager-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6747,12 +5641,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.335+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6768,9 +5659,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-report-manager-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6786,12 +5674,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.336+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6799,9 +5684,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-report-manager-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6817,12 +5699,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.338+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6838,9 +5717,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-report-manager-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6856,12 +5732,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.340+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -6869,9 +5742,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-report-manager-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6887,12 +5757,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.341+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6916,9 +5783,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-reporting-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6934,12 +5798,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.343+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6955,9 +5816,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-reporting-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -6973,12 +5831,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.345+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -6994,9 +5849,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-reporting-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7012,12 +5864,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.346+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7041,9 +5890,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-repository-layer-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7059,12 +5905,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.348+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -7075,9 +5918,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7093,12 +5933,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.350+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7106,9 +5943,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7124,12 +5958,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.351+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7145,9 +5976,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-repository-layer-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7163,12 +5991,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.353+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7176,9 +6001,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7194,12 +6016,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.355+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7215,9 +6034,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-repository-layer-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7233,12 +6049,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.356+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7246,9 +6059,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7264,12 +6074,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.358+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7285,9 +6092,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-repository-layer-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7303,12 +6107,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.359+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7316,9 +6117,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7334,12 +6132,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.361+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7355,9 +6150,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-repository-layer-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7373,12 +6165,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.362+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7386,9 +6175,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-repository-layer-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7404,12 +6190,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.364+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7433,9 +6216,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-rss-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7451,12 +6231,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.365+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7464,9 +6241,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-rss-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7482,12 +6256,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.367+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7503,9 +6274,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-rss-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7521,12 +6289,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.369+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7534,9 +6299,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-rss-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7552,12 +6314,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.370+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7573,9 +6332,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-rss-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7591,12 +6347,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.372+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7604,9 +6357,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-rss-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7622,12 +6372,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.373+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7651,9 +6398,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-scheduled-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7669,12 +6413,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.375+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7682,9 +6423,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-scheduled-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7700,12 +6438,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.377+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7721,9 +6456,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-scheduled-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7739,12 +6471,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.378+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7752,9 +6481,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-scheduled-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7770,12 +6496,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.380+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7791,9 +6514,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-scheduled-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7809,12 +6529,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.381+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7822,9 +6539,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-scheduled-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7840,12 +6554,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.383+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7869,9 +6580,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-security-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7887,12 +6595,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.384+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7900,9 +6605,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-security-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7918,12 +6620,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.385+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -7939,9 +6638,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-security-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7957,12 +6653,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.387+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -7970,9 +6663,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-security-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -7988,12 +6678,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.388+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8009,9 +6696,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-security-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8027,12 +6711,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.390+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8040,9 +6721,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-security-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8058,12 +6736,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.391+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8087,9 +6762,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-signature-consumers-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8105,12 +6777,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.392+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8118,9 +6787,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-signature-consumers-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8136,12 +6802,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.394+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8157,9 +6820,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-signature-consumers-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8175,12 +6835,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.395+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8188,9 +6845,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-signature-consumers-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8206,12 +6860,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.397+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8227,9 +6878,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-signature-consumers-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8245,12 +6893,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.398+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8258,9 +6903,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-signature-consumers-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8276,12 +6918,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.399+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8305,9 +6944,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-transaction-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8323,12 +6959,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.401+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8336,9 +6969,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-transaction-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8354,12 +6984,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.402+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8375,9 +7002,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-transaction-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8393,12 +7017,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.403+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8406,9 +7027,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-transaction-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8424,12 +7042,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.405+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8445,9 +7060,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-transaction-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8463,12 +7075,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.406+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8476,9 +7085,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-transaction-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8494,12 +7100,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.408+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8523,9 +7126,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-web-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8541,12 +7141,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.409+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8562,9 +7159,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-web-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8580,12 +7174,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.410+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8601,9 +7192,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-web-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8619,12 +7207,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.412+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8640,9 +7225,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-web-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8658,12 +7240,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.414+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8687,9 +7266,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-webapp-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8705,12 +7281,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.415+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8718,9 +7291,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-webapp-1.1.war">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8736,12 +7306,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.417+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>war</sv:value>
           </sv:property>
@@ -8757,9 +7324,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-webapp-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8775,12 +7339,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.418+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8788,9 +7349,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-webapp-1.2.2.war">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8806,12 +7364,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.420+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>war</sv:value>
           </sv:property>
@@ -8835,9 +7390,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-webdav-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8853,12 +7405,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.421+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8866,9 +7415,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-webdav-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8884,12 +7430,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.423+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8905,9 +7448,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-webdav-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8923,12 +7463,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.424+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -8936,9 +7473,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-webdav-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8954,12 +7488,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.426+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -8975,9 +7506,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-webdav-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -8993,12 +7521,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.427+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9006,9 +7531,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-webdav-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9024,12 +7546,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.428+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9053,9 +7572,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xml-tools-1.1-sources.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9071,12 +7587,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.430+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="classifier" sv:type="String">
             <sv:value>sources</sv:value>
           </sv:property>
@@ -9087,9 +7600,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9105,12 +7615,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.431+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9118,9 +7625,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9136,12 +7640,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.433+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9157,9 +7658,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xml-tools-1.1.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9175,12 +7673,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.434+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9188,9 +7683,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.1.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9206,12 +7698,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.435+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9227,9 +7716,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xml-tools-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9245,12 +7731,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.436+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9258,9 +7741,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9276,12 +7756,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.438+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9297,9 +7774,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xml-tools-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9315,12 +7789,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.439+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9328,9 +7799,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9346,12 +7814,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.440+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9367,9 +7832,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xml-tools-1.3.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9385,12 +7847,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.442+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9398,9 +7857,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xml-tools-1.3.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9416,12 +7872,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.443+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9445,9 +7898,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9463,12 +7913,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.444+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9484,9 +7931,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9502,12 +7946,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.445+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9531,9 +7972,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-api-1.2.1.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9549,12 +7987,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.447+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9562,9 +7997,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xmlrpc-api-1.2.1.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9580,12 +8012,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.448+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9601,9 +8030,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-api-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9619,12 +8045,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.449+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9632,9 +8055,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xmlrpc-api-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9650,12 +8070,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.451+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9679,9 +8096,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-client-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9697,12 +8111,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.452+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9710,9 +8121,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xmlrpc-client-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9728,12 +8136,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.453+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9757,9 +8162,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-security-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9775,12 +8177,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.454+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9788,9 +8187,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xmlrpc-security-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9806,12 +8202,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.455+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>
@@ -9835,9 +8228,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:property>
       <sv:node sv:name="archiva-xmlrpc-services-1.2.2.jar">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9853,12 +8243,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.456+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>jar</sv:value>
           </sv:property>
@@ -9866,9 +8253,6 @@ http://www.jcp.org/jcr/nt/1.0 ">
       </sv:node>
       <sv:node sv:name="archiva-xmlrpc-services-1.2.2.pom">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>nt:unstructured</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>archiva:artifact</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
@@ -9884,12 +8268,9 @@ http://www.jcp.org/jcr/nt/1.0 ">
           <sv:value>2010-12-30T19:21:15.457+11:00</sv:value>
         </sv:property>
         <sv:node sv:name="org.apache.archiva.metadata.repository.storage.maven2.artifact">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>nt:unstructured</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>archiva:facet</sv:value>
-          </sv:property>
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>archiva:facet</sv:value>
+        </sv:property>
           <sv:property sv:name="type" sv:type="String">
             <sv:value>pom</sv:value>
           </sv:property>