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 2006/09/22 10:01:32 UTC
svn commit: r448856 - in /maven/archiva/trunk:
archiva-plexus-runtime/pom.xml archiva-plexus-runtime/src/conf/plexus.xml
archiva-webapp/pom.xml pom.xml
Author: brett
Date: Fri Sep 22 01:01:31 2006
New Revision: 448856
URL: http://svn.apache.org/viewvc?view=rev&rev=448856
Log:
[MRM-181,MRM-182] fix build and runtime configuration
Modified:
maven/archiva/trunk/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml
maven/archiva/trunk/archiva-webapp/pom.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/pom.xml?view=diff&rev=448856&r1=448855&r2=448856
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/pom.xml (original)
+++ maven/archiva/trunk/archiva-plexus-runtime/pom.xml Fri Sep 22 01:01:31 2006
@@ -48,6 +48,18 @@
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-naming</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -71,6 +83,14 @@
<runtimePath>target/plexus-archiva-runtime</runtimePath>
<additionalCoreArtifacts>
<additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
+ <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
+ <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>
+ <additionalCoreArtifact>commons-pool:commons-pool</additionalCoreArtifact>
+ <additionalCoreArtifact>commons-dbcp:commons-dbcp</additionalCoreArtifact>
+ <additionalCoreArtifact>commons-collections:commons-collections</additionalCoreArtifact>
+ <additionalCoreArtifact>directory-naming:naming-core</additionalCoreArtifact>
+ <additionalCoreArtifact>directory-naming:naming-factory</additionalCoreArtifact>
+ <additionalCoreArtifact>directory-naming:naming-java</additionalCoreArtifact>
</additionalCoreArtifacts>
</configuration>
</plugin>
Modified: maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml?view=diff&rev=448856&r1=448855&r2=448856
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml (original)
+++ maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml Fri Sep 22 01:01:31 2006
@@ -1 +1,44 @@
-<plexus/>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<plexus>
+ <load-on-start>
+ <component>
+ <role>org.codehaus.plexus.naming.Naming</role>
+ <role-hint>dataSources</role-hint>
+ </component>
+ </load-on-start>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.naming.Naming</role>
+ <implementation>org.codehaus.plexus.naming.DefaultNaming</implementation>
+ <role-hint>dataSources</role-hint>
+ <configuration>
+ <resources>
+ <resource>
+ <name>jdbc/users</name>
+ <type>javax.sql.DataSource</type>
+ <properties>
+ <property>
+ <name>driverClassName</name>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ </property>
+ <property>
+ <name>url</name>
+ <value>jdbc:derby:${plexus.home}/database;create=true</value>
+ </property>
+ <property>
+ <name>username</name>
+ <value>sa</value>
+ </property>
+ <property>
+ <name>password</name>
+ <value></value>
+ </property>
+ </properties>
+ </resource>
+ </resources>
+ </configuration>
+ </component>
+ </components>
+</plexus>
+
Modified: maven/archiva/trunk/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/pom.xml?view=diff&rev=448856&r1=448855&r2=448856
==============================================================================
--- maven/archiva/trunk/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-webapp/pom.xml Fri Sep 22 01:01:31 2006
@@ -339,13 +339,6 @@
</plugin>
</plugins>
</build>
- <!-- TODO: remove once xwork integration is released -->
- <repositories>
- <repository>
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
- </repositories>
<pluginRepositories>
<pluginRepository>
<id>codehaus.org</id>
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=448856&r1=448855&r2=448856
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Fri Sep 22 01:01:31 2006
@@ -376,6 +376,13 @@
<url>http://snapshots.repository.codehaus.org</url>
</pluginRepository>
</pluginRepositories>
+ <!-- TODO: remove once xwork integration, plexus container is released -->
+ <repositories>
+ <repository>
+ <id>codehaus.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ </repository>
+ </repositories>
<properties>
<maven.version>2.0.4</maven.version>
</properties>