Author: gnodet
Date: Mon Jun 2 07:15:15 2008
New Revision: 662445
URL: http://svn.apache.org/viewvc?rev=662445&view=rev
Log:
SMX4KNL-44 and SMX4KNL-49: Fix bundle updates and upgrade to latest
spring/spring-dm
Modified:
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified:
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=662445&r1=662444&r2=662445&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
(original)
+++
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
Mon Jun 2 07:15:15 2008
@@ -80,7 +80,6 @@
private Project project = new Project();
private long scanInterval = 500L;
private boolean loggedConfigAdminWarning;
- private List<Bundle> changedBundles = new ArrayList<Bundle>();
private List<Bundle> bundlesToStart = new ArrayList<Bundle>();
private List<Bundle> bundlesToUpdate = new ArrayList<Bundle>();
private Map<String, String> artifactToBundle = new HashMap<String,
String>();
@@ -206,7 +205,6 @@
//-------------------------------------------------------------------------
protected synchronized void onFilesChanged(Collection<String> filenames) {
- changedBundles.clear();
bundlesToStart.clear();
bundlesToUpdate.clear();
Set<File> bundleJarsCreated = new HashSet<File>();
@@ -376,7 +374,6 @@
LOGGER.warn("Could not find Bundle for file: " +
file.getCanonicalPath());
}
else {
- changedBundles.add(bundle);
bundle.stop();
bundle.uninstall();
}
@@ -486,13 +483,15 @@
}
protected void refreshPackagesAndStartOrUpdateBundles() {
- PackageAdmin packageAdmin = getPackageAdmin();
- if (packageAdmin != null) {
- Bundle[] bundles = new Bundle[changedBundles.size()];
- changedBundles.toArray(bundles);
- packageAdmin.refreshPackages(bundles);
+ for (Bundle bundle : bundlesToUpdate) {
+ try {
+ bundle.update();
+ LOGGER.info("Updated: " + bundle);
+ }
+ catch (BundleException e) {
+ LOGGER.warn("Failed to update bundle: " + bundle + ". Reason:
" + e, e);
+ }
}
- changedBundles.clear();
for (Bundle bundle : bundlesToStart) {
try {
@@ -503,15 +502,10 @@
LOGGER.warn("Failed to start bundle: " + bundle + ". Reason: "
+ e, e);
}
}
-
- for (Bundle bundle : bundlesToUpdate) {
- try {
- bundle.update();
- LOGGER.info("Update: " + bundle);
- }
- catch (BundleException e) {
- LOGGER.warn("Failed to update bundle: " + bundle + ". Reason:
" + e, e);
- }
+
+ PackageAdmin packageAdmin = getPackageAdmin();
+ if (packageAdmin != null) {
+ packageAdmin.refreshPackages(null);
}
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=662445&r1=662444&r2=662445&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Mon Jun 2 07:15:15
2008
@@ -39,6 +39,8 @@
<properties>
<gshell.osgi.import>
+ org.springframework.aop.framework,
+ org.aopalliance.aop,
org.apache.servicemix.kernel.jaas.config;resolution:=optional,
org.apache.servicemix.kernel.main.spi.*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional,
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml?rev=662445&r1=662444&r2=662445&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml Mon Jun 2 07:15:15
2008
@@ -91,7 +91,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.servicemix.gshell.log*;version=${project.version};-split-package:=merge-first</Export-Package>
- <Import-Package>*</Import-Package>
+
<Import-Package>org.ops4j.pax.logging,*</Import-Package>
<Private-Package>!*</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=662445&r1=662444&r2=662445&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jun 2 07:15:15 2008
@@ -81,11 +81,11 @@
<jline.version>0.9.94</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
- <pax.logging.version>1.1.0</pax.logging.version>
+ <pax.logging.version>1.1.1</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <spring.osgi.version>1.0.2</spring.osgi.version>
- <spring.version>2.5.2</spring.version>
+ <spring.osgi.version>1.1.0-m2</spring.osgi.version>
+ <spring.version>2.5.4</spring.version>
</properties>
<repositories>
@@ -115,6 +115,12 @@
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
+ <!-- Spring OSGi milestone -->
+ <repository>
+ <id>spring-maven-milestone</id>
+ <name>Springframework Maven Repository</name>
+
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+ </repository>
</repositories>
<pluginRepositories>
