You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jm...@apache.org on 2007/02/26 23:10:42 UTC
svn commit: r512034 - in /maven/archiva/trunk/archiva-database/src/main:
java/org/apache/maven/archiva/database/ resources/
resources/org/apache/maven/archiva/database/
Author: jmcconnell
Date: Mon Feb 26 14:10:41 2007
New Revision: 512034
URL: http://svn.apache.org/viewvc?view=rev&rev=512034
Log:
added definitions for other tables and fixed up naming conventions
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java
maven/archiva/trunk/archiva-database/src/main/resources/ibatis-config.xml
maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/CreateTables.xml
maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/MetadataKey.xml
Modified: maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java?view=diff&rev=512034&r1=512033&r2=512034
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java (original)
+++ maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/IbatisMetadataStore.java Mon Feb 26 14:10:41 2007
@@ -63,11 +63,17 @@
// Create the tables
getLogger().info( "Creating metadata keys instance table" );
- sqlMap.update( "createMetadataKeyTable", null );
+ sqlMap.update( "initializeMetadataKeyTable", null );
getLogger().info( "Creating repository metadata instance table" );
- sqlMap.update( "createRepositoryMetadataTable", null );
+ sqlMap.update( "initializeRepositoryMetadataTable", null );
+ getLogger().info( "Creating repository health metadata instance table" );
+ sqlMap.update( "initializeHealthMetadataTable", null );
+
+ getLogger().info( "Creating repository versions metadata instance table" );
+ sqlMap.update( "initializeVersionsMetadataTable", null );
+
sqlMap.commitTransaction();
}
catch ( SQLException e )
Modified: maven/archiva/trunk/archiva-database/src/main/resources/ibatis-config.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/resources/ibatis-config.xml?view=diff&rev=512034&r1=512033&r2=512034
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/resources/ibatis-config.xml (original)
+++ maven/archiva/trunk/archiva-database/src/main/resources/ibatis-config.xml Mon Feb 26 14:10:41 2007
@@ -23,6 +23,6 @@
</dataSource>
</transactionManager>
- <sqlMap resource="org/apache/maven/archiva/database/CreateDatabases.xml"/>
+ <sqlMap resource="org/apache/maven/archiva/database/CreateTables.xml"/>
<sqlMap resource="org/apache/maven/archiva/database/MetadataKey.xml"/>
</sqlMapConfig>
Modified: maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/CreateTables.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/CreateTables.xml?view=diff&rev=512034&r1=512033&r2=512034
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/CreateTables.xml (original)
+++ maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/CreateTables.xml Mon Feb 26 14:10:41 2007
@@ -8,7 +8,7 @@
<!--
METADATA_KEYS is the index table for all other tables
-->
-<statement id="initalizeMetadataKeyTable">
+<statement id="initializeMetadataKeyTable">
CREATE TABLE MetadataKeys (
metadataKey integer generated always as identity ( start with 1 ) primary key,
groupId varchar(100) not null,
@@ -17,17 +17,37 @@
)
</statement>
-<statement id="createRepositoryMetadataTable">
- CREATE TABLE StepInstance (
- repositoryId integer,
- repositoryName varchar(100) not null,
- latest varchar(100) not null,
- release varchar(100) not null,
- lastUpdated long not null,
- snapshotTimestamp long not null,
- snapshotBuildNumber long not null,
- snapshotLocalCopy boolean,
- primary key( repositoryId ),
+<statement id="initializeRepositoryMetadataTable">
+ CREATE TABLE RepositoryMetadata (
+ metadataKey integer not null,
+ id integer generated always as identity ( start with 1 ) primary key,
+ repositoryId varchar(100) not null,
+ latest varchar(100) not null,
+ release varchar(100) not null,
+ lastUpdated integer not null,
+ snapshotTimestamp integer not null,
+ snapshotBuildNumber integer not null,
+ snapshotLocalCopy char(1) not null,
+ foreign key( metadataKey ) references MetadataKeys( metadataKey )
+ )
+</statement>
+
+<statement id="initializeHealthMetadataTable">
+ CREATE TABLE HealthMetadata (
+ metadataKey integer not null,
+ id integer generated always as identity ( start with 1 ) primary key,
+ processId varchar(100) not null,
+ problemId varchar(100) not null,
+ message varchar(8000) not null,
+ foreign key( metadataKey ) references MetadataKeys( metadataKey )
+ )
+</statement>
+
+<statement id="initializeVersionsMetadataTable">
+ CREATE TABLE VersionMetadata (
+ metadataKey integer not null,
+ id integer generated always as identity ( start with 1 ) primary key,
+ version varchar(100) not null,
foreign key( metadataKey ) references MetadataKeys( metadataKey )
)
</statement>
Modified: maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/MetadataKey.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/MetadataKey.xml?view=diff&rev=512034&r1=512033&r2=512034
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/MetadataKey.xml (original)
+++ maven/archiva/trunk/archiva-database/src/main/resources/org/apache/maven/archiva/database/MetadataKey.xml Mon Feb 26 14:10:41 2007
@@ -7,17 +7,17 @@
<select id="getMetadataKey" resultClass="org.apache.maven.archiva.database.key.MetadataKey">
SELECT
- METADATA_KEY as id
- GROUP_ID as groupId,
- ARTIFACT_ID as artifactId,
- VERSION as version,
- FROM METADATA_KEYS
- WHERE METADATA_KEY = #value#
+ metadataKey as id
+ groupId as groupId,
+ artifactId as artifactId,
+ version as version,
+ FROM MetadataKeys
+ WHERE metadataKey = #value#
</select>
<insert id="addMetadataKey" parameterClass="org.apache.maven.archiva.database.key.MetadataKey">
INSERT INTO
- METADATA_KEYS ( GROUP_ID, ARTIFACT_ID, VERSION_ID )
+ MetadataKeys ( groupId, artifactId, version )
VALUES (#groupId#, #artifactId#, #version# )
</insert>