servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r398558 [1/2] - in /incubator/servicemix/trunk: ./ geronimo-1.0/ geronimo-1.0/servicemix-gbean/ geronimo-1.0/servicemix-gbean/src/ geronimo-1.0/servicemix-gplan/ geronimo-1.0/servicemix-gplan/src/ geronimo-1.1/ geronimo-1.1/configs/ geronim...
Date Mon, 01 May 2006 09:27:14 GMT
Author: gnodet
Date: Mon May  1 02:27:08 2006
New Revision: 398558

URL: http://svn.apache.org/viewcvs?rev=398558&view=rev
Log:
Include Geronimo 1.1 integration

Added:
    incubator/servicemix/trunk/geronimo-1.0/
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/
      - copied from r397972, incubator/servicemix/trunk/servicemix-gbean/
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/maven.xml
      - copied unchanged from r398555, incubator/servicemix/trunk/servicemix-gbean/maven.xml
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/pom.xml
      - copied unchanged from r398555, incubator/servicemix/trunk/servicemix-gbean/pom.xml
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml
      - copied unchanged from r398555, incubator/servicemix/trunk/servicemix-gbean/project.xml
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/src/
      - copied from r398555, incubator/servicemix/trunk/servicemix-gbean/src/
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/
      - copied from r397972, incubator/servicemix/trunk/servicemix-gplan/
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/maven.xml
      - copied unchanged from r398555, incubator/servicemix/trunk/servicemix-gplan/maven.xml
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties
      - copied, changed from r398555, incubator/servicemix/trunk/servicemix-gplan/project.properties
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml
      - copied unchanged from r398555, incubator/servicemix/trunk/servicemix-gplan/project.xml
    incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/src/
      - copied from r398555, incubator/servicemix/trunk/servicemix-gplan/src/
    incubator/servicemix/trunk/geronimo-1.1/
    incubator/servicemix/trunk/geronimo-1.1/configs/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/   (with props)
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/   (with props)
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/maven.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.properties
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/maven.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.properties
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/resources/
    incubator/servicemix/trunk/geronimo-1.1/etc/
    incubator/servicemix/trunk/geronimo-1.1/etc/explicit_versions.properties
    incubator/servicemix/trunk/geronimo-1.1/etc/project.properties
    incubator/servicemix/trunk/geronimo-1.1/etc/project.xml
    incubator/servicemix/trunk/geronimo-1.1/modules/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/   (with props)
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/   (with props)
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/java/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/java/org/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/java/org/apache/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/java/org/apache/geronimo/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/resources/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Component.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Container.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceAssembly.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceMixGBean.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/SharedLibrary.java
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/resources/
    incubator/servicemix/trunk/geronimo-1.1/plugin-repo/
    incubator/servicemix/trunk/geronimo-1.1/plugin-repo/geronimo-plugins.xml
    incubator/servicemix/trunk/geronimo-1.1/project.properties
    incubator/servicemix/trunk/geronimo-1.1/project.xml
Removed:
    incubator/servicemix/trunk/servicemix-gbean/
    incubator/servicemix/trunk/servicemix-gplan/
Modified:
    incubator/servicemix/trunk/project.properties

Copied: incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties (from r398555, incubator/servicemix/trunk/servicemix-gplan/project.properties)
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties?p2=incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties&p1=incubator/servicemix/trunk/servicemix-gplan/project.properties&r1=398555&r2=398558&rev=398558&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/project.properties (original)
+++ incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties Mon May  1 02:27:08 2006
@@ -24,4 +24,4 @@
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 geronimo_packaging_plugin_version=1.2.0-3
-geronimo_version=1.2-SNAPSHOT
+geronimo_version=1.0

