geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r696524 - in /geronimo/server/trunk/plugins/clustering: ./ plugin-farm-datasource/ plugin-farm-datasource/src/ plugin-farm-datasource/src/main/ plugin-farm-datasource/src/main/history/ plugin-farm-datasource/src/main/plan/ plugin-farm-datas...
Date Thu, 18 Sep 2008 00:04:59 GMT
Author: djencks
Date: Wed Sep 17 17:04:59 2008
New Revision: 696524

URL: http://svn.apache.org/viewvc?rev=696524&view=rev
Log:
GERONIMO-4284 Add a separate datasource for plugin farm

Added:
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml   (with props)
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/dependencies.xml
  (with props)
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/plan.xml
  (with props)
    geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/resources/
Modified:
    geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/clustering/pom.xml

Added: geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml?rev=696524&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml (added)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml Wed Sep 17 17:04:59
2008
@@ -0,0 +1,78 @@
+<?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">
+    <parent>
+        <artifactId>clustering</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>plugin-farm-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Geronimo Plugins, Clustering :: Plugin Farm Datasource</name>
+    <description>Plugin defining a derby datasource for the plugin farm. Intended to
be replaced with a remote datasource for greater reliability in actual deployments</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-local</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

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

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

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

Added: geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/dependencies.xml?rev=696524&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/dependencies.xml
(added)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/history/dependencies.xml
Wed Sep 17 17:04:59 2008
@@ -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-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/plugin-farm-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/plan.xml?rev=696524&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/plan.xml
(added)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/src/main/plan/plan.xml
Wed Sep 17 17:04:59 2008
@@ -0,0 +1,61 @@
+<?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-${geronimoSchemaVersion}">
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>PluginFarmDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">PluginFarmDatatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <local-transaction/>
+                        <single-pool>
+                            <max-size>2</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>NoTxPluginFarmDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">PluginFarmDatatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>2</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+</connector>

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

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

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

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml?rev=696524&r1=696523&r2=696524&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml Wed Sep 17 17:04:59 2008
@@ -54,18 +54,11 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
+            <artifactId>plugin-farm-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.framework</groupId>-->
-        <!--<artifactId>j2ee-security</artifactId>-->
-        <!--<version>${version}</version>-->
-        <!--<type>car</type>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-plugin-farm</artifactId>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml?rev=696524&r1=696523&r2=696524&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
Wed Sep 17 17:04:59 2008
@@ -22,16 +22,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm-datasource</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/plan/plan.xml?rev=696524&r1=696523&r2=696524&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/plan/plan.xml Wed Sep 17
17:04:59 2008
@@ -39,10 +39,10 @@
             openjpa.InverseManager=true
         </attribute>
         <reference name="JtaDataSourceWrapper">
-            <name>SystemDatasource</name>
+            <name>PluginFarmDatasource</name>
         </reference>
         <reference name="NonJtaDataSourceWrapper">
-            <name>NoTxDatasource</name>
+            <name>NoTxPluginFarmDatasource</name>
         </reference>
     </gbean>
 

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=696524&r1=696523&r2=696524&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Wed Sep 17 17:04:59 2008
@@ -44,6 +44,7 @@
         <module>plugin-farm</module>
         <module>plugin-farm-member</module>
     <module>geronimo-plugin-farm-node</module>
+    <module>plugin-farm-datasource</module>
   </modules>
 
     <profiles>



Mime
View raw message