You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/04/01 02:43:49 UTC
svn commit: r929761 - in /geronimo/server/trunk/plugins: connector-1_6/
connector-1_6/geronimo-connector-server/
connector-1_6/geronimo-connector-server/src/
connector-1_6/geronimo-connector-server/src/main/
connector-1_6/geronimo-connector-server/src/...
Author: djencks
Date: Thu Apr 1 00:43:48 2010
New Revision: 929761
URL: http://svn.apache.org/viewvc?rev=929761&view=rev
Log:
GERONIMO-5220 add mini-servers profile to build component specific mini-servers
Added:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/
- copied from r912047, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/
- copied from r912047, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/main/
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/src/main/resources/
geronimo/server/trunk/plugins/console/console-jetty-server/
- copied from r912047, geronimo/server/trunk/plugins/console/console-jetty-server/
geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml
geronimo/server/trunk/plugins/console/console-jetty-server/src/
- copied from r912047, geronimo/server/trunk/plugins/console/console-jetty-server/src/
geronimo/server/trunk/plugins/console/console-jetty-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/console/console-jetty-server/src/main/
geronimo/server/trunk/plugins/console/console-jetty-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/console/console-jetty-server/src/main/resources/
geronimo/server/trunk/plugins/console/console-tomcat-server/
- copied from r912047, geronimo/server/trunk/plugins/console/console-tomcat-server/
geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat-server/src/
- copied from r912047, geronimo/server/trunk/plugins/console/console-tomcat-server/src/
geronimo/server/trunk/plugins/console/console-tomcat-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/console/console-tomcat-server/src/main/
geronimo/server/trunk/plugins/console/console-tomcat-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/console/console-tomcat-server/src/main/resources/
geronimo/server/trunk/plugins/jetty8/jetty-server/
- copied from r912047, geronimo/server/trunk/plugins/jetty8/jetty-server/
geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml
geronimo/server/trunk/plugins/jetty8/jetty-server/src/
- copied from r912047, geronimo/server/trunk/plugins/jetty8/jetty-server/src/
geronimo/server/trunk/plugins/jetty8/jetty-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/jetty8/jetty-server/src/main/
geronimo/server/trunk/plugins/jetty8/jetty-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/jetty8/jetty-server/src/main/resources/
geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/
geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml (with props)
geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/src/
geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/src/main/
geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/src/main/resources/
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/main/
geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-jetty-server/src/main/resources/
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
- copied unchanged from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/main/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/main/
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/main/resources/
- copied from r912047, geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/src/main/resources/
Modified:
geronimo/server/trunk/plugins/connector-1_6/pom.xml
geronimo/server/trunk/plugins/console/pom.xml
geronimo/server/trunk/plugins/jetty8/pom.xml
geronimo/server/trunk/plugins/openejb/pom.xml
geronimo/server/trunk/plugins/welcome/pom.xml
Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=929761&r1=929760&r2=929761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Thu Apr 1 00:43:48 2010
@@ -43,6 +43,15 @@
<module>transaction-1_6</module>
</modules>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>geronimo-connector-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?rev=929761&r1=929760&r2=929761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Thu Apr 1 00:43:48 2010
@@ -46,6 +46,16 @@
<module>plugin-console-tomcat</module>
</modules>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>console-jetty-server</module>
+ <module>console-tomcat-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -66,4 +76,4 @@
</dependencies>
</dependencyManagement>
-</project>
+</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=929761&r1=929760&r2=929761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Thu Apr 1 00:43:48 2010
@@ -112,5 +112,13 @@
<module>jetty8-clustering-wadi</module>
</modules>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>jetty-server</module>
+ </modules>
+ </profile>
+ </profiles>
-</project>
+</project>
\ No newline at end of file
Added: geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml?rev=929761&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml Thu Apr 1 00:43:48 2010
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>openejb</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-openejb-server</artifactId>
+ <packaging>server-assembly</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <servers>
+ <serverInstance>
+ <name>default</name>
+ <configFile>var/config/config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>client</name>
+ <attributeManagerFrom>default</attributeManagerFrom>
+ <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>offline</name>
+ <configFile>var/config/offline-deployer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>jsr88</name>
+ <configFile>var/config/jsr88-configurer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>karaf-framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
+ <!--<properties>-->
+ <!--<geronimoVersion>3.0-SNAPSHOT</geronimoVersion>-->
+ <!--</properties>-->
+</project>
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=929761&r1=929760&r2=929761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Thu Apr 1 00:43:48 2010
@@ -14,11 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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">
+--><!-- $Rev$ $Date$ --><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">
<modelVersion>4.0.0</modelVersion>
@@ -50,6 +46,15 @@
<module>openejb-clustering-builder-wadi</module>
</modules>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>geronimo-openejb-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -63,4 +68,4 @@
</dependencies>
</dependencyManagement>
-</project>
+</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/pom.xml?rev=929761&r1=929760&r2=929761&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/pom.xml Thu Apr 1 00:43:48 2010
@@ -36,6 +36,16 @@
<module>geronimo-welcome</module>
<module>welcome-jetty</module>
<module>welcome-tomcat</module>
- </modules>
+ </modules>
-</project>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>welcome-jetty-server</module>
+ <module>welcome-tomcat-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file