OW2 Consortium jonas

Rev

Rev 22471 | Rev 22683 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 22471 Rev 22482
Line 16... Line 16...
16
 * You should have received a copy of the GNU Lesser General Public
16
 * You should have received a copy of the GNU Lesser General Public
17
 * License along with this library; if not, write to the Free Software
17
 * License along with this library; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
19
 *
19
 *
20
 * --------------------------------------------------------------------------
20
 * --------------------------------------------------------------------------
21
 * $Id: AddonUtil.java 22471 2012-06-04 11:41:50Z boukadam $
-
 
-
 
21
 * $Id: AddonUtil.java 22482 2012-06-04 12:42:02Z cazauxj $
22
 * --------------------------------------------------------------------------
22
 * --------------------------------------------------------------------------
23
 */
23
 */
24
package org.ow2.jonas.addon.deploy.impl.util;
24
package org.ow2.jonas.addon.deploy.impl.util;
25

25

26
import org.osgi.framework.ServiceRegistration;
26
import org.osgi.framework.ServiceRegistration;
Line 439... Line 439...
439
     * @param addonWorkDirectory The directory were the addon is unpacked
439
     * @param addonWorkDirectory The directory were the addon is unpacked
440
     * @return the repository directory of an unpacked Addon
440
     * @return the repository directory of an unpacked Addon
441
     */
441
     */
442
    public static String getAddonRepositoryWorkDirectory(final String addonWorkDirectory) {
442
    public static String getAddonRepositoryWorkDirectory(final String addonWorkDirectory) {
443
        if (addonWorkDirectory.substring(addonWorkDirectory.length() - 1).equals("/")) {
443
        if (addonWorkDirectory.substring(addonWorkDirectory.length() - 1).equals("/")) {
444
            String temp = addonWorkDirectory + IAddonStructure.REPOSITORY_DIRECTORY;
-
 
445
            return addonWorkDirectory + IAddonStructure.REPOSITORY_DIRECTORY;
444
            return addonWorkDirectory + IAddonStructure.REPOSITORY_DIRECTORY;
446
        } else {
445
        } else {
447
            String temp = addonWorkDirectory + IAddonStructure.REPOSITORY_DIRECTORY;
-
 
448
            return addonWorkDirectory + File.separator + IAddonStructure.REPOSITORY_DIRECTORY;
446
            return addonWorkDirectory + File.separator + IAddonStructure.REPOSITORY_DIRECTORY;
449
        }
447
        }
450
    }
448
    }
451

449

452
     /**
450
     /**