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 2009/08/17 10:23:28 UTC
svn commit: r804897 - in /geronimo/server/trunk/plugins/clustering:
clustering-it/ clustering-it/clustering-test/
clustering-it/clustering-test/src/ clustering-it/clustering-test/src/main/
clustering-it/clustering-test/src/main/java/ clustering-it/clus...
Author: djencks
Date: Mon Aug 17 08:23:27 2009
New Revision: 804897
URL: http://svn.apache.org/viewvc?rev=804897&view=rev
Log:
GERONIMO-4284 move TestGBean out of main jar
Added:
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml (with props)
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
- copied, changed from r804750, geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java
geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/
geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml (with props)
Removed:
geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java
Modified:
geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml
geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/FarmGBean.java
Added: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml?rev=804897&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml Mon Aug 17 08:23:27 2009
@@ -0,0 +1,41 @@
+<?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>
+ <artifactId>clustering-it</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
+ <artifactId>clustering-test</artifactId>
+ <name>clustering-test</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-plugin-farm</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java (from r804750, 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/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java?p2=geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java&p1=geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/TestGBean.java&r1=804750&r2=804897&rev=804897&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/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java Mon Aug 17 08:23:27 2009
@@ -18,13 +18,18 @@
*/
-package org.apache.geronimo.farm.plugin;
+package org.apache.geronimo.farm.plugin.test;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
+import org.apache.geronimo.farm.plugin.FarmGBean;
+import org.apache.geronimo.farm.plugin.JpaClusterInfo;
+import org.apache.geronimo.farm.plugin.JpaNodeInfo;
+import org.apache.geronimo.farm.plugin.JpaPluginInstance;
+import org.apache.geronimo.farm.plugin.JpaPluginList;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
Added: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml?rev=804897&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml Mon Aug 17 08:23:27 2009
@@ -0,0 +1,34 @@
+<?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.plugins.it</groupId>
+ <artifactId>customer-jetty</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty7</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
+ <artifactId>sample-datasource</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: 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=804897&r1=804896&r2=804897&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml Mon Aug 17 08:23:27 2009
@@ -53,6 +53,19 @@
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
+ <artifactId>clustering-test</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
+ <artifactId>customer-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: 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=804897&r1=804896&r2=804897&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/history/dependencies.xml Mon Aug 17 08:23:27 2009
@@ -1,7 +1,7 @@
<?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>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
<artifactId>plugin-farm-it</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
@@ -11,4 +11,9 @@
<artifactId>plugin-farm</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.it</groupId>
+ <artifactId>clustering-test</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: 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=804897&r1=804896&r2=804897&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/src/main/plan/plan.xml Mon Aug 17 08:23:27 2009
@@ -20,7 +20,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="test" class="org.apache.geronimo.farm.plugin.TestGBean">
+ <gbean name="test" class="org.apache.geronimo.farm.plugin.test.TestGBean">
<reference name="PersistenceUnit">
<name>FarmPersistence</name>
</reference>
Modified: 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=804897&r1=804896&r2=804897&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml Mon Aug 17 08:23:27 2009
@@ -37,7 +37,8 @@
<modules>
<module>sample-datasource</module>
<module>customer-jetty</module>
+ <module>clustering-test</module>
<module>plugin-farm-it</module>
</modules>
-</project>
+</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/FarmGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/FarmGBean.java?rev=804897&r1=804896&r2=804897&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/FarmGBean.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/src/main/java/org/apache/geronimo/farm/plugin/FarmGBean.java Mon Aug 17 08:23:27 2009
@@ -267,11 +267,11 @@
}
- static class JpaContext {
+ public static class JpaContext {
private EntityManager em;
private EntityTransaction entityTransaction;
- JpaContext(EntityManagerFactory emf) {
+ public JpaContext(EntityManagerFactory emf) {
em = emf.createEntityManager();
entityTransaction = em.getTransaction();
entityTransaction.begin();