Author: jmcconnell
Date: Tue Feb 27 09:49:48 2007
New Revision: 512340
URL: http://svn.apache.org/viewvc?view=rev&rev=512340
Log:
remove the original IbatisMemoryStore and
its interface, switch impl over to joakims
Repository Metadata database set and start
getting an abstract helper class that helps
manage the MetadataKey
Added:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java
(with props)
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDatabaseException.java
- copied, changed from r512002,
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStoreException.java
Removed:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStore.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStoreException.java
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryMetadataDatabase.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/key/MetadataKey.java
Added:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java?view=auto&rev=512340
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java
(added)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java
Tue Feb 27 09:49:48 2007
@@ -0,0 +1,236 @@
+package org.apache.maven.archiva.database;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.ibatis.sqlmap.client.SqlMapClient;
+
+import org.apache.maven.archiva.database.key.MetadataKey;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.codehaus.plexus.ibatis.PlexusIbatisHelper;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+
+/**
+ *
+ * IbatisMetadataStore
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jesse McConnell</a>
+ * @version $Id$
+ *
+ */
+public class AbstractMetadataKeyDatabase
+ extends AbstractLogEnabled
+ implements Initializable
+{
+ /**
+ * @plexus.requirement
+ */
+ protected PlexusIbatisHelper ibatisHelper;
+
+ /**
+ * @plexus.configuration default-value="create"
+ */
+ private String createPrefix;
+
+ /**
+ * @plexus.configuration default-value="drop"
+ */
+ private String dropPrefix;
+
+ public MetadataKey getMetadataKey( Metadata metadata )
+ throws ArchivaDatabaseException
+ {
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Getting metadata key" );
+ MetadataKey newMetadataKey = (MetadataKey) sqlMap.queryForObject(
"getMetadataKey", metadata );
+
+ if ( newMetadataKey == null )
+ {
+ getLogger().info( "added new metadata" );
+ sqlMap.update( "addMetadataKey", metadata );
+
+ newMetadataKey = (MetadataKey) sqlMap.queryForObject(
"getMetadataKey", metadata );
+
+ if ( newMetadataKey == null )
+ {
+ throw new ArchivaDatabaseException( "unable to create new
MetadataKeys" );
+ }
+ }
+
+ return newMetadataKey;
+
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while adding metadata, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException ( "Error while interacting with
the database.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+ protected void initializeTable( String tableName )
+ throws ArchivaDatabaseException
+ {
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ Connection con = sqlMap.getCurrentConnection();
+
+ DatabaseMetaData databaseMetaData = con.getMetaData();
+
+ ResultSet rs = databaseMetaData.getTables( con.getCatalog(), null,
null, null );
+
+ // check if the index database exists in the database
+ while ( rs.next() )
+ {
+ String dbTableName = rs.getString( "TABLE_NAME" );
+
+ // if it does then we are already initialized
+ if ( dbTableName.toLowerCase().equals( tableName.toLowerCase()
) )
+ {
+ return;
+ }
+ }
+
+ // Create the tables
+
+ getLogger().info( "Creating table: " + tableName );
+ sqlMap.update( createPrefix + tableName, null );
+
+ sqlMap.commitTransaction();
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while initializing database, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while setting up
database.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ protected void dropTable( String tableName )
+ throws ArchivaDatabaseException
+{
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Dropping table: " + tableName );
+ sqlMap.update( dropPrefix + tableName, null );
+
+ sqlMap.commitTransaction();
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while dropping database, showing all linked
exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while dropping database.",
e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
+}
+
+ public void initialize()
+ throws InitializationException
+ {
+ try
+ {
+ initializeTable( "MetadataKeys" );
+ }
+ catch ( ArchivaDatabaseException ade )
+ {
+ throw new InitializationException( "unable to initialize metadata
keys database" );
+ }
+ }
+
+
+
+
+}
Propchange:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/AbstractMetadataKeyDatabase.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDatabaseException.java
(from r512002,
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStoreException.java)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDatabaseException.java?view=diff&rev=512340&p1=maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStoreException.java&r1=512002&p2=maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDatabaseException.java&r2=512340
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/MetadataStoreException.java
(original)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDatabaseException.java
Tue Feb 27 09:49:48 2007
@@ -1,15 +1,15 @@
package org.apache.maven.archiva.database;
-public class MetadataStoreException
+public class ArchivaDatabaseException
extends Exception
{
- public MetadataStoreException( String message, Throwable cause )
+ public ArchivaDatabaseException( String message, Throwable cause )
{
super( message, cause );
}
- public MetadataStoreException( String message )
+ public ArchivaDatabaseException( String message )
{
super( message );
}
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryMetadataDatabase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryMetadataDatabase.java?view=diff&rev=512340&r1=512339&r2=512340
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryMetadataDatabase.java
(original)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryMetadataDatabase.java
Tue Feb 27 09:49:48 2007
@@ -19,39 +19,214 @@
* under the License.
*/
+import com.ibatis.sqlmap.client.SqlMapClient;
+
+import org.apache.maven.archiva.database.key.MetadataKey;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+
+import java.sql.SQLException;
/**
* RepositoryMetadataDatabase
*
* @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>
* @version $Id$
+ *
+ * @plexus.component
role="org.apache.maven.archiva.database.RepositoryMetadataDatabase"
role-hint="default"
*/
-public class RepositoryMetadataDatabase
+public class RepositoryMetadataDatabase extends AbstractMetadataKeyDatabase
{
-
public void create( RepositoryMetadata metadata )
+ throws ArchivaDatabaseException
{
-
+
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Adding repository metadata" );
+ sqlMap.update( "addRepositoryMetadata", metadata );
+
+ sqlMap.commitTransaction();
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while executing statement, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while executing
statement.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
}
+
public RepositoryMetadata read( String groupId, String artifactId, String
version )
+ throws ArchivaDatabaseException
{
- return null;
+
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Reading repository metadata" );
+ RepositoryMetadata repositoryMetadata = (RepositoryMetadata)
sqlMap.queryForObject( "getRepositoryMetadata", new MetadataKey( groupId,
artifactId, version ) );
+
+ return repositoryMetadata;
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while executing statement, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while executing
statement.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
}
+ /**
+ * not implemented yet
+ *
+ * @param metadata
+ * @throws ArchivaDatabaseException
+ */
public void update( RepositoryMetadata metadata )
+ throws ArchivaDatabaseException
{
+
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Updating repository metadata" );
+ sqlMap.update( "updateRepositoryMetadata", metadata );
+
+ sqlMap.commitTransaction();
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while executing statement, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while executing
statement.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
}
public void delete( RepositoryMetadata metadata )
+ throws ArchivaDatabaseException
{
-
+ // FIXME is this right? baseVersion seems wrong but I don't know
enough about the metadata to say
+ delete( metadata.getGroupId(), metadata.getArtifactId(),
metadata.getBaseVersion() );
}
public void delete( String groupId, String artifactId, String version )
+ throws ArchivaDatabaseException
{
+ SqlMapClient sqlMap = ibatisHelper.getSqlMapClient();
+
+ try
+ {
+ sqlMap.startTransaction();
+
+ getLogger().info( "Removing repository metadata" );
+ sqlMap.update( "removeRepositoryMetadata", new MetadataKey(
groupId, artifactId, version ) );
+
+ sqlMap.commitTransaction();
+ }
+ catch ( SQLException e )
+ {
+ getLogger().error( "Error while executing statement, showing all
linked exceptions in SQLException." );
+
+ while ( e != null )
+ {
+ getLogger().error( e.getMessage(), e );
+
+ e = e.getNextException();
+ }
+
+ throw new ArchivaDatabaseException( "Error while executing
statement.", e );
+ }
+ finally
+ {
+ try
+ {
+ sqlMap.endTransaction();
+ }
+ catch ( SQLException e )
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ public void initialize()
+ throws InitializationException
+ {
+ super.initialize();
+ try
+ {
+ initializeTable( "RepositoryMetadata" );
+ }
+ catch ( ArchivaDatabaseException ade )
+ {
+ throw new InitializationException( "unable to initialize
repository metadata table", ade );
+ }
}
+
+
}
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/key/MetadataKey.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/key/MetadataKey.java?view=diff&rev=512340&r1=512339&r2=512340
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/key/MetadataKey.java
(original)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/key/MetadataKey.java
Tue Feb 27 09:49:48 2007
@@ -6,7 +6,16 @@
private String artifactId;
private String version;
private int metadataKey;
-
+
+ public MetadataKey( String groupId, String artifactId, String version )
+ {
+ this.groupId = groupId;
+ this.artifactId = artifactId;
+ this.version = version;
+ }
+
+ public MetadataKey() {}
+
public String getArtifactId() {
return artifactId;
}
