From 23d65a33f6749c1ae3e6cfed35199831b1edb14b Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Wed, 16 Dec 2009 06:44:32 +0000 Subject: [PATCH] [MRM-1025] remove JPOX from the model and remove the Archiva database configuration git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891133 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-jetty/src/main/conf/jetty.xml | 31 -- .../archiva-configuration/pom.xml | 4 +- .../repository/DaysOldRepositoryPurgeTest.xml | 58 ---- .../RetentionCountRepositoryPurgeTest.xml | 58 ---- .../converter/RepositoryConverterTest.xml | 56 ---- .../archiva-base/archiva-model/pom.xml | 99 ------ .../archiva/model/AbstractArtifactKey.java | 312 ------------------ .../archiva/model/AbstractVersionedKey.java | 192 ----------- .../model/jpox/ArchivaArtifactModelKey.java | 46 --- .../jpox/ArchivaRepositoryMetadataKey.java | 46 --- .../src/main/mdo/archiva-base.xml | 139 +++----- .../conf/Catalina/localhost/archiva.xml | 6 - .../archiva-webapp/src/jetty-env.xml | 25 -- .../resources/META-INF/plexus/application.xml | 58 ---- .../src/main/resources/log4j.xml | 1 + .../webapp/WEB-INF/applicationContext.xml | 2 +- .../webdav/RepositoryServletSecurityTest.xml | 54 --- .../archiva/webdav/RepositoryServletTest.xml | 54 --- pom.xml | 21 -- 19 files changed, 43 insertions(+), 1219 deletions(-) delete mode 100644 archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.xml delete mode 100644 archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.xml delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactModelKey.java delete mode 100644 archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaRepositoryMetadataKey.java diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml index 53a600fd8..24cb509d5 100644 --- a/archiva-jetty/src/main/conf/jetty.xml +++ b/archiva-jetty/src/main/conf/jetty.xml @@ -284,37 +284,6 @@ - - - jdbc/archiva - - - org.apache.derby.jdbc.EmbeddedDataSource - jdbc:derby:/data/databases/archiva - sa - - create - true - - - - - - - jdbc/archivaShutdown - - - org.apache.derby.jdbc.EmbeddedDataSource - jdbc:derby:/data/databases/archiva - sa - - shutdown - true - - - - - diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index af8d09c00..bae414035 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -76,7 +76,7 @@ - archiva-jpox-registry-reader + archiva-registry-reader generate @@ -85,7 +85,7 @@ - archiva-jpox-registry-writer + archiva-registry-writer generate diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.xml deleted file mode 100644 index 36d669d55..000000000 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - org.apache.maven.archiva.database.jdo.JdoAccess - archiva - org.apache.maven.archiva.database.jdo.JdoAccess - - - org.codehaus.plexus.jdo.JdoFactory - archiva - - - - - - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory - - org.jpox.PersistenceManagerFactoryImpl - org.hsqldb.jdbcDriver - sa - - jdbc:hsqldb:mem:testdb - - - javax.jdo.PersistenceManagerFactoryClass - org.jpox.PersistenceManagerFactoryImpl - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.xml deleted file mode 100644 index 86639b525..000000000 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - org.apache.maven.archiva.database.jdo.JdoAccess - archiva - org.apache.maven.archiva.database.jdo.JdoAccess - - - org.codehaus.plexus.jdo.JdoFactory - archiva - - - - - - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory - - org.jpox.PersistenceManagerFactoryImpl - org.hsqldb.jdbcDriver - sa - - jdbc:hsqldb:mem:testdb - - - javax.jdo.PersistenceManagerFactoryClass - org.jpox.PersistenceManagerFactoryImpl - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml b/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml index b1cf9640a..e164fdf33 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml +++ b/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml @@ -65,61 +65,5 @@ - - - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory - - - - org.hsqldb.jdbcDriver - jdbc:hsqldb:mem:TESTDB - sa - - - - org.jpox.PersistenceManagerFactoryImpl - - - javax.jdo.PersistenceManagerFactoryClass - org.jpox.PersistenceManagerFactoryImpl - - - org.jpox.autoCreateSchema - true - - - org.jpox.validateTables - false - - - org.jpox.validateConstraints - false - - - org.jpox.validateColumns - false - - - org.jpox.autoStartMechanism - None - - - org.jpox.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.poid.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.rdbms.dateTimezone - JDK_DEFAULT_TIMEZONE - - - - diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index d6c78b7b7..e9d201a09 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -45,10 +45,6 @@ plexus-spring test - - javax.jdo - jdo2-api - org.slf4j slf4j-simple @@ -84,101 +80,6 @@ xsd - - archiva-jpox-jdo-mapping - - generate - - - jpox-jdo-mapping - - - - archiva-jpox-metadata-class - - generate - - - jpox-metadata-class - - - - - - org.codehaus.mojo - jpox-maven-plugin - 1.1.7 - - - org.apache.derby - derby - 10.2.1.6 - - - - - - enhance - - enhance - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-sources - - run - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java deleted file mode 100644 index cf6017b1a..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java +++ /dev/null @@ -1,312 +0,0 @@ -package org.apache.maven.archiva.model; - -/* - * 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 java.io.Serializable; - -import org.apache.commons.lang.StringUtils; - -/** - *

- * AbstractArtifactKey - a artifact reference to a versioned project. - * This refers to all artifacts of a specific version of a project. - * This type of reference is typically used by {@link ArchivaProjectModel} objects. - *

- * - *

- * If you don't require things like "Version" or "Type", consider the other keys below. - *

- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Key TypeGroup IDArtifact IDVersionClassifierType
{@link AbstractVersionedKey}YesYesYes  
{@link AbstractArtifactKey}YesYesYesYesYes
- * - *

- * NOTE: This is a jpox required compound key handler class. - *

- * - * @version $Id$ - */ -public class AbstractArtifactKey - implements CompoundKey, Serializable -{ - private static final long serialVersionUID = 1084250769223555422L; - - /** - * The Group ID. (JPOX Requires this remain public) - */ - public String groupId = ""; - - /** - * The Artifact ID. (JPOX Requires this remain public) - */ - public String artifactId = ""; - - /** - * The Version. (JPOX Requires this remain public) - */ - public String version = ""; - - /** - * The Classifier. (JPOX Requires this remain public) - */ - public String classifier = ""; - - /** - * The Type. (JPOX Requires this remain public) - */ - public String type = ""; - - /** - * The Repository Id (JPOX Requires this remain public) - */ - public String repositoryId = ""; - - /** - * Default Constructor. Required by JPOX. - */ - public AbstractArtifactKey() - { - /* do nothing */ - } - - /** - * Key Based Constructor. Required by JPOX. - * - * @param key the String representing this object's values. - */ - public AbstractArtifactKey( String key ) - { - String parts[] = StringUtils.splitPreserveAllTokens( key, ":" ); - groupId = parts[0]; - artifactId = parts[1]; - version = parts[2]; - classifier = parts[3]; - type = parts[4]; - repositoryId = parts[5]; - } - - /** - * Get the String representation of this object. - Required by JPOX. - */ - @Override - public String toString() - { - return StringUtils.join( new String[] { groupId, artifactId, version, classifier, type, repositoryId }, ':' ); - } - - /** - * Get the hashcode for this object's values - Required by JPOX. - */ - @Override - public int hashCode() - { - final int PRIME = 31; - int result = super.hashCode(); - result = PRIME * result + ( ( groupId == null ) ? 0 : groupId.hashCode() ); - result = PRIME * result + ( ( artifactId == null ) ? 0 : artifactId.hashCode() ); - result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() ); - result = PRIME * result + ( ( classifier == null ) ? 0 : classifier.hashCode() ); - result = PRIME * result + ( ( type == null ) ? 0 : type.hashCode() ); - result = PRIME * result + ( ( repositoryId == null ) ? 0 : repositoryId.hashCode() ); - return result; - } - - /** - * Get the equals for this object's values - Required by JPOX. - */ - @Override - public boolean equals( Object obj ) - { - if ( this == obj ) - { - return true; - } - - if ( !super.equals( obj ) ) - { - return false; - } - - if ( getClass() != obj.getClass() ) - { - return false; - } - - final AbstractArtifactKey other = (AbstractArtifactKey) obj; - - if ( groupId == null ) - { - if ( other.groupId != null ) - { - return false; - } - } - else if ( !groupId.equals( other.groupId ) ) - { - return false; - } - - if ( artifactId == null ) - { - if ( other.artifactId != null ) - { - return false; - } - } - else if ( !artifactId.equals( other.artifactId ) ) - { - return false; - } - - if ( version == null ) - { - if ( other.version != null ) - { - return false; - } - } - else if ( !version.equals( other.version ) ) - { - return false; - } - - if ( classifier == null ) - { - if ( other.classifier != null ) - { - return false; - } - } - else if ( !classifier.equals( other.classifier ) ) - { - return false; - } - - if ( type == null ) - { - if ( other.type != null ) - { - return false; - } - } - else if ( !type.equals( other.type ) ) - { - return false; - } - - if ( repositoryId == null ) - { - if ( other.repositoryId != null ) - { - return false; - } - } - else if ( !repositoryId.equals( other.repositoryId ) ) - { - return false; - } - - return true; - } - - public void setGroupId( String groupId ) - { - if ( StringUtils.isBlank( groupId ) ) - { - throw new IllegalArgumentException( "A blank Group ID is not allowed." ); - } - - this.groupId = groupId; - } - - public void setArtifactId( String artifactId ) - { - if ( StringUtils.isBlank( artifactId ) ) - { - throw new IllegalArgumentException( "A blank Artifact ID is not allowed." ); - } - - this.artifactId = artifactId; - } - - public void setVersion( String version ) - { - if ( StringUtils.isBlank( artifactId ) ) - { - throw new IllegalArgumentException( "A blank version is not allowed." ); - } - - this.version = version; - } - - public void setClassifier( String classifier ) - { - this.classifier = ""; - - if ( StringUtils.isNotBlank( classifier ) ) - { - this.classifier = classifier; - } - } - - public void setType( String type ) - { - this.type = ""; - - if ( StringUtils.isNotBlank( type ) ) - { - this.type = type; - } - } - - public void setRepositoryId( String repositoryId ) - { - this.repositoryId = ""; - - if ( StringUtils.isNotBlank(repositoryId) ) - { - this.repositoryId = repositoryId; - } - } -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java deleted file mode 100644 index 115385394..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java +++ /dev/null @@ -1,192 +0,0 @@ -package org.apache.maven.archiva.model; - -/* - * 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 java.io.Serializable; - -import org.apache.commons.lang.StringUtils; - -/** - *

- * AbstractVersionedKey - a versioned reference to a Project. - * This refers to all artifacts of a specific version of a project. - * This type of reference is typically used by {@link ArchivaProjectModel} objects. - *

- * - *

- * If you require things like "Version" or "Type", consider the other keys below. - *

- * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Key TypeGroup IDArtifact IDVersionClassifierType
{@link AbstractVersionedKey}YesYesYes  
{@link AbstractArtifactKey}YesYesYesYesYes
- * - *

- * NOTE: This is a jpox required compound key handler class. - *

- * - * @version $Id$ - */ -public class AbstractVersionedKey - implements CompoundKey, Serializable -{ - private static final long serialVersionUID = -5389698374243146150L; - - /** - * The Group ID. (JPOX Requires this remain public) - */ - public String groupId = ""; - - /** - * The Artifact ID. (JPOX Requires this remain public) - */ - public String artifactId = ""; - - /** - * The Version. (JPOX Requires this remain public) - */ - public String version = ""; - - /** - * Default Constructor. Required by JPOX. - */ - public AbstractVersionedKey() - { - /* do nothing */ - } - - /** - * Key Based Constructor. Required by JPOX. - * - * @param key the String representing this object's values. - */ - public AbstractVersionedKey( String key ) - { - String parts[] = StringUtils.splitPreserveAllTokens( key, ":" ); - groupId = parts[0]; - artifactId = parts[1]; - version = parts[2]; - } - - /** - * Get the String representation of this object. - Required by JPOX. - */ - public String toString() - { - return StringUtils.join( new String[] { groupId, artifactId, version }, ':' ); - } - - /** - * Get the hashcode for this object's values - Required by JPOX. - */ - public int hashCode() - { - final int PRIME = 31; - int result = super.hashCode(); - result = PRIME * result + ( ( groupId == null ) ? 0 : groupId.hashCode() ); - result = PRIME * result + ( ( artifactId == null ) ? 0 : artifactId.hashCode() ); - result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() ); - return result; - } - - /** - * Get the equals for this object's values - Required by JPOX. - */ - public boolean equals( Object obj ) - { - if ( this == obj ) - { - return true; - } - - if ( !super.equals( obj ) ) - { - return false; - } - - if ( getClass() != obj.getClass() ) - { - return false; - } - - final AbstractVersionedKey other = (AbstractVersionedKey) obj; - - if ( groupId == null ) - { - if ( other.groupId != null ) - { - return false; - } - } - else if ( !groupId.equals( other.groupId ) ) - { - return false; - } - - if ( artifactId == null ) - { - if ( other.artifactId != null ) - { - return false; - } - } - else if ( !artifactId.equals( other.artifactId ) ) - { - return false; - } - - if ( version == null ) - { - if ( other.version != null ) - { - return false; - } - } - else if ( !version.equals( other.version ) ) - { - return false; - } - - return true; - } -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactModelKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactModelKey.java deleted file mode 100644 index bca0db763..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactModelKey.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.apache.maven.archiva.model.jpox; - -/* - * 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 org.apache.maven.archiva.model.AbstractArtifactKey; - -import java.io.Serializable; - -/** - * ArchivaArtifactModelKey - unique classid-key for JPOX. - * - * @version $Id$ - */ -public class ArchivaArtifactModelKey - extends AbstractArtifactKey - implements Serializable -{ - private static final long serialVersionUID = -6381910527697704289L; - - public ArchivaArtifactModelKey() - { - super(); - } - - public ArchivaArtifactModelKey( String key ) - { - super( key ); - } -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaRepositoryMetadataKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaRepositoryMetadataKey.java deleted file mode 100644 index a898b2817..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaRepositoryMetadataKey.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.apache.maven.archiva.model.jpox; - -/* - * 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 org.apache.maven.archiva.model.AbstractVersionedKey; - -import java.io.Serializable; - -/** - * ArchivaRepositoryMetadataKey - unique classid-key for JPOX. - * - * @version $Id$ - */ -public class ArchivaRepositoryMetadataKey - extends AbstractVersionedKey - implements Serializable -{ - private static final long serialVersionUID = -7288079965200698253L; - - public ArchivaRepositoryMetadataKey() - { - } - - public ArchivaRepositoryMetadataKey( String key ) - { - super( key ); - } - -} diff --git a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml index 6348c67f6..fa8872111 100644 --- a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml +++ b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml @@ -1,7 +1,5 @@ - archiva-base-model ArchivaBaseModel @@ -18,9 +16,7 @@ - + ArchivaAll 1.0.0+ @@ -64,11 +60,7 @@ --> - + ArchivaArtifactModel 1.0.0+ @@ -77,10 +69,7 @@ The ArchivaArtifact object should contain no platform specifics!! --> - + groupId true 1.0.0+ @@ -90,10 +79,7 @@ The Group ID of the repository content. - + artifactId true 1.0.0+ @@ -103,10 +89,7 @@ The Artifact ID of the repository content. - + version true 1.0.0+ @@ -116,10 +99,7 @@ The version of the repository content. - + classifier true 1.0.0+ @@ -129,11 +109,7 @@ The classifier for this artifact. - + type true 1.0.0+ @@ -143,10 +119,7 @@ The type of artifact. - + repositoryId true 1.0.0+ @@ -156,7 +129,7 @@ The repository associated with this content. - + snapshot false 1.0.0+ @@ -167,7 +140,7 @@ false - + checksumMD5 false 1.0.0+ @@ -177,7 +150,7 @@ The MD5 checksum for the artifact file. - + checksumSHA1 false 1.0.0+ @@ -197,7 +170,7 @@ The Last Modified Timestamp of this artifact. - + size false 1.0.0+ @@ -237,18 +210,11 @@ --> - + ArchivaRepositoryMetadata 1.0.0+ - + groupId true 1.0.0+ @@ -258,10 +224,7 @@ The Group ID of the metadata. - + artifactId true 1.0.0+ @@ -271,10 +234,7 @@ The Artifact ID of the metadata. - + version true 1.0.0+ @@ -312,8 +272,7 @@ The snapshot version id. - + SnapshotVersion 1 @@ -326,8 +285,7 @@ The available plugins. - + Plugin * @@ -365,7 +323,7 @@ The Last Modified Timestamp of this file. - + fileSize false 1.0.0+ @@ -403,14 +361,12 @@ - + SnapshotVersion The Snapshot Version 1.0.0+ - + timestamp String false @@ -437,14 +393,12 @@ - + Plugin The Plugin 1.0.0+ - + prefix String false @@ -453,8 +407,7 @@ The prefix for a plugin - + artifactId String true @@ -463,7 +416,7 @@ The artifactId for a plugin - + name String false @@ -484,14 +437,12 @@ |_| \_\___|_| \___|_| \___|_| |_|\___\___||___/ --> - + ProjectReference A reference to another (unversioned) Project 1.0.0+ - + groupId false 1.0.0+ @@ -501,8 +452,7 @@ The Group ID of the project reference. - + artifactId false 1.0.0+ @@ -547,14 +497,12 @@ - + VersionedReference A reference to another Versioned Project 1.0.0+ - + groupId false 1.0.0+ @@ -564,8 +512,7 @@ The Group ID of the repository content. - + artifactId false 1.0.0+ @@ -575,8 +522,7 @@ The Artifact ID of the repository content. - + version false 1.0.0+ @@ -622,13 +568,11 @@ - + ArtifactReference 1.0.0+ - + groupId false 1.0.0+ @@ -638,8 +582,7 @@ The Group ID of the repository content. - + artifactId false 1.0.0+ @@ -649,8 +592,7 @@ The Artifact ID of the repository content. - + version false 1.0.0+ @@ -660,8 +602,7 @@ The version of the repository content. - + classifier false 1.0.0+ @@ -671,9 +612,7 @@ The classifier for this artifact. - + type false 1.0.0+ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml index 42dc7d3e2..af0692056 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml @@ -27,10 +27,4 @@ driverClassName="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:target/database/users;create=true" /> - - diff --git a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml index 4dbb324f8..c4557d310 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml @@ -39,31 +39,6 @@ - - - - jdbc/archiva - - - ../databases/archiva - sa - create - - - - - - - jdbc/archivaShutdown - - - ../databases/archiva - sa - shutdown - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index c7823255a..353318e04 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -58,64 +58,6 @@ - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory - - - java:comp/env/jdbc/archiva - java:comp/env/jdbc/archivaShutdown - - - org.jpox.PersistenceManagerFactoryImpl - - - org.jpox.autoCreateSchema - true - - - org.jpox.autoCreateColumns - true - - - org.jpox.validateTables - false - - - org.jpox.validateConstraints - false - - - org.jpox.validateColumns - false - - - org.jpox.autoStartMechanism - None - - - org.jpox.transactionIsolation - READ_COMMITTED - - - org.jpox.poid.transactionIsolation - READ_COMMITTED - - - org.jpox.rdbms.dateTimezone - JDK_DEFAULT_TIMEZONE - - - - - - org.codehaus.plexus.jdo.JdoFactory users diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml index a89a9cafb..98533a885 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml @@ -108,6 +108,7 @@ + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 92f2a279d..3973bb8ac 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -52,7 +52,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml index 520a10d36..038cb9186 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml @@ -155,59 +155,5 @@ - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory - - - - org.hsqldb.jdbcDriver - jdbc:hsqldb:mem:TESTDB - sa - - - - org.jpox.PersistenceManagerFactoryImpl - - - javax.jdo.PersistenceManagerFactoryClass - org.jpox.PersistenceManagerFactoryImpl - - - org.jpox.autoCreateSchema - true - - - org.jpox.validateTables - false - - - org.jpox.validateConstraints - false - - - org.jpox.validateColumns - false - - - org.jpox.autoStartMechanism - None - - - org.jpox.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.poid.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.rdbms.dateTimezone - JDK_DEFAULT_TIMEZONE - - - - diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml index 78bdb75ab..2218753fc 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml @@ -167,59 +167,5 @@ - - org.codehaus.plexus.jdo.JdoFactory - archiva - org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory - - - - org.hsqldb.jdbcDriver - jdbc:hsqldb:mem:TESTDB - sa - - - - org.jpox.PersistenceManagerFactoryImpl - - - javax.jdo.PersistenceManagerFactoryClass - org.jpox.PersistenceManagerFactoryImpl - - - org.jpox.autoCreateSchema - true - - - org.jpox.validateTables - false - - - org.jpox.validateConstraints - false - - - org.jpox.validateColumns - false - - - org.jpox.autoStartMechanism - None - - - org.jpox.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.poid.transactionIsolation - READ_UNCOMMITTED - - - org.jpox.rdbms.dateTimezone - JDK_DEFAULT_TIMEZONE - - - - diff --git a/pom.xml b/pom.xml index e56177ada..1946c7382 100644 --- a/pom.xml +++ b/pom.xml @@ -123,11 +123,6 @@ modello-plugin-plexus-registry 1.0-alpha-21 - - org.codehaus.modello - modello-plugin-jpox - 1.0-alpha-21 - @@ -540,11 +535,6 @@ - - javax.jdo - jdo2-api - 2.0 - jpox jpox @@ -634,17 +624,6 @@ - - org.codehaus.plexus - plexus-jdo2 - 1.0-alpha-8 - - - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus plexus-quartz -- 2.39.5