You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/16 07:44:33 UTC
svn commit: r891133 - in /archiva/branches/MRM-1025: ./
archiva-jetty/src/main/conf/
archiva-modules/archiva-base/archiva-configuration/
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/c...
Author: brett
Date: Wed Dec 16 06:44:32 2009
New Revision: 891133
URL: http://svn.apache.org/viewvc?rev=891133&view=rev
Log:
[MRM-1025] remove JPOX from the model and remove the Archiva database configuration
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaArtifactModelKey.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaRepositoryMetadataKey.java
Modified:
archiva/branches/MRM-1025/archiva-jetty/src/main/conf/jetty.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
archiva/branches/MRM-1025/pom.xml
Modified: archiva/branches/MRM-1025/archiva-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-jetty/src/main/conf/jetty.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/branches/MRM-1025/archiva-jetty/src/main/conf/jetty.xml Wed Dec 16 06:44:32 2009
@@ -284,37 +284,6 @@
</Arg>
</New>
- <!-- Archiva database -->
- <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/archiva</Arg>
- <Arg>
- <New class="org.apache.commons.dbcp.BasicDataSource">
- <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set>
- <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set>
- <Set name="username">sa</Set>
- <Call name="addConnectionProperty">
- <Arg>create</Arg>
- <Arg>true</Arg>
- </Call>
- </New>
- </Arg>
- </New>
-
- <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/archivaShutdown</Arg>
- <Arg>
- <New class="org.apache.commons.dbcp.BasicDataSource">
- <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set>
- <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set>
- <Set name="username">sa</Set>
- <Call name="addConnectionProperty">
- <Arg>shutdown</Arg>
- <Arg>true</Arg>
- </Call>
- </New>
- </Arg>
- </New>
-
<!-- Users / Security Database -->
<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml Wed Dec 16 06:44:32 2009
@@ -76,7 +76,7 @@
</goals>
</execution>
<execution>
- <id>archiva-jpox-registry-reader</id>
+ <id>archiva-registry-reader</id>
<goals>
<goal>generate</goal>
</goals>
@@ -85,7 +85,7 @@
</configuration>
</execution>
<execution>
- <id>archiva-jpox-registry-writer</id>
+ <id>archiva-registry-writer</id>
<goals>
<goal>generate</goal>
</goals>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml Wed Dec 16 06:44:32 2009
@@ -65,61 +65,5 @@
</requirement>
</requirements>
</component>
-
-
- <component>
- <role>org.codehaus.plexus.jdo.JdoFactory</role>
- <role-hint>archiva</role-hint>
- <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
-
- <configuration>
- <!-- Database Configuration -->
- <driverName>org.hsqldb.jdbcDriver</driverName>
- <url>jdbc:hsqldb:mem:TESTDB</url>
- <userName>sa</userName>
- <password></password>
-
- <!-- JPOX and JDO configuration -->
- <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
- <otherProperties>
- <property>
- <name>javax.jdo.PersistenceManagerFactoryClass</name>
- <value>org.jpox.PersistenceManagerFactoryImpl</value>
- </property>
- <property>
- <name>org.jpox.autoCreateSchema</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jpox.validateTables</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateConstraints</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateColumns</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.autoStartMechanism</name>
- <value>None</value>
- </property>
- <property>
- <name>org.jpox.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.rdbms.dateTimezone</name>
- <value>JDK_DEFAULT_TIMEZONE</value>
- </property>
- </otherProperties>
- </configuration>
- </component>
</components>
</component-set>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml Wed Dec 16 06:44:32 2009
@@ -46,10 +46,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
@@ -84,101 +80,6 @@
<goal>xsd</goal>
</goals>
</execution>
- <execution>
- <id>archiva-jpox-jdo-mapping</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generatorId>jpox-jdo-mapping</generatorId>
- </configuration>
- </execution>
- <execution>
- <id>archiva-jpox-metadata-class</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <generatorId>jpox-metadata-class</generatorId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jpox-maven-plugin</artifactId>
- <version>1.1.7</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.1.6</version>
- </dependency>
- </dependencies>
- <executions>
- <!-- TODO: put this into a profile
- <execution>
- <id>create-ddl</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>schema-create</goal>
- </goals>
- <configuration>
- <outputFile>${basedir}/target/classes/org/apache/maven/archiva/model/schema.ddl</outputFile>
- <toolProperties>
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:derby:target/jdo-schema-create;create=true</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>sa</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>${basedir}/src/test/resources/log4j.xml</value>
- </property>
- <property>
- <name>org.jpox.autoCreateTables</name>
- <value>true</value>
- </property>
- </toolProperties>
- </configuration>
- </execution>
- -->
- <execution>
- <id>enhance</id>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- stupid hack because jpox/modello is not supported anymore and it has bugs
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${project.build.directory}/generated-sources/modello/org/apache/maven/archiva/model/package.jdo" todir="${project.build.outputDirectory}/org/apache/maven/archiva/model/" />
- </tasks>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Wed Dec 16 06:44:32 2009
@@ -1,7 +1,5 @@
<?xml version="1.0" ?>
-<model jpox.mapping-in-package="true"
- jpox.table-prefix="ARCHIVA_"
- xsd.namespace="http://archiva.apache.org/model/1.2.0"
+<model xsd.namespace="http://archiva.apache.org/model/1.2.0"
xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
<id>archiva-base-model</id>
<name>ArchivaBaseModel</name>
@@ -18,9 +16,7 @@
</defaults>
<classes>
- <class stash.storable="false"
- rootElement="true"
- jpox.enabled="false">
+ <class rootElement="true">
<name>ArchivaAll</name>
<version>1.0.0+</version>
<description>
@@ -64,11 +60,7 @@
-->
- <class stash.storable="true"
- jpox.table="ARTIFACT"
- jpox.use-identifiers-as-primary-key="false"
- jpox.identity-type="application"
- jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaArtifactModelKey">
+ <class>
<name>ArchivaArtifactModel</name>
<version>1.0.0+</version>
<fields>
@@ -77,10 +69,7 @@
The ArchivaArtifact object should contain no platform specifics!!
-->
- <field stash.maxSize="250"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>groupId</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -90,10 +79,7 @@
The Group ID of the repository content.
</description>
</field>
- <field stash.maxSize="80"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>artifactId</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -103,10 +89,7 @@
The Artifact ID of the repository content.
</description>
</field>
- <field stash.maxSize="50"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>version</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -116,10 +99,7 @@
The version of the repository content.
</description>
</field>
- <field stash.maxSize="50"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>classifier</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -129,11 +109,7 @@
The classifier for this artifact.
</description>
</field>
- <field stash.maxSize="50"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent"
- jpox.column="FILE_TYPE">
+ <field>
<name>type</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -143,10 +119,7 @@
The type of artifact.
</description>
</field>
- <field stash.maxSize="50"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>repositoryId</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -156,7 +129,7 @@
The repository associated with this content.
</description>
</field>
- <field jpox.column="SNAPSHOT_VERSION">
+ <field>
<name>snapshot</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -167,7 +140,7 @@
</description>
<defaultValue>false</defaultValue>
</field>
- <field stash.maxSize="35">
+ <field>
<name>checksumMD5</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -177,7 +150,7 @@
The MD5 checksum for the artifact file.
</description>
</field>
- <field stash.maxSize="45">
+ <field>
<name>checksumSHA1</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -197,7 +170,7 @@
The Last Modified Timestamp of this artifact.
</description>
</field>
- <field jpox.column="FILE_SIZE">
+ <field>
<name>size</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -237,18 +210,11 @@
-->
- <class stash.storable="true"
- jpox.use-identifiers-as-primary-key="false"
- jpox.identity-type="application"
- jpox.identity-class="org.apache.maven.archiva.model.jpox.ArchivaRepositoryMetadataKey"
- jpox.table="REPOSITORY_METADATA">
+ <class>
<name>ArchivaRepositoryMetadata</name>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="250"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>groupId</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -258,10 +224,7 @@
The Group ID of the metadata.
</description>
</field>
- <field stash.maxSize="80"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>artifactId</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -271,10 +234,7 @@
The Artifact ID of the metadata.
</description>
</field>
- <field stash.maxSize="50"
- jpox.primary-key="true"
- jpox.value-strategy="off"
- jpox.persistence-modifier="persistent">
+ <field>
<name>version</name>
<identifier>true</identifier>
<version>1.0.0+</version>
@@ -312,8 +272,7 @@
<description>
The snapshot version id.
</description>
- <association stash.part="true"
- jpox.join="false">
+ <association>
<type>SnapshotVersion</type>
<multiplicity>1</multiplicity>
</association>
@@ -326,8 +285,7 @@
<description>
The available plugins.
</description>
- <association stash.part="true"
- jpox.join="false">
+ <association>
<type>Plugin</type>
<multiplicity>*</multiplicity>
</association>
@@ -365,7 +323,7 @@
The Last Modified Timestamp of this file.
</description>
</field>
- <field jpox.column="FILE_SIZE">
+ <field>
<name>fileSize</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -403,14 +361,12 @@
</codeSegments>
</class>
- <class stash.storable="true"
- jpox.table="REPOSITORY_METADATA_SNAPSHOTS">
+ <class>
<name>SnapshotVersion</name>
<description>The Snapshot Version</description>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="20"
- jpox.column="VERSION_TIMESTAMP">
+ <field>
<name>timestamp</name>
<type>String</type>
<identifier>false</identifier>
@@ -437,14 +393,12 @@
</codeSegments>
</class>
- <class stash.storable="true"
- jpox.table="REPOSITORY_METADATA_PLUGINS">
+ <class>
<name>Plugin</name>
<description>The Plugin</description>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="20"
- jpox.column="PLUGIN_PREFIX">
+ <field>
<name>prefix</name>
<type>String</type>
<identifier>false</identifier>
@@ -453,8 +407,7 @@
The prefix for a plugin
</description>
</field>
- <field
- jpox.column="PLUGIN_ARTIFACT_ID">
+ <field>
<name>artifactId</name>
<type>String</type>
<identifier>true</identifier>
@@ -463,7 +416,7 @@
The artifactId for a plugin
</description>
</field>
- <field jpox.column="PLUGIN_NAME">
+ <field>
<name>name</name>
<type>String</type>
<identifier>false</identifier>
@@ -484,14 +437,12 @@
|_| \_\___|_| \___|_| \___|_| |_|\___\___||___/
-->
- <class stash.storable="true"
- jpox.table="PROJECT_REFERENCE">
+ <class>
<name>ProjectReference</name>
<description>A reference to another (unversioned) Project</description>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="250"
- null-value="default">
+ <field null-value="default">
<name>groupId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -501,8 +452,7 @@
The Group ID of the project reference.
</description>
</field>
- <field stash.maxSize="80"
- null-value="default">
+ <field null-value="default">
<name>artifactId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -547,14 +497,12 @@
</codeSegments>
</class>
- <class stash.storable="true"
- jpox.table="VERSIONED_REFERENCE">
+ <class>
<name>VersionedReference</name>
<description>A reference to another Versioned Project</description>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="250"
- null-value="default">
+ <field null-value="default">
<name>groupId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -564,8 +512,7 @@
The Group ID of the repository content.
</description>
</field>
- <field stash.maxSize="80"
- null-value="default">
+ <field null-value="default">
<name>artifactId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -575,8 +522,7 @@
The Artifact ID of the repository content.
</description>
</field>
- <field stash.maxSize="50"
- null-value="default">
+ <field null-value="default">
<name>version</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -622,13 +568,11 @@
</codeSegments>
</class>
- <class stash.storable="true"
- jpox.table="ARTIFACT_REFERENCE">
+ <class>
<name>ArtifactReference</name>
<version>1.0.0+</version>
<fields>
- <field stash.maxSize="250"
- null-value="default">
+ <field null-value="default">
<name>groupId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -638,8 +582,7 @@
The Group ID of the repository content.
</description>
</field>
- <field stash.maxSize="80"
- null-value="default">
+ <field null-value="default">
<name>artifactId</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -649,8 +592,7 @@
The Artifact ID of the repository content.
</description>
</field>
- <field stash.maxSize="50"
- null-value="default">
+ <field null-value="default">
<name>version</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -660,8 +602,7 @@
The version of the repository content.
</description>
</field>
- <field stash.maxSize="50"
- null-value="default">
+ <field null-value="default">
<name>classifier</name>
<identifier>false</identifier>
<version>1.0.0+</version>
@@ -671,9 +612,7 @@
The classifier for this artifact.
</description>
</field>
- <field stash.maxSize="50"
- null-value="default"
- jpox.column="FILE_TYPE">
+ <field null-value="default">
<name>type</name>
<identifier>false</identifier>
<version>1.0.0+</version>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml Wed Dec 16 06:44:32 2009
@@ -27,10 +27,4 @@
driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
url="jdbc:derby:target/database/users;create=true"
/>
-
- <Resource name="jdbc/archiva" auth="Container" type="javax.sql.DataSource"
- username="sa"
- password=""
- driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:target/database/archiva;create=true" />
</Context>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml Wed Dec 16 06:44:32 2009
@@ -39,31 +39,6 @@
</Arg>
</New>
- <!-- Archiva database -->
- <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg><Ref id="wac"/></Arg>
- <Arg>jdbc/archiva</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName">../databases/archiva</Set>
- <Set name="user">sa</Set>
- <Set name="createDatabase">create</Set>
- </New>
- </Arg>
- </New>
-
- <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg><Ref id="wac"/></Arg>
- <Arg>jdbc/archivaShutdown</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName">../databases/archiva</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
- </Arg>
- </New>
-
<!-- Users / Security Database -->
<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="wac"/></Arg>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Wed Dec 16 06:44:32 2009
@@ -60,64 +60,6 @@
<component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>
- <role-hint>archiva</role-hint>
- <implementation>org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory</implementation>
- <configuration>
-
- <connectionFactoryName>java:comp/env/jdbc/archiva</connectionFactoryName>
- <shutdownConnectionFactoryName>java:comp/env/jdbc/archivaShutdown</shutdownConnectionFactoryName>
-
- <!-- JPOX and JDO configuration -->
- <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
- <otherProperties>
- <property>
- <name>org.jpox.autoCreateSchema</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jpox.autoCreateColumns</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jpox.validateTables</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateConstraints</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateColumns</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.autoStartMechanism</name>
- <value>None</value>
- </property>
- <property>
- <name>org.jpox.transactionIsolation</name>
- <value>READ_COMMITTED</value>
- </property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_COMMITTED</value>
- </property>
- <property>
- <name>org.jpox.rdbms.dateTimezone</name>
- <value>JDK_DEFAULT_TIMEZONE</value>
- </property>
- <!-- NEEDED FOR POSTGRES, But causes problems in other JDBC implementations.
- <property>
- <name>org.jpox.identifier.case</name>
- <value>PreserveCase</value>
- </property>
- -->
- </otherProperties>
- </configuration>
- </component>
-
- <component>
- <role>org.codehaus.plexus.jdo.JdoFactory</role>
<role-hint>users</role-hint>
<implementation>org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory</implementation>
<configuration>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml Wed Dec 16 06:44:32 2009
@@ -108,6 +108,7 @@
<level value="error"/>
</logger>
+ <!-- retained for Redback -->
<logger name="JPOX">
<level value="warn"/>
</logger>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Wed Dec 16 06:44:32 2009
@@ -52,7 +52,7 @@
<constructor-arg ref="archivaConfiguration"/>
<constructor-arg ref="repositoryContentConsumers"/>
<constructor-arg ref="repositoryContentFactory"/>
- <constructor-arg ref="artifactDAO#jdo"/>
+ <constructor-arg ref="metadataRepository"/>
<constructor-arg ref="archivaTaskScheduler#repository"/>
<constructor-arg>
<bean class="org.apache.maven.archiva.repository.events.RepositoryListenerFactoryBean" />
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml Wed Dec 16 06:44:32 2009
@@ -155,59 +155,5 @@
</requirement>
</requirements>
</component>
- <component>
- <role>org.codehaus.plexus.jdo.JdoFactory</role>
- <role-hint>archiva</role-hint>
- <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
-
- <configuration>
- <!-- Database Configuration -->
- <driverName>org.hsqldb.jdbcDriver</driverName>
- <url>jdbc:hsqldb:mem:TESTDB</url>
- <userName>sa</userName>
- <password></password>
-
- <!-- JPOX and JDO configuration -->
- <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
- <otherProperties>
- <property>
- <name>javax.jdo.PersistenceManagerFactoryClass</name>
- <value>org.jpox.PersistenceManagerFactoryImpl</value>
- </property>
- <property>
- <name>org.jpox.autoCreateSchema</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jpox.validateTables</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateConstraints</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateColumns</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.autoStartMechanism</name>
- <value>None</value>
- </property>
- <property>
- <name>org.jpox.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.rdbms.dateTimezone</name>
- <value>JDK_DEFAULT_TIMEZONE</value>
- </property>
- </otherProperties>
- </configuration>
- </component>
</components>
</plexus>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml Wed Dec 16 06:44:32 2009
@@ -167,59 +167,5 @@
</requirement>
</requirements>
</component>
- <component>
- <role>org.codehaus.plexus.jdo.JdoFactory</role>
- <role-hint>archiva</role-hint>
- <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
-
- <configuration>
- <!-- Database Configuration -->
- <driverName>org.hsqldb.jdbcDriver</driverName>
- <url>jdbc:hsqldb:mem:TESTDB</url>
- <userName>sa</userName>
- <password></password>
-
- <!-- JPOX and JDO configuration -->
- <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
- <otherProperties>
- <property>
- <name>javax.jdo.PersistenceManagerFactoryClass</name>
- <value>org.jpox.PersistenceManagerFactoryImpl</value>
- </property>
- <property>
- <name>org.jpox.autoCreateSchema</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jpox.validateTables</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateConstraints</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.validateColumns</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jpox.autoStartMechanism</name>
- <value>None</value>
- </property>
- <property>
- <name>org.jpox.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- <property>
- <name>org.jpox.rdbms.dateTimezone</name>
- <value>JDK_DEFAULT_TIMEZONE</value>
- </property>
- </otherProperties>
- </configuration>
- </component>
</components>
</plexus>
Modified: archiva/branches/MRM-1025/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=891133&r1=891132&r2=891133&view=diff
==============================================================================
--- archiva/branches/MRM-1025/pom.xml (original)
+++ archiva/branches/MRM-1025/pom.xml Wed Dec 16 06:44:32 2009
@@ -123,11 +123,6 @@
<artifactId>modello-plugin-plexus-registry</artifactId>
<version>1.0-alpha-21</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-plugin-jpox</artifactId>
- <version>1.0-alpha-21</version>
- </dependency>
</dependencies>
</plugin>
<plugin>
@@ -541,11 +536,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
<version>1.1.9</version>
@@ -636,17 +626,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-jdo2</artifactId>
- <version>1.0-alpha-8</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId>
<version>1.0-alpha-3</version>
<exclusions>