You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2010/03/20 21:18:02 UTC
svn commit: r925672 - in /felix/trunk/deploymentadmin: autoconf/
autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/ service/
service/src/main/java/org/apache/felix/deploymentadmin/
Author: marrs
Date: Sat Mar 20 20:18:02 2010
New Revision: 925672
URL: http://svn.apache.org/viewvc?rev=925672&view=rev
Log:
Updated to the latest dependency manager snapshot. Misc fixes for EE compatibility.
Modified:
felix/trunk/deploymentadmin/autoconf/pom.xml
felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/Activator.java
felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/PersistencyManager.java
felix/trunk/deploymentadmin/service/pom.xml
felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java
felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java
Modified: felix/trunk/deploymentadmin/autoconf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/pom.xml?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/pom.xml (original)
+++ felix/trunk/deploymentadmin/autoconf/pom.xml Sat Mar 20 20:18:02 2010
@@ -44,7 +44,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>2.0.1</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/Activator.java?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/Activator.java (original)
+++ felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/Activator.java Sat Mar 20 20:18:02 2010
@@ -21,8 +21,8 @@ package org.apache.felix.deployment.rp.a
import java.util.Dictionary;
import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationAdmin;
Modified: felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/PersistencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/PersistencyManager.java?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/PersistencyManager.java (original)
+++ felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/PersistencyManager.java Sat Mar 20 20:18:02 2010
@@ -50,7 +50,8 @@ public class PersistencyManager {
return;
}
File targetDir = m_root;
- name = name.replaceAll("/", File.separator);
+ name = name.replace('/', File.separatorChar);
+
if (name.startsWith(File.separator)) {
name = name.substring(1);
}
@@ -103,7 +104,7 @@ public class PersistencyManager {
* @throws IOException If the resource could not be properly read.
*/
public List load(String name) throws IOException {
- name = name.replaceAll("/", File.separator);
+ name = name.replace('/', File.separatorChar);
List resources = new ArrayList();
File resourcesFile = new File(m_root, name);
if (resourcesFile.exists()) {
@@ -111,15 +112,19 @@ public class PersistencyManager {
try {
in = new ObjectInputStream(new FileInputStream(resourcesFile));
resources = (List) in.readObject();
- } catch (FileNotFoundException fnfe) {
+ }
+ catch (FileNotFoundException fnfe) {
throw new IOException("Resource does not exist: " + name);
- } catch (ClassNotFoundException cnfe) {
+ }
+ catch (ClassNotFoundException cnfe) {
throw new IOException("Unable to recreate persisted object from file: " + name);
- } finally {
+ }
+ finally {
if (in != null) {
try {
in.close();
- } catch (Exception e) {
+ }
+ catch (Exception e) {
// not much we can do
}
}
Modified: felix/trunk/deploymentadmin/service/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/service/pom.xml?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/service/pom.xml (original)
+++ felix/trunk/deploymentadmin/service/pom.xml Sat Mar 20 20:18:02 2010
@@ -44,7 +44,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>2.0.1</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java (original)
+++ felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java Sat Mar 20 20:18:02 2010
@@ -18,8 +18,8 @@
*/
package org.apache.felix.deploymentadmin;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
import org.osgi.service.event.EventAdmin;
Modified: felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java?rev=925672&r1=925671&r2=925672&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java (original)
+++ felix/trunk/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java Sat Mar 20 20:18:02 2010
@@ -314,7 +314,7 @@ public class DeploymentAdminImpl impleme
private void sendCompleteEvent(String name, boolean success) {
Dictionary props = new Hashtable();
props.put(Constants.EVENTPROPERTY_DEPLOYMENTPACKAGE_NAME, name);
- props.put(Constants.EVENTPROPERTY_SUCCESSFUL, Boolean.valueOf(success));
+ props.put(Constants.EVENTPROPERTY_SUCCESSFUL, new Boolean(success));
Event completeEvent = new Event(Constants.EVENTTOPIC_COMPLETE, props);
m_eventAdmin.postEvent(completeEvent);
}