You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2012/07/05 12:35:26 UTC
svn commit: r1357540 -
/geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
Author: violalu
Date: Thu Jul 5 10:35:26 2012
New Revision: 1357540
URL: http://svn.apache.org/viewvc?rev=1357540&view=rev
Log:
GERONIMO-6370 format file
Modified:
geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
Modified: geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java?rev=1357540&r1=1357539&r2=1357540&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java (original)
+++ geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java Thu Jul 5 10:35:26 2012
@@ -147,30 +147,30 @@ public class ApplicationInstaller implem
context.flush();
context.initializeConfiguration();
- // extract bundle in EBA applications
- for (File file : ariesTempDirectory.listFiles()) {
- if (file.isFile()) {
- BundleManifest bm = BundleManifest.fromBundle(file);
- if (bm != null && bm.isValid()) {
- //extract it
- File dir = new File(tempDirectory, file.getName());
-
- if (dir != null && !dir.exists()) {
- boolean success = dir.mkdirs();
- if (!success) {
- throw new IOException("Cannot create directory " + dir.getAbsolutePath());
- }
- }
- JarUtils.unzipToDirectory(new ZipFile(file), dir);
- }
- } else {
- for(File f : file.listFiles()){
- FileUtils.copyFile(f, new File(tempDirectory, file.getName() + '/' + f.getName()));
- }
- }
- }
-
- FileUtils.recursiveDelete(ariesTempDirectory);
+ // extract bundle in EBA applications
+ for (File file : ariesTempDirectory.listFiles()) {
+ if (file.isFile()) {
+ BundleManifest bm = BundleManifest.fromBundle(file);
+ if (bm != null && bm.isValid()) {
+ //extract it
+ File dir = new File(tempDirectory, file.getName());
+
+ if (dir != null && !dir.exists()) {
+ boolean success = dir.mkdirs();
+ if (!success) {
+ throw new IOException("Cannot create directory " + dir.getAbsolutePath());
+ }
+ }
+ JarUtils.unzipToDirectory(new ZipFile(file), dir);
+ }
+ } else {
+ for(File f : file.listFiles()){
+ FileUtils.copyFile(f, new File(tempDirectory, file.getName() + '/' + f.getName()));
+ }
+ }
+ }
+
+ FileUtils.recursiveDelete(ariesTempDirectory);
AbstractName name = naming.createChildName(moduleName, "AriesApplication", "GBean");