You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/07/13 06:28:54 UTC
svn commit: r963598 - in /servicemix/smx4/nmr/trunk: ./ jbi/deployer/
jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/
jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/
Author: ffang
Date: Tue Jul 13 04:28:54 2010
New Revision: 963598
URL: http://svn.apache.org/viewvc?rev=963598&view=rev
Log:
[SMX4NMR-212]OSGi packaged SA deployment doesn't work anymore
Removed:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/DeployedAssembly.java
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=963598&r1=963597&r2=963598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Jul 13 04:28:54 2010
@@ -77,7 +77,12 @@
<groupId>org.fusesource.commonman</groupId>
<artifactId>commons-management</artifactId>
<version>${commons.management.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-common</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=963598&r1=963597&r2=963598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Tue Jul 13 04:28:54 2010
@@ -34,7 +34,7 @@ import javax.management.MBeanServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.deployer.Component;
-import org.apache.servicemix.jbi.deployer.DeployedAssembly;
+import org.apache.servicemix.common.osgi.DeployedAssembly;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.SharedLibrary;
import org.apache.servicemix.jbi.deployer.ServiceUnit;
@@ -252,8 +252,10 @@ public class Deployer implements Synchro
deployedComponentsTracker.open();
// Track deployed service assemblies
deployedAssembliesTracker = new ServiceTracker(bundleContext, DeployedAssembly.class.getName(), null) {
+
public Object addingService(ServiceReference serviceReference) {
- Object o = super.addingService(serviceReference);
+ Object o = super.addingService(serviceReference);
+
registerDeployedServiceAssembly(serviceReference, (DeployedAssembly) o);
return o;
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java?rev=963598&r1=963597&r2=963598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java Tue Jul 13 04:28:54 2010
@@ -26,9 +26,9 @@ import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
import javax.management.ObjectName;
+import org.apache.servicemix.common.osgi.DeployedAssembly;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
-import org.apache.servicemix.jbi.deployer.DeployedAssembly;
import org.apache.servicemix.jbi.deployer.artifacts.ComponentImpl;
import org.apache.servicemix.jbi.deployer.artifacts.ServiceAssemblyImpl;
import org.apache.servicemix.jbi.deployer.artifacts.ServiceUnitImpl;
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=963598&r1=963597&r2=963598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Jul 13 04:28:54 2010
@@ -119,10 +119,10 @@
<pax.logging.version>1.5.2</pax.logging.version>
<pax.runner.version>1.4.0</pax.runner.version>
<servicemix3.version>3.3.1</servicemix3.version>
- <servicemix.eip.version>2010.01</servicemix.eip.version>
- <servicemix.http.version>2010.01</servicemix.http.version>
- <servicemix.jsr181.version>2010.01</servicemix.jsr181.version>
- <servicemix.shared.version>2010.01</servicemix.shared.version>
+ <servicemix.eip.version>2010.02-SNAPSHOT</servicemix.eip.version>
+ <servicemix.http.version>2010.02-SNAPSHOT</servicemix.http.version>
+ <servicemix.jsr181.version>2010.02-SNAPSHOT</servicemix.jsr181.version>
+ <servicemix.shared.version>2010.02-SNAPSHOT</servicemix.shared.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.4.0</servicemix.specs.version>
<servicemix.utils.version>1.3.0-SNAPSHOT</servicemix.utils.version>