servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r412340 - in /incubator/servicemix/trunk: ./ etc/ geronimo-1.1/configs/servicemix-deployer/ geronimo-1.1/configs/servicemix-deployer/src/plan/ geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/ geronimo-1.1/configs/servicemix/...
Date Wed, 07 Jun 2006 09:20:47 GMT
Author: gnodet
Date: Wed Jun  7 02:20:46 2006
New Revision: 412340

URL: http://svn.apache.org/viewvc?rev=412340&view=rev
Log:
Fix geronimo 1.1 integration

Modified:
    incubator/servicemix/trunk/etc/project.properties
    incubator/servicemix/trunk/etc/project.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
    incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml
    incubator/servicemix/trunk/geronimo-1.1/etc/project.properties
    incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
    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/project.xml
    incubator/servicemix/trunk/project.properties
    incubator/servicemix/trunk/project.xml

Modified: incubator/servicemix/trunk/etc/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/etc/project.properties?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Wed Jun  7 02:20:46 2006
@@ -84,7 +84,7 @@
 maven.repo.apache.ssh.executable=ssh
 maven.repo.apache.scp.executable=scp
 
-maven.repo.remote = http://cvs.apache.org/repository, \
+maven.repo.remote = http://people.apache.org/repository, \
                     http://www.ibiblio.org/maven, \
                     http://dist.codehaus.org, \
                     http://repo.logicblaze.com/maven1, \
@@ -301,4 +301,4 @@
 # http://xstream.codehaus.org/, http://xstream.codehaus.org/license.html, BSD, (Used in Geronimo)
 xstream_version=1.1.2
 #BSD
-yom_version=1.0-alpha-2
\ No newline at end of file
+yom_version=1.0-alpha-2

Modified: incubator/servicemix/trunk/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/etc/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.xml (original)
+++ incubator/servicemix/trunk/etc/project.xml Wed Jun  7 02:20:46 2006
@@ -28,7 +28,7 @@
 
   <name>ServiceMix</name>
   <id>servicemix</id>
-  <groupId>incubator-servicemix</groupId>
+  <groupId>org.apache.servicemix</groupId>
   <currentVersion>3.0-SNAPSHOT</currentVersion>
 
   <organization>

Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml Wed Jun
 7 02:20:46 2006
@@ -53,7 +53,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix</artifactId>
             <version>${servicemix_version}</version>
             <type>car</type>
@@ -63,7 +63,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
             <version>${servicemix_version}</version>
             <properties>
@@ -71,7 +71,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>${servicemix_version}</version>
             <properties>
@@ -80,7 +80,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>geronimo-servicemix</artifactId>
             <version>${servicemix_version}</version>
             <properties>
