You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2010/01/11 10:28:51 UTC

svn commit: r897811 - in /incubator/aries/trunk/application: application-api/src/main/java/org/apache/aries/application/management/ application-management/src/main/java/org/apache/aries/application/management/impl/

Author: mnuttall
Date: Mon Jan 11 09:28:50 2010
New Revision: 897811

URL: http://svn.apache.org/viewvc?rev=897811&view=rev
Log:
ARIES-89: Implement application support: Make BundleConverter usable

Modified:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java

Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java?rev=897811&r1=897810&r2=897811&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java Mon Jan 11 09:28:50 2010
@@ -31,11 +31,13 @@
   /**
    * 
    * @param inputBundle Stream to the input bundle
-   * @param artifact The root of the eba containing the artifact being converted - 
-   *                 currently a .zip file. In time we may come to support this 
-   *                 being an exploded directory.  
+   * @param parentEba The root of the eba containing the artifact being converted - 
+   *                  currently a .zip file. In time we may come to support this 
+   *                  being an exploded directory.
+   * @param pathToArtifact Path to the artifact to be converted
+   *                   
    * @return valid input stream or null if the bundle could not be converted. 
    */
-  public InputStream convert (InputStream inputBundle, IDirectory parentEba);
+  public InputStream convert (InputStream inputBundle, IDirectory parentEba, String pathToArtifact);
 
 }

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java?rev=897811&r1=897810&r2=897811&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java Mon Jan 11 09:28:50 2010
@@ -127,7 +127,7 @@
                   try { 
                     // WarToWabConverter can extract application.xml via
                     // eba.getFile(AppConstants.APPLICATION_XML);
-                    convertedBinary = converters.next().convert(is, ebaFile);
+                    convertedBinary = converters.next().convert(is, ebaFile, f.getName());
                   } catch (ServiceException sx) {
                     // We'll get this if our optional BundleConverter has not been injected. 
                   }