Changeset 357:85fc65cb2520

Timestamp:

09/21/11 16:46:58 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2791

Message:

• modified script name timestamps to timestamp.
• modified bundle update.

Location:

kraken-core

Files:

• pom.xml (modified) (1 diff)
• src/main/java/org/krakenapps/bundle/BundleManagerService.java (modified) (3 diffs)
• src/main/java/org/krakenapps/bundle/BundleScript.java (modified) (7 diffs)
• src/main/java/org/krakenapps/logger/LoggerScriptFactory.java (modified) (1 diff)
• src/main/java/org/krakenapps/pkg/MavenResolver.java (modified) (3 diffs)
• src/main/java/org/krakenapps/script/Editor.java (modified) (4 diffs)

kraken-core/pom.xml

@@ -9 +9 @@
         </parent>
         <artifactId>kraken-core</artifactId>
-        <version>1.8.0</version>
+        <version>1.8.1</version>
         <name>Kraken Core</name>
         <packaging>jar</packaging>

kraken-core/src/main/java/org/krakenapps/bundle/BundleManagerService.java

@@ -62 +62 @@
  */
 public class BundleManagerService implements SynchronousBundleListener, BundleManager {
-        final Logger logger = LoggerFactory.getLogger(BundleManagerService.class.getName());
+        private Logger logger = LoggerFactory.getLogger(BundleManagerService.class);
 
         private BundleContext context;
@@ -312 +312 @@
                         bundle.stop();
                 } catch (BundleException e) {
-                        e.printStackTrace();
+                        logger.error("kraken core: stopping bundle failed.", e);
                 }
         }
@@ -330 +330 @@
 
                 try {
+                        if (!isLocalJar(bundle)) {
+                                try {
+                                        File before = new File(bundle.getLocation().replace("file://", ""));
+                                        File temp = File.createTempFile(before.getName(), "", before.getParentFile());
+                                        temp.delete();
+                                        if (before.renameTo(temp)) {
+                                                MavenResolver resolver = new MavenResolver(getLocalRepository(),
+                                                                config.getBundleRepositories(), null, getKeyStoreManager());
+                                                MavenArtifact artifact = getArtifact(bundle);
+                                                File after = resolver.resolve(artifact);
+                                                if (after.exists())
+                                                        temp.delete();
+                                                else
+                                                        temp.renameTo(before);
+                                        }
+                                } catch (MavenResolveException e) {
+                                        logger.error("kraken core: maven resolve failed.", e);
+                                } catch (IOException e) {
+                                        logger.error("kraken core: create temp file failed.", e);
+                                }
+                        }
                         bundle.update();
                 } catch (BundleException e) {
-                        e.printStackTrace();
-                }
+                        logger.error("kraken core: updating bundle failed.", e);
+                }
+        }
+
+        private boolean isLocalJar(Bundle bundle) {
+                File location = new File(bundle.getLocation().replace("file://", ""));
+                File krakenDownload = new File(System.getProperty("kraken.download.dir"));
+
+                while (location.getParentFile() != null) {
+                        if (location.equals(krakenDownload))
+                                return false;
+                        location = location.getParentFile();
+                }
+
+                return true;
+        }
+
+        private MavenArtifact getArtifact(Bundle bundle) {
+                File location = new File(bundle.getLocation().replace("file://", ""));
+                File krakenDownload = new File(System.getProperty("kraken.download.dir"));
+
+                String groupId = null;
+                String artifactId = null;
+                Version version = null;
+                while (location.getParentFile() != null) {
+                        location = location.getParentFile();
+                        if (location.equals(krakenDownload))
+                                break;
+
+                        String name = location.getName();
+                        if (version == null)
+                                version = new Version(name);
+                        else if (artifactId == null)
+                                artifactId = name;
+                        else if (groupId == null)
+                                groupId = name;
+                        else
+                                groupId = name + "." + groupId;
+                }
+
+                return new MavenArtifact(groupId, artifactId, version);
         }
 

kraken-core/src/main/java/org/krakenapps/bundle/BundleScript.java

@@ -119 +119 @@
                         @ScriptArgument(name = "url", type = "string", description = "the url of bundle repository"),
                         @ScriptArgument(name = "trust store alias", type = "string", description = "the alias of truststore"),