Propchange: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May  1 02:27:08 2006
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May  1 02:27:08 2006
@@ -0,0 +1 @@
+target

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/maven.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/maven.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/maven.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $ -->
+
+<project default="default"
+         xmlns:j="jelly:core">
+
+  <goal name="default">
+    <attainGoal name="car:install"/>
+  </goal>
+
+  <goal name="nightly" prereqs="clean, car:install, car:deploy"/>
+  
+  <postGoal name="car:package">
+    <copy todir="${basedir}/target/repository/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car">
+      <fileset dir="${basedir}/src/resources" />
+    </copy>
+  </postGoal>
+    
+  <goal name="deploy">
+    <j:if test="${geronimo.home == null}">
+      <echo>Set the geronimo.home property</echo>
+    </j:if>
+    <j:if test="${geronimo.home != null}">
+      <j:forEach var="artifact" items="${pom.artifacts}">
+        <j:set var="dependency" value="${artifact.dependency}"/>
+        <j:if test="${dependency.getProperty('geronimo.include') == 'true'}">
+            <j:set var="groupId" value="${dependency.groupId}"/>
+            <copy todir="${geronimo.home}/repository/${groupId.replace('.','/')}/${dependency.artifactId}/${dependency.version}" file="${artifact.path}"/>
+        </j:if>
+      </j:forEach>
+      <java jar="${geronimo.home}/bin/deployer.jar" fork="true">
+        <arg value="deploy"/>
+        <arg value="${basedir}/target/plan/plan.xml"/>
+      </java>
+    </j:if>
+  </goal>
+    
+</project>

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.properties?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.properties (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.properties Mon May  1 02:27:08 2006
@@ -0,0 +1,24 @@
+##
+##
+##   Copyright 2005 The Apache Software Foundation
+##
+##   Licensed 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: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $
+##
+
+maven.multiproject.type=car
+
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed 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: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+    <id>servicemix-deployer</id>
+    <name>ServiceMix Deployer configuration</name>
+
+    <dependencies>
+        <!-- dependency on deployer -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-packaging-plugin</artifactId>
+            <version>${geronimo_packaging_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+
+        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix</artifactId>
+            <version>${servicemix_version}</version>
+            <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>geronimo-servicemix-builder</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>${spring_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+		    <dependency>
+			      <groupId>org.apache.xbean</groupId>
+			      <artifactId>xbean-spring</artifactId>
+			      <version>${xbean_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+			      </properties>
+		    </dependency>
+        
+    </dependencies>
+</project>
+

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed 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: 388257 $ $Date: 2006-03-23 21:12:17 +0100 (jeu., 23 mars 2006) $ -->
+
+<!--
+Configuration for ServiceMix deployer.
+-->
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="ServiceMixConfigBuilder" class="org.apache.geronimo.servicemix.ServiceMixConfigBuilder">
+        <reference name="Repositories">
+            <!--<gbean-name>*:name=Repository,*</gbean-name>-->
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>servicemix</artifactId>
+                        <!--<version>${pom.currentVersion}</version>-->
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</configuration>

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+  <configuration>
+    <name>ServiceMix Deployer 3.0-SNAPSHOT</name>
+    <config-id>incubator-servicemix/servicemix-deployer/3.0-SNAPSHOT/car</config-id>
+    <category>Integration</category>
+    <description>Apache ServiceMix is an open source distributed Enterprise Service Bus (ESB) and SOA toolkit built from the ground up on the semantics and APIs of the Java Business Integration (JBI) specification JSR 208 and released under the Apache license.
+
+This plugin installs the ServiceMix Deployer.</description>
+    <license osi-approved="true">ASL 2</license>
+    <geronimo-version>1.1-SNAPSHOT</geronimo-version>
+    <geronimo-version>1.1</geronimo-version>
+    <dependency>geronimo/j2ee-deployer//car</dependency>
+    <dependency>incubator-servicemix/servicemix//car</dependency>
+    <dependency>incubator-servicemix/servicemix-jbi//jar</dependency>
+    <dependency>incubator-servicemix/servicemix-core//jar</dependency>
+    <dependency>incubator-servicemix/geronimo-servicemix//jar</dependency>
+    <dependency>incubator-servicemix/geronimo-servicemix-builder//jar</dependency>
+    <dependency>springframework/spring//jar</dependency>
+    <dependency>org.apache.xbean/xbean-spring//jar</dependency>
+  </configuration>
+  <source-repository>http://cvs.apache.org/repository/</source-repository>
+</geronimo-plugin>

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/maven.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/maven.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/maven.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $ -->
+
+<project default="default"
+         xmlns:j="jelly:core">
+
+  <goal name="default">
+    <attainGoal name="car:install"/>
+  </goal>
+
+  <goal name="nightly" prereqs="clean, car:install, car:deploy"/>
+  
+  <postGoal name="car:package">
+    <copy todir="${basedir}/target/repository/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car">
+      <fileset dir="${basedir}/src/resources" />
+    </copy>
+  </postGoal>
+    
+  <goal name="deploy">
+    <j:if test="${geronimo.home == null}">
+      <echo>Set the geronimo.home property</echo>
+    </j:if>
+    <j:if test="${geronimo.home != null}">
+      <j:forEach var="artifact" items="${pom.artifacts}">
+        <j:set var="dependency" value="${artifact.dependency}"/>
+        <j:if test="${dependency.getProperty('geronimo.include') == 'true'}">
+            <j:set var="groupId" value="${dependency.groupId}"/>
+            <copy todir="${geronimo.home}/repository/${groupId.replace('.','/')}/${dependency.artifactId}/${dependency.version}" file="${artifact.path}"/>
+        </j:if>
+      </j:forEach>
+      <java jar="${geronimo.home}/bin/deployer.jar" fork="true">
+        <arg value="deploy"/>
+        <arg value="${basedir}/target/plan/plan.xml"/>
+      </java>
+    </j:if>
+  </goal>
+    
+</project>

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.properties?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.properties (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.properties Mon May  1 02:27:08 2006
@@ -0,0 +1,24 @@
+##
+##
+##   Copyright 2005 The Apache Software Foundation
+##
+##   Licensed 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: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $
+##
+
+maven.multiproject.type=car
+
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed 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: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+    <id>servicemix</id>
+    <name>ServiceMix configuration</name>
+
+    <dependencies>
+        <!-- dependency on deployer -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-packaging-plugin</artifactId>
+            <version>${geronimo_packaging_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+
+        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>${activemq_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>${activeio_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>${spring_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+             </properties>
+        </dependency>
+		    <dependency>
+			      <groupId>org.apache.xbean</groupId>
+			      <artifactId>xbean-spring</artifactId>
+			      <version>${xbean_version}</version>
+			      <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.include>true</geronimo.include>
+			      </properties>
+		    </dependency>
+		    <dependency>
+			      <groupId>org.apache.xbean</groupId>
+			      <artifactId>xbean-server</artifactId>
+			      <version>${xbean_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+		    </dependency>
+		    <dependency>
+			      <groupId>org.apache.xbean</groupId>
+			      <artifactId>xbean-kernel</artifactId>
+			      <version>${xbean_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+		    </dependency>
+    		<dependency>
+      			<groupId>wsdl4j</groupId>
+      			<artifactId>wsdl4j</artifactId>
+      			<version>${wsdl4j_version}</version>
+      			<properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+      			</properties>
+    		</dependency>
+		    <dependency>
+			      <groupId>backport-util-concurrent</groupId>
+			      <artifactId>backport-util-concurrent</artifactId>
+			      <version>${backport_util_concurrent_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+		    </dependency>
+    		<dependency>
+      			<groupId>woodstox</groupId>
+      			<artifactId>wstx-asl</artifactId>
+      			<version>${woodstox_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+    		</dependency>
+        <dependency>
+            <groupId>jencks</groupId>
+            <artifactId>jencks</artifactId>
+            <version>${jencks_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>${commons_beanutils_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+        </dependency>
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>${wsdl4j_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.include>true</geronimo.include>
+			      </properties>
+        </dependency>
+        
+    </dependencies>
+</project>
+

Added: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed 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: 388257 $ $Date: 2006-03-23 21:12:17 +0100 (jeu., 23 mars 2006) $ -->
+
+<!--
+Configuration for ServiceMix deployer.
+-->
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="ServiceMixThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">5000</attribute>
+        <attribute name="poolSize">30</attribute>
+        <attribute name="poolName">ServiceMixThreadPool</attribute>
+    </gbean>
+
+    <gbean name="ServiceMixWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <reference name="SyncPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="StartPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="ScheduledPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="TransactionContextManager">
+            <name>TransactionContextManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ServiceMixJBIContainer" class="org.apache.geronimo.servicemix.ServiceMixGBean">
+        <attribute name="name">servicemix</attribute>
+        <attribute name="directory">var/servicemix</attribute>
+        <reference name="transactionContextManager">
+          <name>TransactionContextManager</name>
+        </reference>
+        <reference name="workManager">
+          <name>ServiceMixWorkManager</name>
+        </reference>
+    </gbean>
+
+</configuration>

Added: incubator/servicemix/trunk/geronimo-1.1/etc/explicit_versions.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/etc/explicit_versions.properties?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/etc/explicit_versions.properties (added)
+++ incubator/servicemix/trunk/geronimo-1.1/etc/explicit_versions.properties Mon May  1 02:27:08 2006
@@ -0,0 +1,94 @@
+activeio///=2.0-r118
+activemq///=3.2.4-SNAPSHOT
+geronimo///=1.1-SNAPSHOT
+openejb///=2.1-SNAPSHOT
+tranql/tranql//jar=1.2.1
+tranql/connector//=1.1
+tranql///=1.1
+
+org.apache.geronimo.spec///=1.0
+#org.apache.geronimo.spec/geronimo-activation_1.0.2_spec//=1.1-SNAPSHOT
+geronimo-spec/geronimo-spec-corba_2.3//=1.0-SNAPSHOT
+org.apache.geronimo.spec/geronimo-javamail_1.3.1_spec//=1.1-SNAPSHOT
+#org.apache.geronimo.spec///=1.1-SNAPSHOT
+
+ant///=1.6.5
+antlr///=2.7.2
+directory///=0.9.2
+asm///=1.4.3
+directory-asn1///=0.3.2
+axis///=1.4-356167
+castor///=0.9.5.3
+cglib///=2.1_3
+commons_beanutils///=1.6.1
+commons_cli///=1.0
+commons_collections///=3.1
+commons_digester///=1.6
+commons_discovery///=0.2
+commons_el///=1.0
+commons_io///=1.0
+commons_fileupload///=1.1-dev
+commons_httpclient///=2.0.1
+commons_jelly///=1.0
+commons_jxpath///=1.1
+commons_lang///=2.0
+commons_logging///=1.0.4
+commons_modeler///=1.1
+commons_primitives///=20041207.202534
+commons_pool///=1.2
+concurrent///=1.3.4
+daytrader///=1.1-SNAPSHOT
+derby///=10.1.1.0
+dom4j///=1.4
+dwr///=1.0
+eclipse_compiler///=3.0.1
+howl///=0.1.11
+#security:
+hsqldb///=1.7.2.2
+jasper///=5.5.12
+javacc///=2.1
+jdbm///=0.20-dev
+jdom///=1.0
+jelly_velocity_tags///=1.0
+jetty///=5.1.10
+jstl///=1.1.1
+juddi///=0.9rc4
+junit///=3.8.1
+kerberos_common///=0.5
+kerberos_protocols///=0.5
+ldap_protocols///=0.9.2
+log4j///=1.2.8
+maven_itest_plugin///=1.0
+maven///=1.0.2
+mina///=0.7.3
+mockobjects///=0.09
+mx4j///=3.0.1
+oro///=2.0.8
+pluto///=1.0.1
+portlet_api///=1.0
+p2psockets///=1.1.2
+regexp///=1.3
+scout///=0.5
+slf4j///=1.0-beta7
+standard_taglibs///=1.1.1
+stax/stax//jar=1.1.1-dev
+stax/stax_api//jar=1.0
+tomcat_ajp///=5.5.9
+tomcat///=5.5.9
+tomcat_servlet_examples///=5.5.15
+tomcat_jsp_examples///=5.5.15
+wadi///=2.0M1
+wadi_activecluster///=1.2-20051115174934
+wadi_spring///=1.2.5
+velocity///=1.4
+wsdl4j///=1.5.2
+xerces/xercesImpl//jar=2.6.2
+xerces/xmlParserAPIs//jar=2.2.1
+xfire///=20050202
+xml_apis///=1.0.b2
+xml_resolver///=1.1
+xml_parser_apis///=2.2.1
+xmlbeans///=2.0.0
+xmlpull///=1.1.3.4d_b4_min
+xpp3///=1.1.3.3
+xstream///=1.1.3

Added: incubator/servicemix/trunk/geronimo-1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/etc/project.properties?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/etc/project.properties (added)
+++ incubator/servicemix/trunk/geronimo-1.1/etc/project.properties Mon May  1 02:27:08 2006
@@ -0,0 +1,27 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# Licensed 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: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+
+geronimo_packaging_plugin_version=1.1.0-7
+geronimo_assembly_plugin_version=1.1.0-11
+geronimo_deployment_plugin_version=1.1.0-2
+geronimo_dependency_plugin_version=1.1.0-3
+
+servicemix_version=${pom.currentVersion}
+geronimo_version=1.1-SNAPSHOT

Added: incubator/servicemix/trunk/geronimo-1.1/etc/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/etc/project.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/etc/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/etc/project.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed 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: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+    <id>servicemix-geronimo-parent</id>
+    <name>ServiceMix configuration</name>
+
+</project>

Propchange: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May  1 02:27:08 2006
@@ -0,0 +1,3 @@
+target
+.classpath
+.project

Propchange: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May  1 02:27:08 2006
@@ -0,0 +1,3 @@
+target
+.classpath
+.project

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2003-2004 The Apache Software Foundation
+
+    Licensed 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: 356097 $ $Date: 2005-12-12 02:29:03 +0100 (lun., 12 déc. 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: ServiceMix :: Builder</name>
+    <id>geronimo-servicemix-builder</id>
+    <shortDescription>ServiceMix Deployer</shortDescription>
+    <description>Geronimo ServiceMix Deployer</description>
+    <url>http://geronimo.apache.org/modules/servicemix-builder</url>
+    <siteDirectory>/www/geronimo.apache.org/modules/servicemix-builder</siteDirectory>
+    <distributionDirectory>/www/www.apache.org/projects/geronimo/builds/servicemix-builder</distributionDirectory>
+
+    <package>org.apache.geronimo.servicemix</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- Module Dependencies -->
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>${servicemix_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+            <url>http://jakarta.apache.org/commons/logging/</url>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>${spring_version}</version>
+        </dependency>
+		    <dependency>
+			      <groupId>org.apache.xbean</groupId>
+			      <artifactId>xbean-spring</artifactId>
+			      <version>${xbean_version}</version>
+			      <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+			      </properties>
+		    </dependency>
+        
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java Mon May  1 02:27:08 2006
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.geronimo.servicemix;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import javax.management.MalformedObjectNameException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.ConfigurationBuilder;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.Version;
+import org.apache.servicemix.jbi.deployment.Descriptor;
+import org.apache.servicemix.jbi.deployment.DescriptorFactory;
+import org.apache.servicemix.jbi.deployment.ServiceUnit;
+import org.apache.servicemix.jbi.deployment.SharedLibraryList;
+
+public class ServiceMixConfigBuilder implements ConfigurationBuilder {
+
+    private static final Log log = LogFactory.getLog(ServiceMixConfigBuilder.class);
+
+    private final Environment defaultEnvironment;
+    private final Collection repositories;
+    private final Kernel kernel;
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ServiceMixConfigBuilder.class, NameFactory.CONFIG_BUILDER);
+        infoFactory.addInterface(ConfigurationBuilder.class);
+        infoFactory.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoFactory.addAttribute("kernel", Kernel.class, false);
+        infoFactory.addReference("Repositories", Repository.class, "Repository");
+        infoFactory.setConstructor(new String[]{"defaultEnvironment", "Repositories", "kernel"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+    public ServiceMixConfigBuilder(Environment defaultEnvironment,
+                                   Collection repositories,
+                                   Kernel kernel) {
+        this.defaultEnvironment = defaultEnvironment;
+        this.repositories = repositories;
+        this.kernel = kernel;
+    }
+
+    /**
+     * Builds a deployment plan specific to this builder from a planFile and/or
+     * module if this builder can process it.
+     * @param planFile the deployment plan to examine; can be null
+     * @param module the URL of the module to examine; can be null
+     * @return the deployment plan, or null if this builder can not handle the module
+     * @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
+     */
+    public Object getDeploymentPlan(File planFile, JarFile module) throws DeploymentException {
+        log.debug("Checking for ServiceMix deployment.");
+        System.err.println("Checking for ServiceMix deployment.");
+        if (module == null) {
+            return null;
+        }
+        
+        // Check that the jbi descriptor is present
+        try {
+            URL url = DeploymentUtil.createJarURL(module, "META-INF/jbi.xml");
+            Descriptor descriptor = DescriptorFactory.buildDescriptor(url);
+            if (descriptor == null) {
+            	return null;
+            }
+            DescriptorFactory.checkDescriptor(descriptor);
+            return descriptor;
+        } catch (Exception e) {
+            log.debug("Not a ServiceMix deployment: no jbi.xml found.", e);
+            //no jbi.xml, not for us
+            return null;
+        }
+    }
+
+    /**
+     * Checks what configuration URL will be used for the provided module.
+     * @param plan the deployment plan
+     * @param module the module to build
+     * @return the ID that will be used for the Configuration
+     * @throws IOException if there was a problem reading or writing the files
+     * @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
+     */
+    public Artifact getConfigurationID(Object plan, JarFile module) throws IOException, DeploymentException {
+        Descriptor descriptor = (Descriptor) plan;
+        if (descriptor.getComponent() != null) {
+            return new Artifact("servicemix-components", descriptor.getComponent().getIdentification().getName(), (Version) null, "car");
+        } else if (descriptor.getServiceAssembly() != null) {
+            return new Artifact("servicemix-assemblies", descriptor.getServiceAssembly().getIdentification().getName(), (Version) null,  "car");
+        } else if (descriptor.getSharedLibrary() != null) {
+            return new Artifact("servicemix-libraries", descriptor.getSharedLibrary().getIdentification().getName(), Double.toString(descriptor.getSharedLibrary().getVersion()), "car");
+        } else {
+            throw new DeploymentException("Unable to construct configuration ID " + module.getName() + ": unrecognized jbi package. Should be a component, assembly or library.");
+        }
+    }
+
+    /**
+     * Build a configuration from a local file
+     *
+     * @param inPlaceDeployment
+     * @param configId
+     * @param plan
+     * @param earFile
+     * @param configurationStores
+     * @param artifactResolver
+     * @param targetConfigurationStore
+     * @return the DeploymentContext information
+     * @throws IOException if there was a problem reading or writing the files
+     * @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
+     */
+    public DeploymentContext buildConfiguration(
+                boolean inPlaceDeployment, 
+                Artifact configId, 
+                Object plan, 
+                JarFile jarFile, 
+                Collection configurationStores, 
+                ArtifactResolver artifactResolver, 
+                ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
+        if (plan == null) {
+            log.warn("Expected a Descriptor but received null");
+            return null;
+        }
+        if (plan instanceof Descriptor == false) {
+            log.warn("Expected a Descriptor but received a " + plan.getClass().getName());
+            return null;
+        }
+        File configurationDir;
+        try {
+            configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
+        } catch (ConfigurationAlreadyExistsException e) {
+            throw new DeploymentException(e);
+        }
+
+        Environment environment = new Environment(); 
+        environment.setConfigId(configId);
+        EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+        
+        DeploymentContext context = null;
+        try {
+            Descriptor descriptor = (Descriptor) plan;
+            context = new DeploymentContext(
+                            configurationDir, 
+                            inPlaceDeployment ? DeploymentUtil.toFile(jarFile) : null,
+                            environment,
+                            ConfigurationModuleType.SERVICE, 
+                            kernel.getNaming(),
+                            repositories,
+                            configurationStores,
+                            artifactResolver);
+            if (descriptor.getComponent() != null) {
+            	buildComponent(descriptor, context, jarFile);
+            } else if (descriptor.getServiceAssembly() != null) {
+            	buildServiceAssembly(descriptor, context, jarFile);
+            } else if (descriptor.getSharedLibrary() != null) {
+            	buildSharedLibrary(descriptor, context, jarFile);
+            } else {
+            	throw new IllegalStateException("Invalid jbi descriptor");
+            }
+        } catch (Exception e) {
+            if (context != null) {
+                context.close();
+            }
+            DeploymentUtil.recursiveDelete(configurationDir);
+            throw new DeploymentException("Unable to deploy", e);
+        }
+        
+        return context;
+    }
+
+    protected void buildComponent(Descriptor descriptor, DeploymentContext context, JarFile module) throws Exception {
+        Environment environment = context.getConfiguration().getEnvironment();
+    	// Unzip the component
+    	File targetDir = new File(context.getBaseDir(), "install");
+    	targetDir.mkdirs();
+    	unzip(context, module, new URI("install/"));
+    	// Create workspace dir
+    	File workDir = new File(context.getBaseDir(), "workspace");
+    	workDir.mkdirs();
+    	// Create the bootstrap and perform installation
+    	// TODO:  Create the bootstrap and perform installation
+    	// Add classpath entries
+    	if ("self-first".equals(descriptor.getComponent().getComponentClassLoaderDelegation())) {
+            context.getConfiguration().getEnvironment().setInverseClassLoading(true);
+    	}
+    	SharedLibraryList[] slList = descriptor.getComponent().getSharedLibraries();
+    	if (slList != null) {
+    		for (int i = 0; i < slList.length; i++) {
+                Artifact sl = new Artifact("servicemix-libraries", slList[i].getName(), slList[i].getVersion(), "car");
+                environment.addDependency(sl, ImportType.CLASSES);
+			}
+    	}
+    	if (descriptor.getComponent().getComponentClassPath() != null) {
+	    	String[] pathElements = descriptor.getComponent().getComponentClassPath().getPathElements();
+	    	if (pathElements != null) {
+		    	for (int i = 0; i < pathElements.length; i++) {
+		    		// We can not add includes directly, so move the file and include it
+		    		File include = new File(targetDir, pathElements[i]);
+		    		File temp = new File(workDir, pathElements[i]);
+		    		if (!include.isFile()) {
+		    			throw new Exception("Classpath element '" + pathElements[i] + "' not found");
+		    		}
+		    		temp.getParentFile().mkdirs();
+		    		include.renameTo(temp);
+		    		context.addInclude(new URI("install/").resolve(pathElements[i]), temp);
+		    		temp.delete();
+				}
+	    	}
+    	}
+        // Create the JBI deployment managed object
+        Properties props = new Properties();
+        props.put("jbiType", "JBIComponent");
+        props.put("name", descriptor.getComponent().getIdentification().getName());
+        AbstractName name = new AbstractName(environment.getConfigId(), props);
+        GBeanData gbeanData = new GBeanData(name, Component.GBEAN_INFO);
+        gbeanData.setAttribute("name", descriptor.getComponent().getIdentification().getName());
+        gbeanData.setAttribute("description", descriptor.getComponent().getIdentification().getDescription());
+        gbeanData.setAttribute("type", descriptor.getComponent().getType());
+        gbeanData.setAttribute("className", descriptor.getComponent().getComponentClassName());
+        gbeanData.setReferencePattern("container", getContainerObjectName());
+        context.addGBean(gbeanData);
+    }
+    
+    protected void buildServiceAssembly(Descriptor descriptor, DeploymentContext context, JarFile module) throws Exception {
+        Environment environment = context.getConfiguration().getEnvironment();
+    	// Unzip the component
+    	File targetDir = new File(context.getBaseDir(), "install");
+    	targetDir.mkdirs();
+    	unzip(context, module, new URI("install/"));
+    	// Unzip SUs
+    	ServiceUnit[] sus = descriptor.getServiceAssembly().getServiceUnits();
+    	for (int i = 0; i < sus.length; i++) {
+			String name = sus[i].getIdentification().getName();
+			String zip  = sus[i].getTarget().getArtifactsZip();
+			String comp = sus[i].getTarget().getComponentName();
+			unzip(context, new JarFile(new File(targetDir, zip)), new URI("sus/" + comp + "/" + name + "/"));
+	        // Deploy the SU on the component
+			// TODO: deploy
+			// Add component config as a dependency
+            Artifact sl = new Artifact("servicemix-components", comp, (Version) null, "car");
+            environment.addDependency(sl, ImportType.ALL);
+		}
+        // Create the JBI deployment managed object
+        Properties props = new Properties();
+        props.put("jbiType", "JBIServiceAssembly");
+        props.put("name", descriptor.getServiceAssembly().getIdentification().getName());
+        AbstractName name = new AbstractName(environment.getConfigId(), props);
+        GBeanData gbeanData = new GBeanData(name, ServiceAssembly.GBEAN_INFO);
+        gbeanData.setAttribute("name", descriptor.getServiceAssembly().getIdentification().getName());
+        gbeanData.setReferencePattern("container", getContainerObjectName());
+    	for (int i = 0; i < sus.length; i++) {
+			String comp = sus[i].getTarget().getComponentName();
+            gbeanData.addDependency(getComponentName(comp));
+    	}
+        context.addGBean(gbeanData);
+    }
+    
+    protected void buildSharedLibrary(Descriptor descriptor, DeploymentContext context, JarFile module) throws Exception {
+    	throw new UnsupportedOperationException("Not implemented");
+    }
+    
+    protected void unzip(DeploymentContext context, JarFile module, URI targetUri) throws IOException {
+        Enumeration entries = module.entries();
+        while (entries.hasMoreElements()) {
+            ZipEntry entry = (ZipEntry) entries.nextElement();
+            URI target = targetUri.resolve(entry.getName());
+            context.addFile(target, module, entry);
+        }
+    }
+    
+    protected AbstractName getContainerObjectName() {
+        AbstractNameQuery query = new AbstractNameQuery(Container.class.getName());
+        Set names = kernel.listGBeans(query);
+        return (AbstractName) names.iterator().next();
+    }
+    
+    protected AbstractNameQuery getComponentName(String name) throws MalformedObjectNameException {
+        URI uri = URI.create("servicemix-components/" + name + "//car?jbiType=JBIComponent");
+        return new AbstractNameQuery(uri);
+    }
+
+}

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml Mon May  1 02:27:08 2006
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2003-2004 The Apache Software Foundation
+
+    Licensed 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: 356097 $ $Date: 2005-12-12 02:29:03 +0100 (lun., 12 déc. 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: ServiceMix</name>
+    <id>geronimo-servicemix</id>
+    <shortDescription>Geronimo ServiceMix</shortDescription>
+    <description>Geronimo ServiceMix</description>
+    <url>http://geronimo.apache.org/modules/servicemix</url>
+    <siteDirectory>/www/geronimo.apache.org/modules/servicemix</siteDirectory>
+    <distributionDirectory>/www/www.apache.org/projects/geronimo/builds/servicemix</distributionDirectory>
+
+    <package>org.apache.geronimo.servicemix</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- Module Dependencies -->
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>${servicemix_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>incubator-servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+            <url>http://jakarta.apache.org/commons/logging/</url>
+        </dependency>
+        
+        <dependency>
+            <groupId>jencks</groupId>
+            <artifactId>jencks</artifactId>
+            <version>${jencks_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>${geronimo_spec_j2ee_connector_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>${geronimo_spec_jta_version}</version>
+        </dependency>
+        
+    </dependencies>
+
+</project>

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Component.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Component.java?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Component.java (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Component.java Mon May  1 02:27:08 2006
@@ -0,0 +1,119 @@
+package org.apache.geronimo.servicemix;
+
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+
+public class Component implements GBeanLifecycle {
+
+    private static final Log log = LogFactory.getLog(Component.class);
+    
+    private String name;
+    private String description;
+    private String type;
+	private String className;
+	private Container container;
+	private URI rootDir;
+	private URI installDir;
+	private URI workDir;
+	private javax.jbi.component.Component component;
+	private ClassLoader classLoader;
+	
+	public Component(String name, 
+					 String description,
+					 String type, 
+					 String className, 
+					 Container container,
+					 URL configurationBaseUrl,
+					 ClassLoader classLoader) throws Exception {
+		this.name = name;
+		this.description = description;
+		this.type = type;
+		this.className = className;
+		this.container = container;
+        //TODO is there a simpler way to do this?
+        if (configurationBaseUrl.getProtocol().equalsIgnoreCase("file")) {
+        	this.rootDir = new URI("file", configurationBaseUrl.getPath(), null);
+        } else {
+        	this.rootDir = URI.create(configurationBaseUrl.toString());
+        }
+        this.installDir = rootDir.resolve("install/");
+        this.workDir = rootDir.resolve("workspace/");
+        this.classLoader = classLoader;
+        log.info("Created JBI component: " + name);
+	}
+	
+	public void doStart() throws Exception {
+        log.info("doStart called for JBI component: " + name);
+        try {
+	        component = (javax.jbi.component.Component) classLoader.loadClass(className).newInstance();
+	        container.register(this);
+        } catch (ClassNotFoundException e) {
+        	log.error(classLoader);
+        }
+	}
+
+	public void doStop() throws Exception {
+        log.info("doStop called for JBI component: " + name);
+        container.unregister(this);
+        component = null;
+	}
+
+	public void doFail() {
+        log.info("doFail called for JBI component: " + name);
+        component = null;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public String getName() {
+		return name;
+	}
+	
+	public String getDescription() {
+		return description;
+	}
+	
+	public URI getInstallDir() {
+		return installDir;
+	}
+
+	public URI getWorkDir() {
+		return workDir;
+	}
+
+	public URI getRootDir() {
+		return rootDir;
+	}
+
+	public javax.jbi.component.Component getComponent() {
+		return component;
+	}
+    
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("JBIComponent", Component.class, "JBIComponent");
+        infoFactory.addAttribute("name", String.class, true);
+        infoFactory.addAttribute("description", String.class, true);
+        infoFactory.addAttribute("type", String.class, true);
+        infoFactory.addAttribute("className", String.class, true);
+        infoFactory.addReference("container", Container.class);
+        infoFactory.addAttribute("configurationBaseUrl", URL.class, true);
+        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+        infoFactory.setConstructor(new String[] {"name", "description", "type", "className", "container", "configurationBaseUrl", "classLoader"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Container.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Container.java?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Container.java (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/Container.java Mon May  1 02:27:08 2006
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.geronimo.servicemix;
+
+
+public interface Container {
+
+    public void register(Component component) throws Exception;
+
+	public void unregister(Component component) throws Exception;
+
+    public void register(ServiceAssembly assembly) throws Exception;
+
+	public void unregister(ServiceAssembly assembly) throws Exception;
+}

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceAssembly.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceAssembly.java?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceAssembly.java (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceAssembly.java Mon May  1 02:27:08 2006
@@ -0,0 +1,78 @@
+package org.apache.geronimo.servicemix;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.servicemix.jbi.deployment.Descriptor;
+import org.apache.servicemix.jbi.deployment.DescriptorFactory;
+
+public class ServiceAssembly implements GBeanLifecycle {
+
+    private static final Log log = LogFactory.getLog(ServiceAssembly.class);
+    
+    private String name;
+	private Container container;
+	private URI rootDir;
+    
+	public ServiceAssembly(String name, 
+			               Container container,
+			               URL configurationBaseUrl) throws Exception {
+		this.name = name;
+		this.container = container;
+        //TODO is there a simpler way to do this?
+        if (configurationBaseUrl.getProtocol().equalsIgnoreCase("file")) {
+        	this.rootDir = new URI("file", configurationBaseUrl.getPath(), null);
+        } else {
+        	this.rootDir = URI.create(configurationBaseUrl.toString());
+        }
+        log.info("Created JBI service assembly: " + name);
+	}
+	
+	public void doStart() throws Exception {
+        log.info("doStart called for JBI service assembly: " + name);
+        container.register(this);
+	}
+
+	public void doStop() throws Exception {
+        log.info("doStop called for JBI service assembly: " + name);
+        container.unregister(this);
+	}
+
+	public void doFail() {
+        log.info("doFail called for JBI service assembly: " + name);
+	}
+	
+	public URI getRootDir() {
+		return rootDir;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public Descriptor getDescriptor() throws Exception {
+		return DescriptorFactory.buildDescriptor(new File(new File(rootDir), "install"));
+	}
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("JBIServiceAssembly", ServiceAssembly.class, "JBIServiceAssembly");
+        infoFactory.addAttribute("name", String.class, true);
+        infoFactory.addReference("container", Container.class);
+        infoFactory.addAttribute("configurationBaseUrl", URL.class, true);
+        infoFactory.setConstructor(new String[] {"name", "container", "configurationBaseUrl" });
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+    
+}

Added: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceMixGBean.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceMixGBean.java?rev=398558&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceMixGBean.java (added)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/src/main/java/org/apache/geronimo/servicemix/ServiceMixGBean.java Mon May  1 02:27:08 2006
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.geronimo.servicemix;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import javax.jbi.JBIException;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+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;
+import org.apache.servicemix.jbi.framework.ComponentContextImpl;
+import org.apache.servicemix.jbi.framework.ComponentMBeanImpl;
+import org.apache.servicemix.jbi.framework.ComponentNameSpace;
+import org.apache.servicemix.jbi.framework.ServiceAssemblyLifeCycle;
+
+public class ServiceMixGBean implements GBeanLifecycle, Container {
+
+    private Log log = LogFactory.getLog(getClass().getName());
+    
+    private JBIContainer container;
+    private String name;
+    private String directory;
+    private TransactionContextManager transactionContextManager;
+    private WorkManager workManager;
+    private Kernel kernel;
+    private Collection jndiResources;
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("ServiceMix JBI Container", ServiceMixGBean.class, "JBIContainer");
+        infoFactory.addInterface(Container.class);
+        infoFactory.addAttribute("name", String.class, true);
+        infoFactory.addAttribute("directory", String.class, true);
+        infoFactory.addReference("transactionContextManager", TransactionContextManager.class);
+        infoFactory.addReference("workManager", WorkManager.class);
+        infoFactory.addAttribute("kernel", Kernel.class, false);
+        infoFactory.setConstructor(new String[]{"name", "directory", "transactionContextManager", "workManager", "kernel"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+    public ServiceMixGBean(String name, 
+    					   String directory, 
+    					   TransactionContextManager transactionContextManager, 
+    					   WorkManager workManager,
+    					   Kernel kernel) {
+        this.name = name;
+        this.directory = directory;
+        this.transactionContextManager = transactionContextManager;
+        this.workManager = workManager;
+        this.kernel = kernel;
+        if (log.isDebugEnabled()) {
+            log.debug("ServiceMixGBean created");
+        }
+        /*
+        // Print available jndi resources
+        Set patterns = new HashSet();
+        this.jndiResources = kernel.listGBeans(patterns);
+        for (Iterator it = jndiResources.iterator(); it.hasNext();) {
+        	ObjectName name = (ObjectName) it.next();
+        	log.info("Resource name: " + name);
+        	log.info("Resource inst: " + kernel.)
+        }
+        */
+    }
+    
+    /**
+     * Starts the GBean.  This informs the GBean that it is about to transition to the running state.
+     *
+     * @throws Exception if the target failed to start; this will cause a transition to the failed state
+     */
+    public void doStart() throws Exception {
+        if (log.isDebugEnabled()) {
+            log.debug("ServiceMixGBean doStart");
+        }
+        ClassLoader old = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(ServiceMixGBean.class.getClassLoader());
+        try {
+            if (container == null) {
+                container = createContainer();
+                container.init();
+                container.start();
+            }
+        } finally {
+            Thread.currentThread().setContextClassLoader(old);
+        }
+    }
+
+    /**
+     * Stops the target.  This informs the GBean that it is about to transition to the stopped state.
+     *
+     * @throws Exception if the target failed to stop; this will cause a transition to the failed state
+     */
+    public void doStop() throws Exception {
+        if (log.isDebugEnabled()) {
+            log.debug("ServiceMixGBean doStop");
+        }
+        try {
+            if (container != null) {
+                container.shutDown();
+            }
+        } finally {
+            container = null;
+        }
+    }
+
+    /**
+     * Fails the GBean.  This informs the GBean that it is about to transition to the failed state.
+     */
+    public void doFail() {
+        if (log.isDebugEnabled()) {
+            log.debug("ServiceMixGBean doFail");
+        }
+        try {
+            if (container != null) {
+                try {
+                    container.shutDown();
+                }
+                catch (JBIException e) {
+                    log.info("Caught while closing due to failure: " + e, e);
+                }
+            }
+        } finally {
+            container = null;
+        }
+    }
+
+    private JBIContainer createContainer() {
+        JBIContainer container = new JBIContainer();
+        container.setName(name);
+        container.setRootDir(directory);
+        container.setTransactionManager(getTransactionManager());
+        container.setMonitorInstallationDirectory(false);
+        container.setMonitorDeploymentDirectory(false);
+        container.setWorkManager(workManager);
+        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);
+        ComponentEnvironment env = new ComponentEnvironment();
+        env.setComponentRoot(new File(component.getRootDir()));
+        env.setInstallRoot(new File(component.getInstallDir()));
+        env.setWorkspaceRoot(new File(component.getWorkDir()));
+        context.setEnvironment(env);
+        
+        container.activateComponent(null,
+        							component.getComponent(),
+        							component.getDescription(),
+        							context,
+        							component.getType().equals("binding-component"),
+        							component.getType().equals("service-engine"));
+        ComponentMBeanImpl cmb = container.getComponent(component.getName());
+        File stateFile = cmb.getContext().getEnvironment().getStateFile();
+        if (stateFile.isFile()) {
+        	cmb.setInitialRunningState();
+        } else {
+        	cmb.start();
+        }
+    }
+
+    public void unregister(Component component) throws Exception {
+    	container.deactivateComponent(component.getName());
+    }
+    
+    public void register(ServiceAssembly assembly) throws Exception {
+    	File rootDir = new File(assembly.getRootDir());
+    	ServiceAssemblyEnvironment env = new ServiceAssemblyEnvironment();
+    	env.setRootDir(rootDir);
+    	env.setInstallDir(new File(rootDir, "install"));
+    	env.setSusDir(new File(rootDir, "sus"));
+    	env.setStateFile(new File(rootDir, "state.xml"));
+    	ServiceAssemblyLifeCycle salc = container.getRegistry().registerServiceAssembly(assembly.getDescriptor().getServiceAssembly(), env);
+    	if (env.getStateFile().isFile()) {
+    		salc.restore();
+    	} else {
+    		salc.start();
+    	}
+    }
+    
+    public void unregister(ServiceAssembly assembly) throws Exception {
+    	ServiceAssemblyLifeCycle salc = container.getRegistry().getServiceAssembly(assembly.getName());
+    	salc.shutDown(false);
+    	container.getRegistry().unregisterServiceAssembly(assembly.getName());
+    }
+}



Mime
View raw message