geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r371766 [2/2] - in /geronimo/branches/lw_assemblies: ./ assemblies/activemq-derby-tomcat-server/ assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var...
Date Tue, 24 Jan 2006 01:18:42 GMT
Modified: geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.properties Mon Jan
23 17:18:06 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.xml Mon Jan 23 17:18:06
2006
@@ -58,6 +58,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.properties Mon Jan
23 17:18:06 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.xml Mon Jan 23 17:18:06
2006
@@ -58,6 +58,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.properties Mon
Jan 23 17:18:06 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.xml Mon Jan 23
17:18:06 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.properties Mon
Jan 23 17:18:06 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.xml Mon Jan 23
17:18:06 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/system-database/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/system-database/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/system-database/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/system-database/project.properties Mon Jan 23
17:18:06 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
 

Modified: geronimo/branches/lw_assemblies/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/system-database/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/system-database/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/system-database/project.xml Mon Jan 23 17:18:06
2006
@@ -46,6 +46,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/tomcat-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/tomcat-deployer/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/tomcat-deployer/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/tomcat-deployer/project.properties Mon Jan 23
17:18:06 2006
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/branches/lw_assemblies/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/tomcat-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/tomcat-deployer/src/plan/plan.xml Mon Jan 23 17:18:06
2006
@@ -27,10 +27,16 @@
         <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/tomcat/${pom.currentVersion}/car,${pom.groupId}/axis/${pom.currentVersion}/car</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
-        <reference name="WebServiceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <module>*</module>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <module>*</module>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>

Modified: geronimo/branches/lw_assemblies/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/uddi-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/uddi-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/uddi-jetty/project.xml Mon Jan 23 17:18:06 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.properties Mon Jan 23 17:18:06
2006
@@ -21,4 +21,4 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car

Modified: geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.xml Mon Jan 23 17:18:06 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/project.xml Mon
Jan 23 17:18:06 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>unavailable-appclient-deployer</id>
-    <name>Configuration for performing J2EE deployments</name>
+    <id>unavailable-client-deployer</id>
+    <name>Configuration for no j2ee app clients</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -33,25 +33,15 @@
             <type>plugin</type>
         </dependency>
 
-<!--        <dependency>
+        <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
             <type>car</type>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
--->
-    <dependency>
-        <groupId>geronimo</groupId>
-        <type>car</type>
-        <artifactId>j2ee-deployer</artifactId>
-        <version>${pom.currentVersion}</version>
-            <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-    </dependency>
 
     </dependencies>
 </project>

Modified: geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/src/plan/plan.xml
(original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/src/plan/plan.xml
Mon Jan 23 17:18:06 2006
@@ -20,6 +20,6 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
         >
 
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableAppClientModuleBuilder"
/>
+    <gbean name="AppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder"
/>
 
 </configuration>

Copied: geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml (from
r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml?p2=geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml&p1=geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/project.xml&r1=371765&r2=371766&rev=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml Mon Jan 23
17:18:06 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>unavailable-openejb-deployer</id>
-    <name>Configuration for the unavailable OpenEJB deployer</name>
+    <id>unavailable-ejb-deployer</id>
+    <name>Configuration for no EJBs</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -38,10 +38,7 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
-<!--            <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
--->        </dependency>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml Mon
Jan 23 17:18:06 2006
@@ -26,98 +26,4 @@
 
     <gbean name="ServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder"
/>
 
-    <!--
-    <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
-        <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
-        <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-        <reference name="WebConfigBuilder">
-            <name>WebBuilder</name>
-        </reference>
-        <reference name="EJBConfigBuilder">
-            <module>*</module>
-            <name>UnavailableBuilder</name>
-        </reference>
-        <reference name="ConnectorConfigBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="AppClientConfigBuilder">
-            <name>AppClientBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
-        <reference name="EJBReferenceBuilder">
-            <module>*</module>
-            <name>UnavailableEJBReferenceBuilder</name>
-        </reference>
-    </gbean>
-
-    <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
-        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
-        <references name="ModuleBuilders">
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
-        </references>
-     </gbean>
-
-    <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <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="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="defaultClientParentId">${pom.groupId}/client/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <module>*</module>
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
-        <references name="Store">
-            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
-        </references>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
-    <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
-    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-    </gbean>
-    -->
-
 </configuration>

Copied: geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties
(from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.properties)
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties?p2=geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties&p1=geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.properties&r1=371765&r2=371766&rev=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties
Mon Jan 23 17:18:06 2006
@@ -22,4 +22,4 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+#geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Copied: geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml
(from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml?p2=geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml&p1=geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.xml&r1=371765&r2=371766&rev=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml Mon
Jan 23 17:18:06 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>unavailable-axis-deployer</id>
-    <name>Unavailable Axis deployer</name>
+    <id>unavailable-webservices-deployer</id>
+    <name>Unavailable Web Services deployer</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -45,9 +45,9 @@
             <type>car</type>
             <artifactId>j2ee-deployer</artifactId>
             <version>${pom.currentVersion}</version>
-                <properties>
-                     <geronimo.import>true</geronimo.import>
-                 </properties>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
 
     </dependencies>

Modified: geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml
(original)
+++ geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml
Mon Jan 23 17:18:06 2006
@@ -20,6 +20,8 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
         >
 
-    <gbean name="WebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableAxisBuilder"
/>
+    <gbean name="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder"
/>
+
+    <gbean name="UnavailableServiceReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableServiceReferenceBuilder"
/>
 
 </configuration>

Modified: geronimo/branches/lw_assemblies/configs/welcome-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/welcome-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/welcome-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/welcome-jetty/project.properties Mon Jan 23 17:18:06
2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/welcome-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/welcome-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/welcome-jetty/project.xml Mon Jan 23 17:18:06
2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.properties Mon Jan 23 17:18:06
2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Modified: geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.xml Mon Jan 23 17:18:06
2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
(original)
+++ geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
Mon Jan 23 17:18:06 2006
@@ -14,8 +14,7 @@
  * @version $Rev: 356097 $ $Date: 2005-12-11 17:29:03 -0800 (Sun, 11 Dec 2005) $
  */
 public class UnavailableModuleBuilder implements ModuleBuilder {
-    public static final GBeanInfo GBEAN_INFO;
-    
+
     public Module createModule(File plan, JarFile moduleFile) throws DeploymentException
{
     		return null; 
     }
@@ -40,6 +39,8 @@
         return null;
     }
     
+    public static final GBeanInfo GBEAN_INFO;
+
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(UnavailableModuleBuilder.class,
NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(ModuleBuilder.class);

Modified: geronimo/branches/lw_assemblies/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/project.properties (original)
+++ geronimo/branches/lw_assemblies/project.properties Mon Jan 23 17:18:06 2006
@@ -31,8 +31,8 @@
 plugins/*/project.xml,\
 applications/*/project.xml,\
 modules/*/project.xml,\
-#configs/*/project.xml,\
-#assemblies/*/project.xml,\
+configs/*/project.xml,\
+assemblies/*/project.xml,\
 openejb/modules/*/project.xml,\
 tranql/*/project.xml
 



Mime
View raw message