You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/05/25 19:11:38 UTC
svn commit: r541723 - in /maven/archiva/trunk:
archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/
archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/
arc...
Author: joakime
Date: Fri May 25 10:11:37 2007
New Revision: 541723
URL: http://svn.apache.org/viewvc?view=rev&rev=541723
Log:
[MRM-330]: Searching gives an HTTP 500
Functionality is now the same as archiva 0.9
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java Fri May 25 10:11:37 2007
@@ -29,7 +29,11 @@
import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory;
import org.apache.maven.archiva.indexer.RepositoryIndexException;
import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
+import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaRepository;
+import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
+import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
+import org.apache.maven.archiva.repository.layout.LayoutException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
@@ -72,7 +76,7 @@
* @plexus.requirement
*/
private ArchivaConfiguration configuration;
-
+
/**
* @plexus.requirement
*/
@@ -83,15 +87,22 @@
*/
private RepositoryContentIndexFactory indexFactory;
+ /**
+ * @plexus.requirement
+ */
+ private BidirectionalRepositoryLayoutFactory layoutFactory;
+
private List propertyNameTriggers = new ArrayList();
private List includes = new ArrayList();
private RepositoryContentIndex index;
+ private ArchivaRepository repository;
+
private File repositoryDir;
-
- private String repositoryId;
+
+ private BidirectionalRepositoryLayout repositoryLayout;
public String getId()
{
@@ -126,9 +137,19 @@
throw new ConsumerException( "Consumer requires managed repository." );
}
- this.repositoryId = repository.getId();
+ this.repository = repository;
this.repositoryDir = new File( repository.getUrl().getPath() );
this.index = indexFactory.createFileContentIndex( repository );
+
+ try
+ {
+ this.repositoryLayout = layoutFactory.getLayout( this.repository.getLayoutType() );
+ }
+ catch ( LayoutException e )
+ {
+ throw new ConsumerException( "Unable to initialize consumer due to unknown repository layout: "
+ + e.getMessage(), e );
+ }
}
public void processFile( String path )
@@ -138,10 +159,21 @@
try
{
File file = new File( repositoryDir, path );
- record.setRepositoryId( this.repositoryId );
+ record.setRepositoryId( this.repository.getId() );
record.setFilename( path );
record.setContents( FileUtils.readFileToString( file, null ) );
+ // Test for possible artifact reference syntax.
+ try
+ {
+ ArchivaArtifact artifact = this.repositoryLayout.toArtifact( path );
+ record.setArtifact( artifact );
+ }
+ catch ( LayoutException e )
+ {
+ // Not an artifact.
+ }
+
index.modifyRecord( record );
}
catch ( IOException e )
@@ -176,7 +208,7 @@
{
includes.clear();
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT ));
+ includes.addAll( filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT ) );
}
public void initialize()
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentConverter.java Fri May 25 10:11:37 2007
@@ -19,10 +19,13 @@
* under the License.
*/
+import org.apache.commons.lang.StringUtils;
import org.apache.lucene.document.Document;
+import org.apache.maven.archiva.indexer.ArtifactKeys;
import org.apache.maven.archiva.indexer.lucene.LuceneDocumentMaker;
import org.apache.maven.archiva.indexer.lucene.LuceneEntryConverter;
import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord;
+import org.apache.maven.archiva.model.ArchivaArtifact;
import java.text.ParseException;
@@ -48,6 +51,19 @@
LuceneDocumentMaker doc = new LuceneDocumentMaker( filecontent );
+ if( filecontent.getArtifact() != null )
+ {
+ // Artifact Reference
+ doc.addFieldTokenized( ArtifactKeys.GROUPID, filecontent.getArtifact().getGroupId() );
+ doc.addFieldExact( ArtifactKeys.GROUPID_EXACT, filecontent.getArtifact().getGroupId() );
+ doc.addFieldTokenized( ArtifactKeys.ARTIFACTID, filecontent.getArtifact().getArtifactId() );
+ doc.addFieldExact( ArtifactKeys.ARTIFACTID_EXACT, filecontent.getArtifact().getArtifactId() );
+ doc.addFieldTokenized( ArtifactKeys.VERSION, filecontent.getArtifact().getVersion() );
+ doc.addFieldExact( ArtifactKeys.VERSION_EXACT, filecontent.getArtifact().getVersion() );
+ doc.addFieldTokenized( ArtifactKeys.TYPE, filecontent.getArtifact().getType() );
+ doc.addFieldUntokenized( ArtifactKeys.CLASSIFIER, filecontent.getArtifact().getClassifier() );
+ }
+
doc.addFieldTokenized( FileContentKeys.FILENAME, filecontent.getFilename() );
doc.addFieldTokenized( FileContentKeys.CONTENT, filecontent.getContents() );
@@ -60,6 +76,21 @@
FileContentRecord record = new FileContentRecord();
record.setRepositoryId( document.get( LuceneDocumentMaker.REPOSITORY_ID ) );
+
+ // Artifact Reference
+ String groupId = document.get( ArtifactKeys.GROUPID );
+ String artifactId = document.get( ArtifactKeys.ARTIFACTID );
+ String version = document.get( ArtifactKeys.VERSION );
+ String classifier = document.get( ArtifactKeys.CLASSIFIER );
+ String type = document.get( ArtifactKeys.TYPE );
+
+ if( StringUtils.isNotBlank( groupId ) && StringUtils.isNotBlank( artifactId ) )
+ {
+ ArchivaArtifact artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type );
+ record.setArtifact( artifact );
+ }
+
+ // Filecontent Specifics
record.setFilename( document.get( FileContentKeys.FILENAME ) );
record.setContents( document.get( FileContentKeys.CONTENT ) );
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentKeys.java Fri May 25 10:11:37 2007
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.archiva.indexer.ArtifactKeys;
+
/**
* Lucene Index Keys for the various fields in the FileContent index.
*
@@ -26,6 +28,7 @@
* @version $Id$
*/
public class FileContentKeys
+ extends ArtifactKeys
{
public static final String ID = "filecontent";
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java Fri May 25 10:11:37 2007
@@ -20,6 +20,7 @@
*/
import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord;
+import org.apache.maven.archiva.model.ArchivaArtifact;
import java.io.File;
@@ -35,6 +36,11 @@
private String repositoryId;
private String filename;
+
+ /**
+ * Optional artifact reference for the file content.
+ */
+ private ArchivaArtifact artifact;
private String contents;
@@ -112,5 +118,15 @@
public void setFilename( String filename )
{
this.filename = filename;
+ }
+
+ public ArchivaArtifact getArtifact()
+ {
+ return artifact;
+ }
+
+ public void setArtifact( ArchivaArtifact artifact )
+ {
+ this.artifact = artifact;
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/functors/UserAllowedToSearchRepositoryPredicate.java Fri May 25 10:11:37 2007
@@ -41,8 +41,6 @@
satisfies = true; // Everyone is allowed! (for now)
}
- System.out.println( "AllowedToSearchRepo: " + satisfies );
-
return satisfies;
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java Fri May 25 10:11:37 2007
@@ -45,9 +45,13 @@
// Advanced hit, reference to artifactId.
private String artifactId;
+ private String version = "";
+
// Advanced hit, if artifact, all versions of artifact
private List artifacts = new ArrayList();
+ private List versions = new ArrayList();
+
public String getContext()
{
return context;
@@ -68,6 +72,11 @@
this.url = url;
}
+ public String getUrlFilename()
+ {
+ return this.url.substring( this.url.lastIndexOf( '/' ) );
+ }
+
public String getArtifactId()
{
return artifactId;
@@ -82,6 +91,13 @@
{
this.artifacts.add( artifact );
+ String ver = artifact.getBaseVersion();
+
+ if ( !this.versions.contains( ver ) )
+ {
+ this.versions.add( ver );
+ }
+
if ( StringUtils.isBlank( this.groupId ) )
{
this.groupId = artifact.getGroupId();
@@ -91,6 +107,11 @@
{
this.artifactId = artifact.getArtifactId();
}
+
+ if ( StringUtils.isBlank( this.version ) )
+ {
+ this.version = ver;
+ }
}
public List getArtifacts()
@@ -98,11 +119,6 @@
return artifacts;
}
- public void setArtifacts( List artifacts )
- {
- this.artifacts = artifacts;
- }
-
public String getGroupId()
{
return groupId;
@@ -111,5 +127,15 @@
public void setGroupId( String groupId )
{
this.groupId = groupId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public List getVersions()
+ {
+ return versions;
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java Fri May 25 10:11:37 2007
@@ -128,6 +128,12 @@
hit.setUrl( filecontent.getRepositoryId() + "/" + filecontent.getFilename() );
hit.setContext( null ); // TODO: handle context + highlight later.
+
+ // Test for possible artifact reference ...
+ if( filecontent.getArtifact() != null )
+ {
+ hit.addArtifact( filecontent.getArtifact() );
+ }
this.hits.put( key, hit );
}
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java Fri May 25 10:11:37 2007
@@ -29,7 +29,6 @@
import org.apache.maven.archiva.indexer.MockConfiguration;
import org.apache.maven.archiva.indexer.RepositoryContentIndex;
import org.apache.maven.archiva.indexer.RepositoryContentIndexFactory;
-import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp Fri May 25 10:11:37 2007
@@ -40,7 +40,7 @@
<h1>Results</h1>
<div id="resultsBox">
- <p>Hits: ${fn:length(results.hits)}</p>
+ <p>Hits: ${fn:length(results.hits)} of ${results.totalHits}</p>
<c:choose>
<c:when test="${empty results.hits}">
@@ -48,34 +48,25 @@
</c:when>
<c:otherwise>
<c:forEach items="${results.hits}" var="record" varStatus="i">
- <p>${record.url}</p>
- <p>${record.groupId}</p>
- <p>${record.artifactId}</p>
+ <c:choose>
+ <c:when test="${not empty (record.groupId)}">
+ <h3 class="artifact-title">
+ <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
+ version="${record.version}"/>
+ </h3>
+ <p>
+ <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
+ version="${record.version}" versions="${record.versions}"/>
+ </p>
+ </c:when>
+ <c:otherwise>
+ <p>
+ <c:url var="hiturl" value="/repository/${record.url}" />
+ <a href="${hiturl}">${record.urlFilename}</a>
+ </p>
+ </c:otherwise>
+ </c:choose>
</c:forEach>
- <%--
- <c:forEach items="${results.hachcodeHits}" var="record" varStatus="i">
- <p>${record}</p>
- <h3 class="artifact-title">
- <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
- version="${record.version}"/>
- </h3>
- <p>
- <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
- version="${record.version}" versions="${record.versions}"/>
- </p>
- </c:forEach>
- <c:forEach items="${results.bytecodeHits}" var="record" varStatus="i">
- <p>${record}</p>
- <h3 class="artifact-title">
- <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
- version="${record.version}"/>
- </h3>
- <p>
- <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
- version="${record.version}" versions="${record.versions}"/>
- </p>
- </c:forEach>
- --%>
</c:otherwise>
</c:choose>
</div>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql?view=diff&rev=541723&r1=541722&r2=541723
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql Fri May 25 10:11:37 2007
@@ -10,23 +10,23 @@
DROP TABLE IF EXISTS `ARCHIVAPROJECTMODEL_REPORTS` ;
DROP TABLE IF EXISTS `ARCHIVAPROJECTMODEL_REPOSITORIES` ;
DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT` ;
-DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT_REFERENCE` ;
-DROP TABLE IF EXISTS `ARCHIVA_CIMANAGEMENT` ;
-DROP TABLE IF EXISTS `ARCHIVA_DEPENDENCY` ;
-DROP TABLE IF EXISTS `ARCHIVA_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `INDIVIDUAL_ROLES` ;
DROP TABLE IF EXISTS `ARCHIVA_INDIVIDUAL` ;
-DROP TABLE IF EXISTS `ARCHIVA_ISSUE_MANAGEMENT` ;
+DROP TABLE IF EXISTS `ARCHIVA_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `ARCHIVA_DEPENDENCY` ;
+DROP TABLE IF EXISTS `DEPENDENCY_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `SEQUENCE_TABLE` ;
DROP TABLE IF EXISTS `ARCHIVA_LICENSES` ;
+DROP TABLE IF EXISTS `ARCHIVA_PROJECT_REPOSITORIES` ;
+DROP TABLE IF EXISTS `ARCHIVA_REPOSITORY_STATS` ;
+DROP TABLE IF EXISTS `MAILINGLIST_OTHERARCHIVES` ;
DROP TABLE IF EXISTS `ARCHIVA_MAILING_LISTS` ;
-DROP TABLE IF EXISTS `ARCHIVA_ORGANIZATION` ;
+
DROP TABLE IF EXISTS `ARCHIVA_PROJECT` ;
-DROP TABLE IF EXISTS `ARCHIVA_PROJECT_REPOSITORIES` ;
+DROP TABLE IF EXISTS `ARCHIVA_CIMANAGEMENT` ;
DROP TABLE IF EXISTS `ARCHIVA_REPOSITORIES` ;
-DROP TABLE IF EXISTS `ARCHIVA_REPOSITORY_STATS` ;
DROP TABLE IF EXISTS `ARCHIVA_SCM` ;
+DROP TABLE IF EXISTS `ARCHIVA_ORGANIZATION` ;
+DROP TABLE IF EXISTS `ARCHIVA_ISSUE_MANAGEMENT` ;
+DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT_REFERENCE` ;
DROP TABLE IF EXISTS `ARCHIVA_VERSIONED_REFERENCE` ;
-DROP TABLE IF EXISTS `DEPENDENCY_EXCLUSIONS` ;
-DROP TABLE IF EXISTS `INDIVIDUAL_ROLES` ;
-DROP TABLE IF EXISTS `MAILINGLIST_OTHERARCHIVES` ;
-DROP TABLE IF EXISTS `SEQUENCE_TABLE` ;
-