diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/AbstractSARLBasedClasspathContainer.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/AbstractSARLBasedClasspathContainer.java index fafb4303ca..6a5582ba46 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/AbstractSARLBasedClasspathContainer.java +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/AbstractSARLBasedClasspathContainer.java @@ -108,11 +108,6 @@ public synchronized void reset() { this.entries = null; } - @Override - public int getKind() { - return K_SYSTEM; - } - @Override public IPath getPath() { return this.containerPath; diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLClasspathContainer.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLClasspathContainer.java index 12cf524446..79ac590e06 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLClasspathContainer.java +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLClasspathContainer.java @@ -31,6 +31,9 @@ import io.sarl.eclipse.util.BundleUtil; /** Classpath container dedicated to the SARL environment. + * + *

The SARL classpath container is a system library, i.e. it will not be included into the run-time + * classpath. * * @author $Author: sgalland$ * @version $FullVersion$ @@ -55,6 +58,11 @@ public SARLClasspathContainer(IPath containerPath) { super(containerPath); } + @Override + public int getKind() { + return K_SYSTEM; + } + @Override protected void updateBundleList(Set entries) { for (final String rootBundleName : SARL_ROOT_BUNDLE_NAMES) { diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLContainerWizardPage.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLContainerWizardPage.java index f3afcc06e8..6ccd1b4ebb 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLContainerWizardPage.java +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/SARLContainerWizardPage.java @@ -21,6 +21,8 @@ package io.sarl.eclipse.buildpath; +import java.text.MessageFormat; + import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -58,7 +60,12 @@ public void createControl(Composite parent) { final Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new FillLayout()); final Label label = new Label(composite, SWT.NONE); - label.setText(Messages.SARLContainerWizardPage_1); + final StringBuilder text = new StringBuilder(); + for (final String entry : SARLClasspathContainer.SARL_ROOT_BUNDLE_NAMES) { + text.append(entry); + text.append("\n"); //$NON-NLS-1$ + } + label.setText(MessageFormat.format(Messages.SARLContainerWizardPage_1, text.toString())); setControl(composite); } diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/messages.properties b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/messages.properties index 90133530ff..e05ec9d16a 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/messages.properties +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/buildpath/messages.properties @@ -1,4 +1,10 @@ SARLClasspathContainer_0=SARL Libraries SARLClasspathContainerInitializer_0=Classpath container update SARLContainerWizardPage_0=This read-only container manages the SARL dependencies. -SARLContainerWizardPage_1=This library provides all required and convenient dependencies for SARL projects. +SARLContainerWizardPage_1=\ +This library provides all required and convenient\n\ +libraries for compiling SARL projects.\n\n\ +The major included libraries are:\n\ +{0}\n\n\ +Other libraries may be included according to the dependency\n\ +hierarchy of the libraries above. diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/BundleUtil.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/BundleUtil.java index c3a1f70732..5b83e26d6a 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/BundleUtil.java +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/BundleUtil.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.IOException; -import java.lang.ref.SoftReference; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; @@ -102,9 +101,6 @@ public final class BundleUtil { private static final String DEFAULT_PATH_TO_CLASSES_IN_MAVEN_PROJECT = "target/classes"; //$NON-NLS-1$ - private static SoftReference>>> bundleDependencies = - new SoftReference<>(null); - private BundleUtil() { // } @@ -234,54 +230,6 @@ public static IPath getJavadocBundlePath(Bundle bundle, IPath bundleLocation) { return sourcesPath; } - private static Map>> getBundleDependencies() { - Map>> repository = bundleDependencies.get(); - if (repository == null) { - repository = new TreeMap<>(new Comparator() { - @Override - public int compare(Bundle o1, Bundle o2) { - return o1.getSymbolicName().compareTo(o2.getSymbolicName()); - } - }); - bundleDependencies = new SoftReference<>(repository); - } - return repository; - } - - private static Pair> getBundleDependencies(Bundle bundle) { - final Map>> repository = getBundleDependencies(); - synchronized (repository) { - return repository.get(bundle); - } - } - - private static void setBundleDependencies(Bundle bundle, List cpEntries) { - final Map>> repository = getBundleDependencies(); - synchronized (repository) { - repository.put(bundle, new Pair<>(bundle.getVersion(), cpEntries)); - } - } - - private static void addToBundleDependencies(Bundle bundle, BundleDependency dependency) { - final Map>> repository = getBundleDependencies(); - synchronized (repository) { - final Pair> pair = repository.get(bundle); - if (pair == null || pair.getValue() == null) { - final List cpEntries = new ArrayList<>(); - cpEntries.add(dependency); - repository.put(bundle, new Pair<>(bundle.getVersion(), cpEntries)); - } else { - pair.getValue().add(dependency); - } - } - } - - /** Clear any cached information by the {@link BundleUtil} functions. - */ - public static void clearCaches() { - bundleDependencies.clear(); - } - /** Replies the dependencies for the given bundle. * * @param bundle the bundle. @@ -488,6 +436,8 @@ private static class BundleDependencies implements IBundleDependencies { private IPath binaryBundlePath; + private Map>> bundleDependencies; + /** Constructor. * * @param bundle the bundle. @@ -503,6 +453,46 @@ private static class BundleDependencies implements IBundleDependencies { this.javadocURLs = javadocURLs; } + private Map>> getBundleDependencies() { + if (this.bundleDependencies == null) { + this.bundleDependencies = new TreeMap<>(new Comparator() { + @Override + public int compare(Bundle o1, Bundle o2) { + return o1.getSymbolicName().compareTo(o2.getSymbolicName()); + } + }); + } + return this.bundleDependencies; + } + + private Pair> getBundleDependencies(Bundle bundle) { + final Map>> repository = getBundleDependencies(); + synchronized (repository) { + return repository.get(bundle); + } + } + + private void setBundleDependencies(Bundle bundle, List cpEntries) { + final Map>> repository = getBundleDependencies(); + synchronized (repository) { + repository.put(bundle, new Pair<>(bundle.getVersion(), cpEntries)); + } + } + + private void addToBundleDependencies(Bundle bundle, BundleDependency dependency) { + final Map>> repository = getBundleDependencies(); + synchronized (repository) { + final Pair> pair = repository.get(bundle); + if (pair == null || pair.getValue() == null) { + final List cpEntries = new ArrayList<>(); + cpEntries.add(dependency); + repository.put(bundle, new Pair<>(bundle.getVersion(), cpEntries)); + } else { + pair.getValue().add(dependency); + } + } + } + @Override public String toString() { final StringBuilder buf = new StringBuilder(); @@ -518,8 +508,7 @@ public String toString() { return buf.toString(); } - @SuppressWarnings("synthetic-access") - private static void toDependencyTree(StringBuilder builder, String indent1, String indent2, Bundle current, + private void toDependencyTree(StringBuilder builder, String indent1, String indent2, Bundle current, boolean isFragment, List dependencies) { builder.append(indent1); builder.append(current.getSymbolicName()); @@ -581,7 +570,6 @@ public Iterable getTransitiveRuntimeClasspathEntries(boo return () -> new RuntimeClasspathEntryIterator(getTransitiveDependencies(includeFragments)); } - @SuppressWarnings("synthetic-access") private Pair> getDependencyDefinition() { Pair> dependencies = getBundleDependencies(this.bundle); if (dependencies == null) { @@ -687,7 +675,7 @@ private static BundleDependency updateBundleClassPath(Bundle bundle, IClasspathE * boolean specifying if we are at the first recursive call, in this case we use the {@link #directDependencies} * collections to filter the dependencies that are really useful. */ - @SuppressWarnings({ "checkstyle:nestedifdepth", "synthetic-access" }) + @SuppressWarnings({"checkstyle:nestedifdepth"}) private void extractAllBundleDependencies(Bundle bundle, boolean firstCall) { final BundleWiring bundleWiring = bundle.adapt(BundleWiring.class); final List bundleWires = bundleWiring.getRequiredWires(null); @@ -736,7 +724,7 @@ private void extractAllBundleDependencies(Bundle bundle, boolean firstCall) { * @param bundleInstallURL the URL where the specified bundle is stored * @return the Path to the output folder used to store .class file if any (if we are in an eclipse project (debug mode)) */ - @SuppressWarnings({"synthetic-access", "checkstyle:cyclomaticcomplexity"}) + @SuppressWarnings("checkstyle:cyclomaticcomplexity") private IPath readDotClasspathAndReferencestoClasspath(Bundle parent, Bundle bundle, URL bundleInstallURL) { IPath outputLocation = null; BundleDependency mainDependency = null; @@ -939,7 +927,7 @@ public IRuntimeClasspathEntry next() { * @mavengroupid $GroupId$ * @mavenartifactid $ArtifactId$ */ - private static class TransitiveDependencyIterator implements Iterator { + private class TransitiveDependencyIterator implements Iterator { private final boolean includeFragments; diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/Utilities.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/Utilities.java index bd42e27b0c..2170a3602f 100644 --- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/Utilities.java +++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/util/Utilities.java @@ -23,7 +23,6 @@ import com.google.common.base.Strings; import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IAccessRule; import org.eclipse.jdt.core.IClasspathAttribute; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IType; @@ -215,7 +214,7 @@ public static IClasspathEntry newLibraryEntry(Bundle bundle, IPath precomputedBu bundlePath, sourceBundlePath, null, - new IAccessRule[] {}, + null, extraAttributes, false); } diff --git a/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF index f946df3a09..5880aafb2d 100644 --- a/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF +++ b/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF @@ -13,16 +13,14 @@ Require-Bundle: io.sarl.core;bundle-version="0.5.0", com.google.inject;bundle-version="4.0.0", org.apache.commons.cli;bundle-version="1.3.1", org.eclipse.jdt.core;bundle-version="3.12.1", - org.eclipse.jdt.launching;bundle-version="3.8.100", org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.ui.workbench;bundle-version="3.108.1", - org.eclipse.core.resources;bundle-version="3.11.0", org.eclipse.jdt.ui;bundle-version="3.12.1", - org.eclipse.swt;bundle-version="3.105.1", org.eclipse.jface;bundle-version="3.12.0", - org.arakhne.afc.core.util;bundle-version="14.0.0", org.arakhne.afc.core.vmutils;bundle-version="14.0.0", - aopalliance;bundle-version="1.0.0" + org.arakhne.afc.core.util;bundle-version="14.0.0", + org.eclipse.swt;bundle-version="3.105.1", + org.eclipse.jdt.launching;bundle-version="3.8.100" Bundle-Activator: io.janusproject.eclipse.JanusEclipsePlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Boot.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Boot.java index 3afd1f2a86..f05dc88827 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Boot.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Boot.java @@ -35,6 +35,7 @@ import java.util.Properties; import java.util.UUID; import java.util.logging.Logger; +import java.util.regex.Pattern; import com.google.common.base.Strings; import com.google.inject.Module; @@ -181,6 +182,10 @@ public final class Boot { */ public static final String CLI_OPTION_SHOWDEFAULTS_LONG = "showdefaults"; //$NON-NLS-1$ + /** Short command-line option for "show the classpath". + */ + public static final String CLI_OPTION_SHOWCLASSPATH = "showclasspath"; //$NON-NLS-1$ + /** Short command-line option for "show CLI arguments". */ public static final String CLI_OPTION_SHOWCLIARGUMENTS_LONG = "cli"; //$NON-NLS-1$ @@ -227,6 +232,9 @@ public static String[] parseCommandLine(String[] args) { case CLI_OPTION_SHOWDEFAULTS_LONG: showDefaults(); return null; + case CLI_OPTION_SHOWCLASSPATH: + showClasspath(); + return null; case CLI_OPTION_SHOWCLIARGUMENTS_LONG: showCommandLineArguments(args); return null; @@ -433,6 +441,9 @@ public static Options getOptions() { options.addOption(CLI_OPTION_SHOWDEFAULTS_SHORT, CLI_OPTION_SHOWDEFAULTS_LONG, false, Messages.Boot_13); + options.addOption(CLI_OPTION_SHOWCLASSPATH, false, + Messages.Boot_23); + options.addOption(null, CLI_OPTION_SHOWCLIARGUMENTS_LONG, false, Messages.Boot_14); @@ -525,6 +536,22 @@ public static void showDefaults() { getExiter().exit(); } + /** + * Show the classpath of the system properties. This function never returns. + */ + @SuppressWarnings({ "checkstyle:regexp", "resource" }) + public static void showClasspath() { + final String cp = System.getProperty("java.class.path"); //$NON-NLS-1$ + if (!Strings.isNullOrEmpty(cp)) { + final PrintStream ps = getConsoleLogger(); + for (final String entry : cp.split(Pattern.quote(File.pathSeparator))) { + ps.println(entry); + } + ps.flush(); + } + getExiter().exit(); + } + /** * Show the command line arguments. This function never returns. * diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Messages.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Messages.java index 1deeef8df1..32065c4869 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Messages.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Messages.java @@ -49,6 +49,7 @@ public class Messages extends NLS { public static String Boot_20; public static String Boot_21; public static String Boot_22; + public static String Boot_23; public static String Boot_3; public static String Boot_4; public static String Boot_5; diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java index ab66032c6e..06a593e2a1 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java @@ -36,6 +36,8 @@ import io.sarl.eclipse.util.Utilities.SARLBundleJavadocURLMappings; /** Classpath container dedicated to the Janus platform. + * + *

The Janus classpath library is an application library, i.e. it is included into the run-time classpath. * * @author $Author: sgalland$ * @version $FullVersion$ @@ -75,6 +77,11 @@ public JanusClasspathContainer(IPath containerPath) { super(containerPath); } + @Override + public int getKind() { + return K_APPLICATION; + } + /** Replies the standard classpath for running the Janus platform. * * @return the classpath. diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusContainerWizardPage.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusContainerWizardPage.java index 62e41fed51..6cfdcc3c82 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusContainerWizardPage.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/JanusContainerWizardPage.java @@ -21,6 +21,8 @@ package io.janusproject.eclipse.buildpath; +import java.text.MessageFormat; + import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.ui.JavaPluginImages; @@ -58,7 +60,12 @@ public void createControl(Composite parent) { final Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new FillLayout()); final Label label = new Label(composite, SWT.NONE); - label.setText(Messages.JanusContainerWizardPage_1); + final StringBuilder text = new StringBuilder(); + for (final String entry : JanusClasspathContainer.JANUS_ROOT_BUNDLE_NAMES) { + text.append(entry); + text.append("\n"); //$NON-NLS-1$ + } + label.setText(MessageFormat.format(Messages.JanusContainerWizardPage_1, text.toString())); setControl(composite); } diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/messages.properties b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/messages.properties index dd156de29d..7b4fc857c9 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/messages.properties +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/buildpath/messages.properties @@ -1,4 +1,11 @@ JanusClasspathContainer_0=Janus Libraries JanusClasspathContainerInitializer_0=Classpath container update JanusContainerWizardPage_0=This read-only container manages the Janus dependencies. -JanusContainerWizardPage_1=This library provides all required and convenient dependencies for SARL projects with the Janus platform. +JanusContainerWizardPage_1=\ +This library provides all required and convenient\n\ +libraries for running SARL projects with the Janus\n\ +platform.\n\n\ +The major included libraries are:\n\ +{0}\n\n\ +Other libraries may be included according to the dependency\n\ +hierarchy of the libraries above. diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/sre/JanusSREInstall.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/sre/JanusSREInstall.java index 08dfd7662c..d789b19967 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/sre/JanusSREInstall.java +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/eclipse/sre/JanusSREInstall.java @@ -71,6 +71,7 @@ public JanusSREInstall() { final IBundleDependencies dependencies = JanusClasspathContainer.getJanusPlatformClasspath(); // this.janusSREInstallPath = dependencies.getBundleBinaryPath(); + assert this.janusSREInstallPath != null; this.location = this.janusSREInstallPath.toPortableString(); setName(JanusConfig.JANUS_DEFAULT_PLATFORM_NAME); setMainClass(Boot.class.getName()); diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/messages.properties b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/messages.properties index d772337665..f8db67739b 100644 --- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/messages.properties +++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/messages.properties @@ -14,6 +14,7 @@ Boot_2=The provided qualified name is not a valid subclass of Agent: {0} Boot_20=[OPTIONS] Boot_21=MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\nMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\nMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\nMMMMMM$77777777777777777777777777NMMMMMM\nMMMM$77777$ZO8OO7777$77777777777777OMMMM\nMM77MMMMMMMMMMMM7777MMMZ777$MMMMN7777MMM\nMMMMMMMMMMMMMMMM777NMMN77778MMMMMM777ZMM\nMMMMMMMMMMMMMMMO77OMMM$7777MMMMMMMD777MM\nMMMMMMMMMMMMMMN777MMMM7777NMMMMMMMN777MM\nMMMMMMMMMMMMMMO777MMMM7777MMMMMMMMO777MM\nMMMMMMMMMMMMMM$77$MMMD7777MMMMMMMM7777MM\nMMMMMMMMMMMMMM777DMMM$777$MMMMMMZ7777MMM\nMMMMMMMMMMNDO$777ZZZZ7777$$777777777MMMM\nMMMMMD777777777777777777777777777$MMMMMM\nMMMM77777777777777777777777777$8MMMMMMMM\nMM77777$NMMMM777NMMMO7778MMMMMMMMMMMMMMM\nM$77ZMMMMMMMM777MMMMZ777MMMMMMMMMMMMMMMM\nM77ZMMMMMMMM8777MMMM777ZMMMMMMMMMMMMMMMM\n877NMMMMMMMM7778MMMM77DMMMMMMMMMMMMMMMMM\n877DMMMMMMMN77ZMMMMO7$MMMMMMMMMMMMMMMMMM\nM777NMMMMN7777MMMMZ7DMMMM777MMMMMMMMMMMM\nMM777777777$MMMMMZMMMMMM$777MMMMMMMMMMMM\nMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\nMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\nMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM Boot_22=Launching the agent: {0} +Boot_23=Show the classpath used by the application. Boot_3=You must give the fully qualified name of the agent to launch. Boot_4=Error when launching Janus: {0} Boot_5=Janus is run inside another application. diff --git a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/eclipse/buildpath/JanusClasspathContainerTest.java b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/eclipse/buildpath/JanusClasspathContainerTest.java index f346125522..0fa4f4e473 100644 --- a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/eclipse/buildpath/JanusClasspathContainerTest.java +++ b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/eclipse/buildpath/JanusClasspathContainerTest.java @@ -143,7 +143,7 @@ public void getDescription() { @Test public void getKind() { - assertEquals(IClasspathContainer.K_SYSTEM, this.container.getKind()); + assertEquals(IClasspathContainer.K_APPLICATION, this.container.getKind()); } @Test diff --git a/tests/io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/util/BundleUtilTest.java b/tests/io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/util/BundleUtilTest.java index ccf1804a0c..8fcf5e6135 100644 --- a/tests/io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/util/BundleUtilTest.java +++ b/tests/io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/util/BundleUtilTest.java @@ -130,11 +130,6 @@ public void getSourceBundlePath() { */ public static class ResolverTests extends AbstractSarlTest { - @Before - public void setUp() { - BundleUtil.clearCaches(); - } - @Test public void resolveBundleDependenciesBundleBundleURLMappingsStringArray_noRootDependencies() { Bundle bundle = Platform.getBundle("io.sarl.lang.core");