felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1234842 - /felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
Date Mon, 23 Jan 2012 15:08:57 GMT
Author: marrs
Date: Mon Jan 23 15:08:56 2012
New Revision: 1234842

URL: http://svn.apache.org/viewvc?rev=1234842&view=rev
Log:
FELIX-3272 applied the patch

Modified:
    felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java

Modified: felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java?rev=1234842&r1=1234841&r2=1234842&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
(original)
+++ felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
Mon Jan 23 15:08:56 2012
@@ -35,6 +35,9 @@ import org.osgi.service.deploymentadmin.
  * Command that processes all the processed resources in the source deployment package
  * of a deployment session by finding their Resource Processors and having those process
  * the resources.
+ * System property <code>org.apache.felix.deploymentadmin.allowforeigncustomizers</code>
allows
+ * you to skip the source handling of resource processors, allowing the use of processors
already on
+ * the system. Defaults to <code>false</code>.
  */
 public class ProcessResourceCommand extends Command {
 
@@ -82,7 +85,8 @@ public class ProcessResourceCommand exte
                 ServiceReference ref = source.getResourceProcessor(name);
                 if (ref != null) {
                     String serviceOwnerSymName = ref.getBundle().getSymbolicName();
-                    if (source.getBundleInfoByName(serviceOwnerSymName) != null) {
+                    String allowForeignCustomerizers = System.getProperty("org.apache.felix.deploymentadmin.allowforeigncustomizers",
"false");
+                    if (source.getBundleInfoByName(serviceOwnerSymName) != null || allowForeignCustomerizers.equals("true"))
{
                         ResourceProcessor resourceProcessor = (ResourceProcessor) context.getService(ref);
                         if (resourceProcessor != null) {
                             try {



Mime
View raw message