-                        @ScriptArgument(name = "key store alias", type = "string", description = "the alias of keystore. if provided, client authentication will be used", optional = true) })
+                        @ScriptArgument(name = "key store alias", type = "string",
+                                        description = "the alias of keystore. if provided, client authentication will be used",
+                                        optional = true) })
         public void addSecureRepository(String[] args) {
                 try {
@@ -139 +141 @@
         }
 
-        @ScriptUsage(description = "Remove maven repository", arguments = { @ScriptArgument(name = "alias", type = "string", description = "alias of the maven repository") })
+        @ScriptUsage(description = "Remove maven repository", arguments = { @ScriptArgument(name = "alias",
+                        type = "string", description = "alias of the maven repository") })
         public void removeRepository(String[] args) {
                 try {
@@ -166 +169 @@
         }
 
-        @ScriptUsage(description = "Reset credential for repository http authentication", arguments = { @ScriptArgument(name = "alias", type = "string", description = "alias of the maven repository") })
+        @ScriptUsage(description = "Reset credential for repository http authentication", arguments = { @ScriptArgument(
+                        name = "alias", type = "string", description = "alias of the maven repository") })
         public void resetHttpAuth(String[] args) {
                 Preferences prefs = getRepositoryPreferences(Kraken.getContext());
@@ -293 +297 @@
         }
 
-        @ScriptUsage(description = "update all locally-installed bundle(s). before use this method, stop ipojo bundle first.", arguments = { @ScriptArgument(name = "isForced", description = "use 'force' to run this method.", optional = false, type = "force or not") })
+        @ScriptUsage(
+                        description = "update all locally-installed bundle(s). before use this method, stop ipojo bundle first.",
+                        arguments = { @ScriptArgument(name = "isForced", description = "use 'force' to run this method.",
+                                        optional = false, type = "force or not") })
         public void updateAll(String[] args) {
                 if (args.length < 1 || !args[0].equals("force")) {
@@ -329 +336 @@
         }
 
-        @ScriptUsage(description = "list all bundles", arguments = { @ScriptArgument(name = "filter", type = "string", description = "filter text for bundle symbolic name", optional = true) })
+        @ScriptUsage(description = "list all bundles", arguments = { @ScriptArgument(name = "filter", type = "string",
+                        description = "filter text for bundle symbolic name", optional = true) })
         public void list(String[] args) {
                 String filterText = null;
@@ -357 +365 @@
         }
 
-        @ScriptUsage(description = "print bundle location", arguments = { @ScriptArgument(name = "bundle id", description = "the bundle id") })
+        @ScriptUsage(description = "print bundle location", arguments = { @ScriptArgument(name = "bundle id",
+                        description = "the bundle id") })
         public void location(String[] args) {
                 try {
@@ -432 +441 @@
         }
 
-        public void timestamps(String[] args) {
+        public void timestamp(String[] args) {
                 int bundleId = -1;
                 String filterText = null;

kraken-core/src/main/java/org/krakenapps/logger/LoggerScriptFactory.java

@@ -18 +18 @@
 import org.krakenapps.api.Script;
 import org.krakenapps.api.ScriptFactory;
-import org.slf4j.ILoggerFactory;
 import org.slf4j.impl.KrakenLoggerFactory;
 import org.slf4j.impl.StaticLoggerBinder;

kraken-core/src/main/java/org/krakenapps/pkg/MavenResolver.java

@@ -141 +141 @@
                                         String metadataUrl = normalize(repo.getUrl())
                                                         + String.format("%s/%s/maven-metadata.xml", artifact.getGroupId().replace(".", "/"),
-                                                        artifact.getArtifactId());
+                                                                        artifact.getArtifactId());
                                         logger.info("maven resolver: failed to get {} {}", metadataUrl, e.getMessage());
                                 }
@@ -182 +182 @@
 
                         // download jar
-                        if (localJar.exists() == false) {
+//                      if (localJar.exists() == false) {
                                 try {
                                         byte[] binary = download(repo, jarUrl);
@@ -191 +191 @@
                                         return null;
                                 }
-                        }
+//                      }
 
                         return localJar;

kraken-core/src/main/java/org/krakenapps/script/Editor.java

@@ -354 +354 @@
         }
 
+        @SuppressWarnings("unused")
         private void drawText(int x, int y, String s) {
                 context.print(new MoveToCode(x, y));
@@ -359 +360 @@
         }
 
+        @SuppressWarnings("unused")
         private void drawBox(int x1, int y1, int x2, int y2) {
                 // first line
@@ -387 +389 @@
         }
 
+        @SuppressWarnings("unused")
         private void drawHorizontalLine(int x1, int x2, int y) {
                 context.print(new MoveToCode(x1, y));
@@ -395 +398 @@
         }
 
+        @SuppressWarnings("unused")
         private void drawVerticalLine(int x1, int y1, int y2) {
                 context.print(new MoveToCode(x1, y1));