incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1221657 - in /sling/trunk/installer/factories/deploymentpck: pom.xml src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
Date Wed, 21 Dec 2011 09:25:35 GMT
Author: cziegeler
Date: Wed Dec 21 09:25:35 2011
New Revision: 1221657

URL: http://svn.apache.org/viewvc?rev=1221657&view=rev
Log:
Use new versioning feature

Modified:
    sling/trunk/installer/factories/deploymentpck/pom.xml
    sling/trunk/installer/factories/deploymentpck/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java

Modified: sling/trunk/installer/factories/deploymentpck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/deploymentpck/pom.xml?rev=1221657&r1=1221656&r2=1221657&view=diff
==============================================================================
--- sling/trunk/installer/factories/deploymentpck/pom.xml (original)
+++ sling/trunk/installer/factories/deploymentpck/pom.xml Wed Dec 21 09:25:35 2011
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.1.2</version>
+            <version>3.2.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: sling/trunk/installer/factories/deploymentpck/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/deploymentpck/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java?rev=1221657&r1=1221656&r2=1221657&view=diff
==============================================================================
--- sling/trunk/installer/factories/deploymentpck/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
(original)
+++ sling/trunk/installer/factories/deploymentpck/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
Wed Dec 21 09:25:35 2011
@@ -32,6 +32,7 @@ import org.apache.sling.installer.api.ta
 import org.apache.sling.installer.api.tasks.ResourceTransformer;
 import org.apache.sling.installer.api.tasks.TaskResourceGroup;
 import org.apache.sling.installer.api.tasks.TransformationResult;
+import org.osgi.framework.Version;
 import org.osgi.service.deploymentadmin.DeploymentAdmin;
 
 /**
@@ -67,10 +68,10 @@ public class DeploymentPackageInstaller
                         if (v != null) {
                             final Map<String, Object> attr = new HashMap<String,
Object>();
                             attr.put(DEPLOYMENTPACKAGE_SYMBOLICMAME, sn);
-                            attr.put(DEPLOYMENTPACKAGE_VERSION, v.toString());
 
                             final TransformationResult tr = new TransformationResult();
                             tr.setId(sn);
+                            tr.setVersion(new Version(v));
                             tr.setResourceType(TYPE_DP);
                             tr.setAttributes(attr);
 
@@ -105,12 +106,12 @@ public class DeploymentPackageInstaller
                 if (jis != null) {
                     try {
                         jis.close();
-                    } catch (IOException ignore) {
+                    } catch (final IOException ignore) {
                     }
                 } else {
                     try {
                         ins.close();
-                    } catch (IOException ignore) {
+                    } catch (final IOException ignore) {
                     }
                 }
             }



Mime
View raw message