geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r804750 - in /geronimo/server/trunk/plugins/clustering: ./ clustering-it/ clustering-it/customer-jetty/ clustering-it/customer-jetty/src/ clustering-it/customer-jetty/src/main/ clustering-it/customer-jetty/src/main/plan/ clustering-it/plugi...
Date Sun, 16 Aug 2009 19:44:23 GMT
Author: djencks
Date: Sun Aug 16 19:44:22 2009
New Revision: 804750

URL: http://svn.apache.org/viewvc?rev=804750&view=rev
Log:
GERONIMO-4284 make the plugin farm it depend on released artifacts

Added:
    geronimo/server/trunk/plugins/clustering/clustering-it/
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/resources/
Removed:
    geronimo/server/trunk/plugins/clustering/plugin-farm-it/
Modified:
    geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java
    geronimo/server/trunk/plugins/clustering/pom.xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, 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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering-it</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins.it</groupId>
+    <artifactId>customer-jetty</artifactId>
+    <name>Geronimo Samples :: customer :: plugin for jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. customer Plugin for Jetty</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>customer-ear</artifactId>
+            <version>2.1.2</version>
+            <type>ear</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.it</groupId>
+            <artifactId>sample-datasource</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${jetty}-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>${jetty}</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>customer-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, 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$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from customer</attribute>-->
+        <attribute name="path">CustomerService.sql</attribute>
+        <reference name="DataSource">
+            <name>SampleTxDatasource</name>
+        </reference>
+    </gbean>
+
+</application>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering-it</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins.it</groupId>
+    <artifactId>plugin-farm-it</artifactId>
+    <name>Geronimo Plugins, Clustering :: Plugin Farm Integration Tests</name>
+    <packaging>car</packaging>
+
+    <description>
+        Basic farming support
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin-farm</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>geronimo-maven-plugin</artifactId>
+                    <version>${version}</version>
+                    <configuration>
+                        <assemblies>
+                            <assembly>
+                                <id>node</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-plugin-farm-node</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+                            <assembly>
+                                <id>jetty</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-jetty7-javaee5</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+
+                            <assembly>
+                                <id>jetty-minimal</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-jetty7-minimal</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+
+                            <assembly>
+                                <id>tomcat</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-tomcat6-javaee5</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+
+                            <assembly>
+                                <id>tomcat-minimal</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-tomcat6-minimal</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+
+                            <assembly>
+                                <id>framework</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-framework</artifactId>
+                                <version>${version}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+                        </assemblies>
+
+                        <defaultAssemblyId>framework</defaultAssemblyId>
+                        <!--<defaultAssemblyId>jetty</defaultAssemblyId>-->
+
+                        <optionSets>
+                            <optionSet>
+                                <id>morememory</id>
+                                <options>
+                                    <option>-Xmx512m</option>
+                                    <option>-XX:MaxPermSize=128m</option>
+                                </options>
+                            </optionSet>
+
+                            <optionSet>
+                                <id>debug</id>
+                                <options>
+                                    <option>-Xdebug</option>
+                                    <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+                                </options>
+                            </optionSet>
+                        </optionSets>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>start</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>start-server</goal>
+                            </goals>
+                            <configuration>
+                                <assemblyId>${it-server}</assemblyId>
+                                <logOutput>true</logOutput>
+                                <background>true</background>
+                                <verifyTimeout>300</verifyTimeout>
+                                <refresh>true</refresh>
+                                <optionSets>
+                                    <optionSet>
+                                        <id>default</id>
+                                        <options>
+                                            <option>-XX:MaxPermSize=128m</option>
+                                            <option>-Xdebug</option>
+                                            <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+                                        </options>
+                                    </optionSet>
+
+                                    <optionSet>
+                                        <id>morememory</id>
+                                        <options>
+                                            <option>-Xmx512m</option>
+                                            <option>-XX:MaxPermSize=128m</option>
+                                        </options>
+                                    </optionSet>
+
+                                    <optionSet>
+                                        <id>debug</id>
+                                        <options>
+                                            <option>-Xdebug</option>
+                                            <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+                                        </options>
+                                    </optionSet>
+                                </optionSets>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>start-farm</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>start-multi-server</goal>
+                            </goals>
+                            <configuration>
+                                <assemblyId>node</assemblyId>
+                                <logOutput>true</logOutput>
+                                <background>true</background>
+                                <verifyTimeout>300</verifyTimeout>
+                                <refresh>true</refresh>
+                                <count>2</count>
+                                <optionSets>
+                                    <optionSet>
+                                        <id>default</id>
+                                        <options>
+                                            <option>-XX:MaxPermSize=128m</option>
+                                        </options>
+                                    </optionSet>
+
+                                    <optionSet>
+                                        <id>morememory</id>
+                                        <options>
+                                            <option>-Xmx512m</option>
+                                            <option>-XX:MaxPermSize=128m</option>
+                                        </options>
+                                    </optionSet>
+
+                                    <!--<optionSet>-->
+                                    <!--<id>debug</id>-->
+                                    <!--<options>-->
+                                    <!--<option>-Xdebug</option>-->
+                                    <!--<option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>-->
+                                    <!--</options>-->
+                                    <!--</optionSet>-->
+                                </optionSets>
+                            </configuration>
+                        </execution>
+                        <!--<execution>-->
+                            <!--<id>install-plugin-farm-member-2</id>-->
+                            <!--<phase>install</phase>-->
+                            <!--<goals>-->
+                                <!--<goal>install-plugin</goal>-->
+                            <!--</goals>-->
+                            <!--<configuration>-->
+                                <!--<defaultGeronimoRepository>~/.m2/repository</defaultGeronimoRepository>-->
+                                <!--<moduleId>org.apache.geronimo.configs/plugin-farm-member/${version}/car</moduleId>-->
+                                <!--<port>1119</port>-->
+                            <!--</configuration>-->
+                        <!--</execution>-->
+                        <execution>
+                            <id>install-plugin</id>
+                            <phase>install</phase>
+                            <goals>
+                                <goal>install-plugin</goal>
+                            </goals>
+                            <!--<configuration>-->
+                            <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${version}/</defaultGeronimoRepository>-->
+                            <!--</configuration>-->
+                        </execution>
+                        <execution>
+                            <id>stop</id>
+                            <phase>install</phase>
+                            <goals>
+                                <goal>stop-server</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Clustering</category>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm-it</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  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$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="test" class="org.apache.geronimo.farm.plugin.TestGBean">
+        <reference name="PersistenceUnit">
+            <name>FarmPersistence</name>
+        </reference>
+        <reference name="FarmGBean">
+            <name>PluginFarm</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>clustering-it</artifactId>
+    <name>Geronimo Plugins, Clustering Integration Tests</name>
+    <packaging>pom</packaging>
+
+    <description>
+        clustering plugin it
+    </description>
+
+    <modules>
+        <module>sample-datasource</module>
+        <module>customer-jetty</module>
+        <module>plugin-farm-it</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, 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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering-it</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins.it</groupId>
+    <artifactId>sample-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Geronimo Samples :: sample-datasource</name>
+
+    <description>Geronimo Samples. sample-datasource plugin</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+       </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                    <instance>
+                        <plugin-artifact>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>sample-datasource</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>system-database</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml?rev=804750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml Sun Aug 16 19:44:22 2009
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    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$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>SampleTxDatasource</name>
+                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>SampleNoTxDatasource</name>
+                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <min-size>0</min-size>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+</connector>
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java?rev=804750&r1=804749&r2=804750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java Sun Aug 16 19:44:22 2009
@@ -61,7 +61,7 @@
         String clusterName = CLUSTER1;
         String pluginListName = PLUGIN_LIST1;
         int clusterSize = 1;
-        JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.samples/customer-service-jetty/2.2-SNAPSHOT/car");
+        JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.plugins.it/customer-jetty/2.2-SNAPSHOT/car");
         farmGBean.addPluginToCluster(clusterName, pluginListName, pluginInstance);
 
         checkCluster(clusterName, pluginListName, clusterSize);

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=804750&r1=804749&r2=804750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Sun Aug 16 19:44:22 2009
@@ -53,7 +53,7 @@
         <profile>
             <id>it</id>
             <modules>
-                <module>plugin-farm-it</module>
+                <module>clustering-it</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message