servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r487357 - in /incubator/servicemix/trunk/platforms/geronimo: ./ dependencies/ deployer-service/src/main/java/org/apache/servicemix/geronimo/ deployer/ deployer/src/plan/ servicemix-service/ servicemix-service/src/main/java/org/apache/servic...
Date Thu, 14 Dec 2006 21:34:09 GMT
Author: gnodet
Date: Thu Dec 14 13:34:08 2006
New Revision: 487357

URL: http://svn.apache.org/viewvc?view=rev&rev=487357
Log:
Make geronimo plugins to build (well, currently you need to compile G locally)

Added:
    incubator/servicemix/trunk/platforms/geronimo/dependencies/
    incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml   (with props)
Modified:
    incubator/servicemix/trunk/platforms/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
    incubator/servicemix/trunk/platforms/geronimo/deployer/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml
    incubator/servicemix/trunk/platforms/geronimo/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/servicemix-service/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
    incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/servicemix/src/plan/geronimo-service.xml

Added: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml?view=auto&rev=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml (added)
+++ incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml Thu Dec 14 13:34:08
2006
@@ -0,0 +1,297 @@
+<?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.
+
+-->
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dependencies</artifactId>
+    <name>ServiceMix :: Geronimo :: Dependencies</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transformer-agent</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-corba-yoko</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>directory</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-realm</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-broker</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-security</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-corba-yoko</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>javamail</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-corba-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>hot-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-clustering-builder-wadi</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-clustering-wadi</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>welcome-jetty</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webconsole-jetty</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>remote-deploy-jetty</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>uddi-jetty</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>sharedlib</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/servicemix/trunk/platforms/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
(original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
Thu Dec 14 13:34:08 2006
@@ -22,6 +22,8 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.jar.JarFile;
@@ -200,8 +202,11 @@
         DeploymentContext context = null;
         try {
             Descriptor descriptor = (Descriptor) plan;
+            Map name = new HashMap();
+            name.put("Config", configId.toString());
             context = new DeploymentContext(configurationDir,
                             inPlaceDeployment ? DeploymentUtil.toFile(jarFile) : null, environment,
+                            new AbstractName(configId, name),
                             ConfigurationModuleType.SERVICE, kernel.getNaming(), ConfigurationUtil
                                             .getConfigurationManager(kernel), repositories);
             if (descriptor.getComponent() != null) {

Modified: incubator/servicemix/trunk/platforms/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer/pom.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer/pom.xml Thu Dec 14 13:34:08 2006
@@ -34,19 +34,23 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <!-- For build ordering -->
+        <!-- Needed to download dependencies -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>dependencies</artifactId>
+            <version>3.1-incubating-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.geronimo</groupId>
             <artifactId>deployer-service</artifactId>
             <version>${servicemix-version}</version>
-            <scope>provided</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.geronimo</groupId>
             <artifactId>servicemix</artifactId>
             <version>${servicemix-version}</version>
-            <scope>provided</scope>
             <type>car</type>
         </dependency>
         <dependency>
@@ -54,21 +58,6 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -90,12 +79,7 @@
                 <version>${car-maven-plugin-version}</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <planFileName>geronimo-service.xml</planFileName>
-                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/deployer-service/${pom.version}/deployer-service-${pom.version}.jar</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml Thu
Dec 14 13:34:08 2006
@@ -21,41 +21,6 @@
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
-    <environment>
-        <moduleId>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>deployer</artifactId>
-            <version>${servicemix-version}</version>
-            <type>car</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.servicemix.geronimo</groupId>
-                <artifactId>servicemix</artifactId>
-                <version>${servicemix-version}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>geronimo</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>${geronimo-version}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>geronimo</groupId>
-                <artifactId>j2ee-server</artifactId>
-                <version>${geronimo-version}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>geronimo</groupId>
-                <artifactId>j2ee-deployer</artifactId>
-                <version>${geronimo-version}</version>
-                <type>car</type>
-            </dependency>
-        </dependencies>
-    </environment>
-
     <gbean name="ServiceMixConfigBuilder" class="org.apache.servicemix.geronimo.ServiceMixConfigBuilder">
         <reference name="Repositories" />
         <xml-attribute name="defaultEnvironment">

Modified: incubator/servicemix/trunk/platforms/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/pom.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/pom.xml Thu Dec 14 13:34:08 2006
@@ -35,14 +35,16 @@
     <packaging>pom</packaging>
   
     <properties>
-        <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
         <geronimoVersion>${geronimo-version}</geronimoVersion>
+        <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
     </properties>
     
     <modules>
         <module>servicemix-service</module>
         <module>deployer-service</module>
+        <module>dependencies</module>
         <module>servicemix</module>
         <module>deployer</module>
     </modules>

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix-service/pom.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix-service/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix-service/pom.xml Thu Dec 14 13:34:08
2006
@@ -43,21 +43,6 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
     </dependencies>
 
 </project>

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
(original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixGBean.java
Thu Dec 14 13:34:08 2006
@@ -28,8 +28,6 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.transaction.context.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.servicemix.jbi.container.ComponentEnvironment;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.apache.servicemix.jbi.container.ServiceAssemblyEnvironment;
@@ -45,7 +43,7 @@
     private JBIContainer container;
     private String name;
     private String directory;
-    private TransactionContextManager transactionContextManager;
+    private TransactionManager transactionManager;
     private Kernel kernel;
     private Collection jndiResources;
 
@@ -56,9 +54,9 @@
         infoFactory.addInterface(Container.class);
         infoFactory.addAttribute("name", String.class, true);
         infoFactory.addAttribute("directory", String.class, true);
-        infoFactory.addReference("transactionContextManager", TransactionContextManager.class);
+        infoFactory.addReference("transactionManager", TransactionManager.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
-        infoFactory.setConstructor(new String[]{"name", "directory", "transactionContextManager",
"kernel"});
+        infoFactory.setConstructor(new String[]{"name", "directory", "transactionManager",
"kernel"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 
@@ -68,11 +66,11 @@
 
     public ServiceMixGBean(String name, 
     					   String directory, 
-    					   TransactionContextManager transactionContextManager, 
+    					   TransactionManager transactionManager, 
     					   Kernel kernel) {
         this.name = name;
         this.directory = directory;
-        this.transactionContextManager = transactionContextManager;
+        this.transactionManager = transactionManager;
         this.kernel = kernel;
         if (log.isDebugEnabled()) {
             log.debug("ServiceMixGBean created");
@@ -154,22 +152,15 @@
         JBIContainer container = new JBIContainer();
         container.setName(name);
         container.setRootDir(directory);
-        container.setTransactionManager(getTransactionManager());
+        container.setTransactionManager(transactionManager);
         container.setMonitorInstallationDirectory(false);
         container.setMonitorDeploymentDirectory(false);
         return container;
     }
     
-    public TransactionManager getTransactionManager() {
-        if (transactionContextManager != null) {
-            return new GeronimoTransactionManager(transactionContextManager);
-        }
-        return null;
-    }
-    
     public void register(Component component) throws Exception {
         ComponentNameSpace cns = new ComponentNameSpace(container.getName(), component.getName());
-    	ComponentContextImpl context = new ComponentContextImpl(container, cns);
+        ComponentContextImpl context = new ComponentContextImpl(container, cns);
         ComponentEnvironment env = new ComponentEnvironment();
         env.setComponentRoot(new File(component.getRootDir()));
         env.setInstallRoot(new File(component.getInstallDir()));

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml Thu Dec 14 13:34:08 2006
@@ -34,27 +34,41 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <!-- Needed to download dependencies -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>dependencies</artifactId>
+            <version>3.1-incubating-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- For build ordering -->
         <dependency>
             <groupId>org.apache.servicemix.geronimo</groupId>
             <artifactId>servicemix-service</artifactId>
             <version>3.1-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>3.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>3.1-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
-            <type>car</type>
             <scope>provided</scope>
+            <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -76,12 +90,7 @@
                 <version>${car-maven-plugin-version}</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <planFileName>geronimo-service.xml</planFileName>
-                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/servicemix-service/${pom.version}/servicemix-service-${pom.version}.jar</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix/src/plan/geronimo-service.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix/src/plan/geronimo-service.xml?view=diff&rev=487357&r1=487356&r2=487357
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix/src/plan/geronimo-service.xml
(original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix/src/plan/geronimo-service.xml
Thu Dec 14 13:34:08 2006
@@ -25,8 +25,8 @@
     <gbean name="ServiceMixJBIContainer" class="org.apache.servicemix.geronimo.ServiceMixGBean">
         <attribute name="name">servicemix</attribute>
         <attribute name="directory">var/servicemix</attribute>
-        <reference name="transactionContextManager">
-          <name>TransactionContextManager</name>
+        <reference name="transactionManager">
+          <name>TransactionManager</name>
         </reference>
     </gbean>
 



Mime
View raw message