geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r371874 [2/2] - in /geronimo/trunk: assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var/config/ assemblies/minimal-tomcat-server/ assemblies/minimal...
Date Tue, 24 Jan 2006 09:41:48 GMT
Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Tue Jan 24 01:40:34 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/trunk/configs/tomcat-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.properties (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.properties Tue Jan 24 01:40:34 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/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Tue Jan 24 01:40:34 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/trunk/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/project.xml Tue Jan 24 01:40:34 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/trunk/configs/uddi-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.properties (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.properties Tue Jan 24 01:40:34 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/trunk/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.xml Tue Jan 24 01:40:34 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/trunk/configs/welcome-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.properties (original)
+++ geronimo/trunk/configs/welcome-jetty/project.properties Tue Jan 24 01:40:34 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/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Tue Jan 24 01:40:34 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/trunk/configs/welcome-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.properties (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.properties Tue Jan 24 01:40:34 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/trunk/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.xml Tue Jan 24 01:40:34 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/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
Tue Jan 24 01:40:34 2006
@@ -1,6 +1,9 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 import java.io.File;
 import java.util.jar.JarFile;
@@ -8,14 +11,16 @@
 import java.net.URI;
 
 /**
+ * @version $Rev: 356097 $ $Date: 2005-12-11 17:29:03 -0800 (Sun, 11 Dec 2005) $
  */
 public class UnavailableModuleBuilder implements ModuleBuilder {
+
     public Module createModule(File plan, JarFile moduleFile) throws DeploymentException
{
-        throw new DeploymentException("Module type unavailable");
+    		return null; 
     }
 
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
URI earConfigId, Object moduleContextInfo) throws DeploymentException {
-        throw new DeploymentException("Module type unavailable");
+    		return null;
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module) throws
DeploymentException {
@@ -32,5 +37,17 @@
 
     public String getSchemaNamespace() {
         return null;
+    }
+    
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(UnavailableModuleBuilder.class,
NameFactory.MODULE_BUILDER);
+        infoBuilder.addInterface(ModuleBuilder.class);
+	    GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+    
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
     }
 }



Mime
View raw message