geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r441840 - in /geronimo/server/trunk/configs: client-deployer/src/plan/plan.xml client-system/pom.xml client/pom.xml
Date Sat, 09 Sep 2006 18:22:52 GMT
Author: djencks
Date: Sat Sep  9 11:22:51 2006
New Revision: 441840

URL: http://svn.apache.org/viewvc?view=rev&rev=441840
Log:
GERONIMO-2389 fix some dependency so app client container works

Modified:
    geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/client-system/pom.xml
    geronimo/server/trunk/configs/client/pom.xml

Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=441840&r1=441839&r2=441840
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Sat Sep  9 11:22:51 2006
@@ -36,10 +36,10 @@
             </pattern>
         </references>
         <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
+            <name>ClientConnectorBuilder</name>
         </reference>
         <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
+            <name>ClientConnectorBuilder</name>
         </reference>
         <references name="ServiceReferenceBuilder">
             <pattern>
@@ -69,6 +69,23 @@
                         <type>car</type>
                     </dependency>
                 </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+
+    <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+        <attribute name="defaultMaxSize">10</attribute>
+        <attribute name="defaultMinSize">0</attribute>
+        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+        <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+        <attribute name="defaultXATransactionCaching">true</attribute>
+        <attribute name="defaultXAThreadCaching">false</attribute>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
             </environment>
         </xml-attribute>
     </gbean>

Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?view=diff&rev=441840&r1=441839&r2=441840
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Sat Sep  9 11:22:51 2006
@@ -103,6 +103,10 @@
                             <artifactId>geronimo-qname_1.1_spec</artifactId>
                         </element>
                         <element>
+                            <groupId>backport-util-concurrent</groupId>
+                            <artifactId>backport-util-concurrent</artifactId>
+                        </element>
+                        <element>
                             <groupId>mx4j</groupId>
                             <artifactId>mx4j</artifactId>
                         </element>

Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=441840&r1=441839&r2=441840
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Sat Sep  9 11:22:51 2006
@@ -97,11 +97,11 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!-- ??? 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
-        </dependency> -->
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -123,14 +123,74 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jsp_2.0_spec</artifactId>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
-            
+
+        <!--dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-servlet_2.4_spec</artifactId>-->
+        <!--</dependency>-->
+
         <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
         <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi, 
              concurrent, jdom -->
@@ -138,6 +198,12 @@
         <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
+        </dependency>
+        
+        <!-- REMOVE WHEN G-2383 is applied -->
+        <dependency>
+            <groupId>org.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
         </dependency>
         
         <!--



Mime
View raw message