Author: evenisse
Date: Fri Oct 20 09:24:13 2006
New Revision: 466178
URL: http://svn.apache.org/viewvc?view=rev&rev=466178
Log:
o Add plexus runtime
o Remove some snapshots
Added:
maven/continuum/trunk/continuum-plexus-runtime/ (with props)
maven/continuum/trunk/continuum-plexus-runtime/pom.xml (with props)
maven/continuum/trunk/continuum-plexus-runtime/src/
maven/continuum/trunk/continuum-plexus-runtime/src/conf/
maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml (with props)
maven/continuum/trunk/continuum-plexus-runtime/src/main/
maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/
maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml (with props)
maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties (with props)
Modified:
maven/continuum/trunk/continuum-model/pom.xml
maven/continuum/trunk/continuum-security/ (props changed)
maven/continuum/trunk/continuum-webapp/pom.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/ (props changed)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/ (props changed)
maven/continuum/trunk/pom.xml
Modified: maven/continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-model/pom.xml?view=diff&rev=466178&r1=466177&r2=466178
==============================================================================
--- maven/continuum/trunk/continuum-model/pom.xml (original)
+++ maven/continuum/trunk/continuum-model/pom.xml Fri Oct 20 09:24:13 2006
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-11-SNAPSHOT</version>
+ <version>1.0-alpha-11</version>
<executions>
<execution>
<id>modello-continuum</id>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jpox-maven-plugin</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<executions>
<execution>
<goals>
Propchange: maven/continuum/trunk/continuum-plexus-runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 20 09:24:13 2006
@@ -0,0 +1 @@
+target
Added: maven/continuum/trunk/continuum-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/pom.xml?view=auto&rev=466178
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/pom.xml (added)
+++ maven/continuum/trunk/continuum-plexus-runtime/pom.xml Fri Oct 20 09:24:13 2006
@@ -0,0 +1,130 @@
+<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>continuum-parent</artifactId>
+ <groupId>org.apache.maven.continuum</groupId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>continuum-plexus-runtime</artifactId>
+ <name>Continuum Plexus Runtime</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>runtime</scope>
+ </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</version>
+ </dependency>
+ <!-- Services -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-service-jetty</artifactId>
+ <version>2.0-alpha-3</version>
+ <type>plexus-service</type>
+ </dependency>
+ <!-- Plexus applications -->
+ <dependency>
+ <groupId>org.apache.maven.continuum</groupId>
+ <artifactId>continuum-plexus-application</artifactId>
+ <version>${pom.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>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-naming</artifactId>
+ <version>1.0-alpha-1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jpox</groupId>
+ <artifactId>jpox</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.3.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-appserver-maven-plugin</artifactId>
+ <version>2.0-alpha-3</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-continuum-runtime</runtimePath>
+ <addManagementAgent>true</addManagementAgent>
+ <additionalCoreArtifacts>
+ <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
+ <additionalCoreArtifact>log4j:log4j</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>
+ <additionalCoreArtifact>javax.mail:mail</additionalCoreArtifact>
+ <additionalCoreArtifact>javax.activation:activation</additionalCoreArtifact>
+
+ <!-- Not required in core, just sharing to reduce size -->
+ <additionalCoreArtifact>jpox:jpox</additionalCoreArtifact>
+ <additionalCoreArtifact>javax.resource:connector</additionalCoreArtifact>
+ <additionalCoreArtifact>javax.jdo:jdo2-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>project-server</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/continuum/trunk/continuum-plexus-runtime/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-plexus-runtime/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml?view=auto&rev=466178
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml (added)
+++ maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml Fri Oct 20 09:24:13
2006
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<plexus>
+ <load-on-start>
+ <!-- MUST come before agent (inserted by appserver plugin) since that will try and
boot the services -->
+ <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}/data/users/database;create=true</value>
+ </property>
+ <property>
+ <name>username</name>
+ <value>sa</value>
+ </property>
+ <property>
+ <name>password</name>
+ <value></value>
+ </property>
+ </properties>
+ </resource>
+ <resource>
+ <name>jdbc/continuum</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}/data/continuum/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>
+
Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/conf/plexus.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml?view=auto&rev=466178
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml (added)
+++ maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml Fri Oct 20 09:24:13
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-continuum-runtime/apps</directory>
+ <outputDirectory>apps</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/core</directory>
+ <outputDirectory>core</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/logs</directory>
+ <outputDirectory>logs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/services</directory>
+ <outputDirectory>services</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/temp</directory>
+ <outputDirectory>temp</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>plexus.sh</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-runtime/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>plexus.bat</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/plexus-continuum-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-continuum-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-continuum-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-continuum-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-continuum-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-continuum-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-continuum-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-continuum-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/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties?view=auto&rev=466178
==============================================================================
--- maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties (added)
+++ maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties Fri Oct 20 09:24:13
2006
@@ -0,0 +1,4 @@
+app.name = continuum
+app.long.name = Apache Continuum
+app.description = Apache Continuum
+app.max.memory = 384m
Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-plexus-runtime/src/plexus.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/continuum/trunk/continuum-security/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 20 09:24:13 2006
@@ -0,0 +1 @@
+target
Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=466178&r1=466177&r2=466178
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Fri Oct 20 09:24:13 2006
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1-20060724.192148-1</version>
+ <version>2.1.1</version>
<!-- This configuration is added to cleanup from war:inplace -->
<configuration>
<filesets>
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xwork-integration</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -387,10 +387,9 @@
<artifactId>plexus-security-authorization-rbac-authorizer</artifactId>
<version>1.0-alpha-6-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
- <version>1.0-alpha-7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -405,12 +404,10 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.3.1</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 20 09:24:13 2006
@@ -1,2 +1,3 @@
user
META-INF
+template
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 20 09:24:13 2006
@@ -0,0 +1 @@
+pss
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=466178&r1=466177&r2=466178
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Fri Oct 20 09:24:13 2006
@@ -87,7 +87,8 @@
<module>continuum-core</module>
<module>continuum-model</module>
<module>continuum-notifiers</module>
- <!-- module>continuum-plexus-application</module -->
+ <module>continuum-plexus-application</module>
+ <module>continuum-plexus-runtime</module>
<module>continuum-rpc-client</module>
<module>continuum-store</module>
<module>continuum-test</module>
@@ -140,7 +141,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-10-SNAPSHOT</version>
+ <version>1.0-alpha-10</version>
</dependency>
</dependencies>
<dependencyManagement>
@@ -346,17 +347,17 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
- <version>1.0-alpha-7-SNAPSHOT</version>
+ <version>1.0-alpha-7</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-formica</artifactId>
- <version>1.0-beta-11-SNAPSHOT</version>
+ <version>1.0-beta-11</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -402,7 +403,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -417,11 +418,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-alpha-3</version>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
+ <continuumWebappVersion>${pom.version}</continuumWebappVersion>
<maven.version>2.0.4</maven.version>
<maven-scm.version>1.0-SNAPSHOT</maven-scm.version>
</properties>
|