@@ -89,7 +89,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>geronimo-servicemix-builder</artifactId>
             <version>${servicemix_version}</version>
             <properties>

Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
(original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/plan/plan.xml
Wed Jun  7 02:20:46 2006
@@ -21,7 +21,7 @@
 <!--
 Configuration for ServiceMix deployer.
 -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="ServiceMixConfigBuilder" class="org.apache.geronimo.servicemix.ServiceMixConfigBuilder">
         <reference name="Repositories">
@@ -41,4 +41,4 @@
         </xml-attribute>
     </gbean>
 
-</configuration>
+</module>

Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
(original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/src/resources/META-INF/geronimo-plugin.xml
Wed Jun  7 02:20:46 2006
@@ -19,5 +19,5 @@
     <dependency>springframework/spring//jar</dependency>
     <dependency>org.apache.xbean/xbean-spring//jar</dependency>
   </configuration>
-  <source-repository>http://cvs.apache.org/repository/</source-repository>
+  <source-repository>http://people.apache.org/repository/</source-repository>
 </geronimo-plugin>

Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml Wed Jun  7 02:20:46
2006
@@ -54,7 +54,7 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
             <version>${servicemix_version}</version>
             <properties>
@@ -63,7 +63,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>${servicemix_version}</version>
             <properties>

Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/src/plan/plan.xml Wed Jun 
7 02:20:46 2006
@@ -21,7 +21,7 @@
 <!--
 Configuration for ServiceMix deployer.
 -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="ServiceMixThreadPool" class="org.apache.geronimo.pool.ThreadPool">
         <attribute name="keepAliveTime">5000</attribute>
@@ -55,4 +55,4 @@
         </reference>
     </gbean>
 
-</configuration>
+</module>

Modified: incubator/servicemix/trunk/geronimo-1.1/etc/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/etc/project.properties?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/etc/project.properties (original)
+++ incubator/servicemix/trunk/geronimo-1.1/etc/project.properties Wed Jun  7 02:20:46 2006
@@ -18,9 +18,9 @@
 # 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_packaging_plugin_version=1.1.0-10
+geronimo_assembly_plugin_version=1.1.0-12
+geronimo_deployment_plugin_version=1.1.0-3
 geronimo_dependency_plugin_version=1.1.0-3
 
 servicemix_version=${pom.currentVersion}

Modified: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml Wed Jun
 7 02:20:46 2006
@@ -43,13 +43,13 @@
     <dependencies>
         <!-- Module Dependencies -->
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
             <version>${servicemix_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>${servicemix_version}</version>
         </dependency>

Modified: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java
(original)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/src/main/java/org/apache/geronimo/servicemix/ServiceMixConfigBuilder.java
Wed Jun  7 02:20:46 2006
@@ -21,7 +21,6 @@
 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;
@@ -34,6 +33,7 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractName;
@@ -46,6 +46,7 @@
 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.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -97,7 +98,7 @@
      * @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
{
+    public Object getDeploymentPlan(File planFile, JarFile module, ModuleIDBuilder idBuilder)
throws DeploymentException {
         log.debug("Checking for ServiceMix deployment.");
         System.err.println("Checking for ServiceMix deployment.");
         if (module == null) {
@@ -128,7 +129,7 @@
      * @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
{
+    public Artifact getConfigurationID(Object plan, JarFile module, ModuleIDBuilder idBuilder)
throws IOException, DeploymentException {
         Descriptor descriptor = (Descriptor) plan;
         if (descriptor.getComponent() != null) {
             return new Artifact("servicemix-components", descriptor.getComponent().getIdentification().getName(),
(Version) null, "car");
@@ -191,9 +192,8 @@
                             environment,
                             ConfigurationModuleType.SERVICE, 
                             kernel.getNaming(),
-                            repositories,
-                            configurationStores,
-                            artifactResolver);
+                            ConfigurationUtil.getConfigurationManager(kernel),
+                            repositories);
             if (descriptor.getComponent() != null) {
             	buildComponent(descriptor, context, jarFile);
             } else if (descriptor.getServiceAssembly() != null) {

Modified: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml Wed Jun  7 02:20:46
2006
@@ -43,13 +43,13 @@
     <dependencies>
         <!-- Module Dependencies -->
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
             <version>${servicemix_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>incubator-servicemix</groupId>
+            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>${servicemix_version}</version>
         </dependency>

Modified: incubator/servicemix/trunk/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/project.properties?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/project.properties (original)
+++ incubator/servicemix/trunk/project.properties Wed Jun  7 02:20:46 2006
@@ -18,7 +18,7 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 
-maven.repo.remote=http://www.ibiblio.org/maven,http://dist.codehaus.org,http://cvs.apache.org/repository
+maven.repo.remote=http://www.ibiblio.org/maven,http://dist.codehaus.org,http://people.apache.org/repository
 
 maven.compile.source=1.4
 maven.compile.target=1.4

Modified: incubator/servicemix/trunk/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/project.xml?rev=412340&r1=412339&r2=412340&view=diff
==============================================================================
--- incubator/servicemix/trunk/project.xml (original)
+++ incubator/servicemix/trunk/project.xml Wed Jun  7 02:20:46 2006
@@ -26,7 +26,7 @@
   
   <name>ServiceMix</name>
   <id>servicemix</id>
-  <groupId>incubator-servicemix</groupId>
+  <groupId>org.apache.servicemix</groupId>
   <currentVersion>3.0-SNAPSHOT</currentVersion>
   
   <organization>



Mime
View raw message