[MRM-181,MRM-182] fix build and runtime configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@448856 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml
index faaed9ab651db0549859643d86b39c42e839cd42..1d239fc5011fb8174ddd4a9336a0c8a2d56fe660 100644 (file)
--- a/archiva-plexus-runtime/pom.xml
+++ b/archiva-plexus-runtime/pom.xml
@@ -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>

diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml
index f997fa797f47bd36e3d015c16eea0fbcff469e99..2ba9fecbb0d4a40def0e3976ac2a19ac5a849cda 100644 (file)
--- a/archiva-plexus-runtime/src/conf/plexus.xml
+++ b/archiva-plexus-runtime/src/conf/plexus.xml
@@ -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>
+

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 85568741b35e10090499804f08ad8ff381461c76..dcc723a5922c04a10232b6354c38cbd842ab7c9e 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
index af8375edad5990029c5e8b950107a755b25e52fb..1474c307317e4f8e64bf8fe818ae226c8fc5315b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>