You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/05/30 17:49:20 UTC

svn commit: r661769 - /incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java

Author: rsivaram
Date: Fri May 30 08:49:20 2008
New Revision: 661769

URL: http://svn.apache.org/viewvc?rev=661769&view=rev
Log:
Enable itest/osgi-tuscany installer to run from distribution

Modified:
    incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java

Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java?rev=661769&r1=661768&r2=661769&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java Fri May 30 08:49:20 2008
@@ -166,8 +166,12 @@
         for (String classPathEntry : classPathEntries) {
             classPathEntry = classPathEntry.trim();
             File jar = new File(classPathEntry);
-            if (!jar.isAbsolute()&&!jar.exists()) {
+            if (!jar.exists()) {
                 jar = new File(tuscanyInstallDir, jar.getName());
+                if (!jar.exists())
+                    jar = new File(tuscanyInstallDir, "modules" + File.separator + jar.getName());
+                if (!jar.exists())
+                    jar = new File(tuscanyInstallDir, "lib" + File.separator + jar.getName());
             }
 
             String jarName = jar.getName();