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/19 05:34:31 UTC
svn commit: r447708 - in /maven/archiva/trunk: ./
archiva-plexus-application/ archiva-plexus-application/src/
archiva-plexus-application/src/conf/ archiva-plexus-runtime/
archiva-plexus-runtime/src/ archiva-plexus-runtime/src/conf/
archiva-plexus-runti...
Author: brett
Date: Mon Sep 18 20:34:30 2006
New Revision: 447708
URL: http://svn.apache.org/viewvc?view=rev&rev=447708
Log:
add a plexus-application and plexus-runtime so that Archiva can be run standalone using the jetty service
Added:
maven/archiva/trunk/archiva-plexus-application/ (with props)
maven/archiva/trunk/archiva-plexus-application/pom.xml (with props)
maven/archiva/trunk/archiva-plexus-application/src/
maven/archiva/trunk/archiva-plexus-application/src/conf/
maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml (with props)
maven/archiva/trunk/archiva-plexus-application/src/plexus.properties (with props)
maven/archiva/trunk/archiva-plexus-runtime/ (with props)
maven/archiva/trunk/archiva-plexus-runtime/pom.xml (with props)
maven/archiva/trunk/archiva-plexus-runtime/src/
maven/archiva/trunk/archiva-plexus-runtime/src/conf/
maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml (with props)
maven/archiva/trunk/archiva-plexus-runtime/src/main/
maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/
maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml (with props)
maven/archiva/trunk/archiva-plexus-runtime/src/plexus.properties (with props)
Modified:
maven/archiva/trunk/pom.xml
Propchange: maven/archiva/trunk/archiva-plexus-application/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 18 20:34:30 2006
@@ -0,0 +1 @@
+target
Added: maven/archiva/trunk/archiva-plexus-application/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/pom.xml?view=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/pom.xml (added)
+++ maven/archiva/trunk/archiva-plexus-application/pom.xml Mon Sep 18 20:34:30 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>archiva</artifactId>
+ <groupId>org.apache.maven.archiva</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>archiva-plexus-application</artifactId>
+ <packaging>plexus-application</packaging>
+ <name>Archiva Plexus Application</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-maven-plugin</artifactId>
+ <version>2.0-alpha-3-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
+ <configurationsDirectory>src/conf</configurationsDirectory>
+ <configurationProperties>src/plexus.properties</configurationProperties>
+ <applicationName>archiva</applicationName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+ <!-- For filtering -->
+ <properties>
+ <archivaVersion>${project.version}</archivaVersion>
+ </properties>
+</project>
Propchange: maven/archiva/trunk/archiva-plexus-application/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml?view=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml (added)
+++ maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml Mon Sep 18 20:34:30 2006
@@ -0,0 +1,31 @@
+<application>
+
+ <services>
+ <service>
+ <id>jetty</id>
+ <configuration>
+ <webapps>
+ <webapp>
+ <file>${plexus.home}/lib/archiva-webapp-@archivaVersion@.war</file>
+ <context>/</context>
+ <extraction-path>${plexus.home}/webapp</extraction-path>
+ <standardWebappClassloader>true</standardWebappClassloader>
+ <listeners>
+ <http-listener>
+ <port>8080</port>
+ </http-listener>
+ <!--
+ <proxy-http-listener>
+ <port>8090</port>
+ <proxy-host>localhost</proxy-host>
+ <proxy-port>80</proxy-port>
+ </proxy-http-listener>
+ -->
+ </listeners>
+ </webapp>
+ </webapps>
+ </configuration>
+ </service>
+ </services>
+
+</application>
Propchange: maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/archiva/trunk/archiva-plexus-application/src/plexus.properties
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/src/plexus.properties?view=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/src/plexus.properties (added)
+++ maven/archiva/trunk/archiva-plexus-application/src/plexus.properties Mon Sep 18 20:34:30 2006
@@ -0,0 +1,3 @@
+app.name = archiva
+app.long.name = Archiva
+app.description = Archiva - the Maven Repository Manager
Propchange: maven/archiva/trunk/archiva-plexus-application/src/plexus.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/trunk/archiva-plexus-runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 18 20:34:30 2006
@@ -0,0 +1 @@
+target
Added: maven/archiva/trunk/archiva-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/pom.xml?view=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/pom.xml (added)
+++ maven/archiva/trunk/archiva-plexus-runtime/pom.xml Mon Sep 18 20:34:30 2006
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>archiva-plexus-runtime</artifactId>
+ <name>Archiva Runtime Generator</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-host</artifactId>
+ <version>2.0-alpha-3-SNAPSHOT</version>
+ </dependency>
+ <!-- Services -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-service-jetty</artifactId>
+ <version>2.0-alpha-3-SNAPSHOT</version>
+ <type>plexus-service</type>
+ </dependency>
+ <!-- Plexus applications -->
+ <dependency>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-plexus-application</artifactId>
+ <version>${project.version}</version>
+ <type>plexus-application</type>
+ </dependency>
+
+ <!-- Additional Core Artifacts -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-maven-plugin</artifactId>
+ <version>2.0-alpha-3-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assemble-runtime</goal>
+ <goal>add-services</goal>
+ <goal>add-apps</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
+ <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
+ <runtimePath>target/plexus-archiva-runtime</runtimePath>
+ <additionalCoreArtifacts>
+ <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
+ </additionalCoreArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <finalName>archiva</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/archiva/trunk/archiva-plexus-runtime/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml (added)
+++ maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml Mon Sep 18 20:34:30 2006
@@ -0,0 +1 @@
+<plexus/>
Propchange: maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml?view=auto&rev=447708
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml (added)
+++ maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml Mon Sep 18 20:34:30 2006
@@ -0,0 +1,127 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
+ <directory>target/plexus-archiva-runtime/apps</directory>
+ <outputDirectory>apps</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/core</directory>
+ <outputDirectory>core</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/logs</directory>
+ <outputDirectory>logs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/services</directory>
+ <outputDirectory>services</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/temp</directory>
+ <outputDirectory>temp</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>plexus.sh</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>plexus.bat</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/linux</directory>
+ <outputDirectory>bin/linux</outputDirectory>
+ <includes>
+ <include>run.sh</include>
+ <include>wrapper.conf</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/linux</directory>
+ <outputDirectory>bin/linux</outputDirectory>
+ <includes>
+ <include>libwrapper.so</include>
+ <include>wrapper</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/macosx</directory>
+ <outputDirectory>bin/macosx</outputDirectory>
+ <includes>
+ <include>run.sh</include>
+ <include>wrapper.conf</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/macosx</directory>
+ <outputDirectory>bin/macosx</outputDirectory>
+ <includes>
+ <include>libwrapper.jnilib</include>
+ <include>wrapper</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/solaris</directory>
+ <outputDirectory>bin/solaris</outputDirectory>
+ <includes>
+ <include>run.sh</include>
+ <include>wrapper.conf</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/solaris</directory>
+ <outputDirectory>bin/solaris</outputDirectory>
+ <includes>
+ <include>libwrapper.so</include>
+ <include>wrapper</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/win32</directory>
+ <outputDirectory>bin/win32</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ <include>wrapper.conf</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-archiva-runtime/bin/win32</directory>
+ <outputDirectory>bin/win32</outputDirectory>
+ <includes>
+ <include>wrapper.exe</include>
+ <include>wrapper.dll</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Propchange: maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/archiva/trunk/archiva-plexus-runtime/src/plexus.properties
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/plexus.properties?view=auto&rev=447708
==============================================================================
(empty)
Propchange: maven/archiva/trunk/archiva-plexus-runtime/src/plexus.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=447708&r1=447707&r2=447708
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Mon Sep 18 20:34:30 2006
@@ -128,6 +128,8 @@
<module>archiva-configuration</module>
<module>maven-meeper</module>
<module>archiva-repository-layer</module>
+ <module>archiva-plexus-application</module>
+ <module>archiva-plexus-runtime</module>
</modules>
<dependencies>
<dependency>
@@ -142,7 +144,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>